From 7ea1d15fc029cd1f65e93d9d6d1d1cf72876bdc0 Mon Sep 17 00:00:00 2001 From: magenbluten Date: Wed, 7 Aug 2019 09:30:35 +0200 Subject: [PATCH 001/283] rocksdb: 6.1.2 -> 6.2.2 --- .../libraries/rocksdb/0001-findzlib.patch | 13 ------------- pkgs/development/libraries/rocksdb/default.nix | 8 +++++--- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/libraries/rocksdb/0001-findzlib.patch diff --git a/pkgs/development/libraries/rocksdb/0001-findzlib.patch b/pkgs/development/libraries/rocksdb/0001-findzlib.patch deleted file mode 100644 index eb532620773..00000000000 --- a/pkgs/development/libraries/rocksdb/0001-findzlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 132d3b0..37fec63 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - if(ZLIB_INCLUDE_DIRS) - # CMake 3 diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 05ecf0f8f25..1b6b5b1b57b 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.1.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0gy2zjga3r8k9pbn2b0b5fzv4m0h2ip3zmyja1i7fli9n56civ3y"; + sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ]; - patches = [ ./0001-findzlib.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " + ''; cmakeFlags = [ "-DPORTABLE=1" From de9cb249389f303ccd1ae3c6a1265e6ca8a3f146 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 10 Aug 2019 00:04:07 +0200 Subject: [PATCH 002/283] lib/modules: Use options `apply` function even if no values are defined This allows `apply` functions to return a valid value if they completely ignore their argument, which is the case for the option renaming functions like `mkAliasOptionModule`. Therefore this solves issue #63693 --- lib/modules.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 0869eae1982..c3c903c1dfa 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -323,16 +323,14 @@ rec { else mergeDefinitions loc opt.type defs'; - # Check whether the option is defined, and apply the ‘apply’ - # function to the merged value. This allows options to yield a - # value computed from the definitions. - value = - if !res.isDefined then - throw "The option `${showOption loc}' is used but not defined." - else if opt ? apply then - opt.apply res.mergedValue - else - res.mergedValue; + + # The value with a check that it is defined + valueDefined = if res.isDefined then res.mergedValue else + throw "The option `${showOption loc}' is used but not defined."; + + # Apply the 'apply' function to the merged value. This allows options to + # yield a value computed from the definitions + value = if opt ? apply then opt.apply valueDefined else valueDefined; in opt // { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; From 6d4c69e6404a964dc921db3a376a49d2b0c3ec69 Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 19 Aug 2019 14:57:41 +0200 Subject: [PATCH 003/283] netdata: enable cgroup accounting --- nixos/modules/services/monitoring/netdata.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index f9b7550af23..463b1b882ac 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -156,6 +156,8 @@ in { }; }; + systemd.enableCgroupAccounting = true; + security.wrappers."apps.plugin" = { source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin.org"; capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; From f71fd79ff0759f6e85b386e6ae212b15047a6813 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 25 Jun 2019 16:08:58 +0200 Subject: [PATCH 004/283] nixos/installation-device.nix: explain sshd usage --- nixos/modules/profiles/installation-device.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 1a6e0699560..fd30220ce1c 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -55,13 +55,16 @@ with lib; services.mingetty.autologinUser = "nixos"; # Some more help text. - services.mingetty.helpLine = - '' + services.mingetty.helpLine = '' + The "nixos" and "root" accounts have empty passwords. - The "nixos" and "root" account have empty passwords. ${ - optionalString config.services.xserver.enable - "Type `sudo systemctl start display-manager' to\nstart the graphical user interface."} - ''; + Type `sudo systemctl start sshd` to start the SSH daemon. + You then must set a password for either "root" or "nixos" + with `passwd` to be able to login. + '' + optionalString config.services.xserver.enable '' + Type `sudo systemctl start display-manager' to + start the graphical user interface. + ''; # Allow sshd to be started manually through "systemctl start sshd". services.openssh = { From 0aa5e3165ca074ce55318cfddcf28e96b84828e3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 17 Aug 2019 23:57:52 +0200 Subject: [PATCH 005/283] sd-image.nix: set installer.cloneConfig to false As SD Card images are both installation media and installation target, don't copy over a /etc/nixos/configuration.nix Closes #63576. --- nixos/modules/installer/cd-dvd/sd-image.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 7f355a13249..07f6f627e6c 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -194,5 +194,9 @@ in rm -f /nix-path-registration fi ''; + + # the installation media is also the installation target, + # so we don't want to provide the installation configuration.nix. + installer.cloneConfig = false; }; } From 1515afe8796c28d9c5ec6bbd359edd60fc5e382e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 18 Aug 2019 00:57:19 +0200 Subject: [PATCH 006/283] nixos/doc: update installation-device.nix This got quite outdated. We now have both the nixos and root user available for example. --- .../profiles/installation-device.xml | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml index 3dcdf403d89..192ae955b68 100644 --- a/nixos/doc/manual/configuration/profiles/installation-device.xml +++ b/nixos/doc/manual/configuration/profiles/installation-device.xml @@ -6,33 +6,31 @@ Installation Device - Provides a basic configuration for installation devices like CDs. This means - enabling hardware scans, using the - Clone Config profile to guarantee - /etc/nixos/configuration.nix exists (for - nixos-rebuild to work), a copy of the Nixpkgs channel - snapshot used to create the install media. + Provides a basic configuration for installation devices like CDs. + This enables redistributable firmware, includes the + Clone Config profile + and a copy of the Nixpkgs channel, so nixos-install + works out of the box. - - Additionally, documentation for - Nixpkgs and NixOS - are forcefully enabled (to override the + Documentation for Nixpkgs + and NixOS are + forcefully enabled (to override the Minimal profile preference); the - NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled. - Autologin is enabled as root. + NixOS manual is shown automatically on TTY 8, udisks is disabled. + Autologin is enabled as nixos user, while passwordless + login as both root and nixos is possible. + Passwordless sudo is enabled too. + wpa_supplicant is + enabled, but configured to not autostart. + + + It is explained how to login, start the ssh server, and if available, + how to start the display manager. - A message is shown to the user to start a display manager if needed, ssh with - are enabled (but - doesn't autostart). WPA Supplicant is also enabled without autostart. - - - - Finally, vim is installed, root is set to not have a password, the kernel is - made more silent for remote public IP installs, and several settings are - tweaked so that the installer has a better chance of succeeding under - low-memory environments. + Several settings are tweaked so that the installer has a better chance of + succeeding under low-memory environments. From d6eb5b068fa893a5e5c571d8c94d15d12ebabf63 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 18 Aug 2019 02:03:58 +0200 Subject: [PATCH 007/283] nixos/doc/clone-config.xml: add line about installation media = installation target --- nixos/doc/manual/configuration/profiles/clone-config.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml index 234835845e2..21c4ea75d6d 100644 --- a/nixos/doc/manual/configuration/profiles/clone-config.xml +++ b/nixos/doc/manual/configuration/profiles/clone-config.xml @@ -11,4 +11,11 @@ creating the image in the first place. As a result it allows users to edit and rebuild the live-system. + + + On images where the installation media also becomes an installation target, + copying over configuration.nix should be disabled by + setting installer.cloneConfig to false. + This is already done in sd-image.nix. + From 13d5fc4232b00dd9f86007e52d400102915ef3e1 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Tue, 13 Aug 2019 11:50:57 -0400 Subject: [PATCH 008/283] kernelPatches: mac nvme t2 support --- .../linux/kernel/mac-nvme-t2.patch | 283 ++++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 6 + 2 files changed, 289 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/mac-nvme-t2.patch diff --git a/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch b/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch new file mode 100644 index 00000000000..2f1fa6a0dae --- /dev/null +++ b/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch @@ -0,0 +1,283 @@ +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index dd10cf78f2d3..8f006638452b 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -28,8 +28,8 @@ + #include "trace.h" + #include "nvme.h" + +-#define SQ_SIZE(depth) (depth * sizeof(struct nvme_command)) +-#define CQ_SIZE(depth) (depth * sizeof(struct nvme_completion)) ++#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) ++#define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) + + #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) + +@@ -1344,16 +1344,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) + + static void nvme_free_queue(struct nvme_queue *nvmeq) + { +- dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq->q_depth), ++ dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq), + (void *)nvmeq->cqes, nvmeq->cq_dma_addr); + if (!nvmeq->sq_cmds) + return; + + if (test_and_clear_bit(NVMEQ_SQ_CMB, &nvmeq->flags)) { + pci_free_p2pmem(to_pci_dev(nvmeq->dev->dev), +- nvmeq->sq_cmds, SQ_SIZE(nvmeq->q_depth)); ++ nvmeq->sq_cmds, SQ_SIZE(nvmeq)); + } else { +- dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq->q_depth), ++ dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq), + nvmeq->sq_cmds, nvmeq->sq_dma_addr); + } + } +@@ -1433,12 +1433,12 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, + } + + static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, +- int qid, int depth) ++ int qid) + { + struct pci_dev *pdev = to_pci_dev(dev->dev); + + if (qid && dev->cmb_use_sqes && (dev->cmbsz & NVME_CMBSZ_SQS)) { +- nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(depth)); ++ nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(nvmeq)); + if (nvmeq->sq_cmds) { + nvmeq->sq_dma_addr = pci_p2pmem_virt_to_bus(pdev, + nvmeq->sq_cmds); +@@ -1447,11 +1447,11 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, + return 0; + } + +- pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(depth)); ++ pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(nvmeq)); + } + } + +- nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth), ++ nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(nvmeq), + &nvmeq->sq_dma_addr, GFP_KERNEL); + if (!nvmeq->sq_cmds) + return -ENOMEM; +@@ -1465,12 +1465,13 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) + if (dev->ctrl.queue_count > qid) + return 0; + +- nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(depth), ++ nvmeq->q_depth = depth; ++ nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), + &nvmeq->cq_dma_addr, GFP_KERNEL); + if (!nvmeq->cqes) + goto free_nvmeq; + +- if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth)) ++ if (nvme_alloc_sq_cmds(dev, nvmeq, qid)) + goto free_cqdma; + + nvmeq->dev = dev; +@@ -1479,15 +1480,14 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) + nvmeq->cq_head = 0; + nvmeq->cq_phase = 1; + nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; +- nvmeq->q_depth = depth; + nvmeq->qid = qid; + dev->ctrl.queue_count++; + + return 0; + + free_cqdma: +- dma_free_coherent(dev->dev, CQ_SIZE(depth), (void *)nvmeq->cqes, +- nvmeq->cq_dma_addr); ++ dma_free_coherent(dev->dev, CQ_SIZE(nvmeq), (void *)nvmeq->cqes, ++ nvmeq->cq_dma_addr); + free_nvmeq: + return -ENOMEM; + } +@@ -1515,7 +1515,7 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid) + nvmeq->cq_head = 0; + nvmeq->cq_phase = 1; + nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; +- memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq->q_depth)); ++ memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq)); + nvme_dbbuf_init(dev, nvmeq, qid); + dev->online_queues++; + wmb(); /* ensure the first interrupt sees the initialization */ +diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c +index cc09b81fc7f4..716ebe87a2b8 100644 +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -1986,6 +1986,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap) + ctrl->ctrl_config = NVME_CC_CSS_NVM; + ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT; + ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE; ++ /* Use default IOSQES. We'll update it later if needed */ + ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES; + ctrl->ctrl_config |= NVME_CC_ENABLE; + +@@ -2698,6 +2699,30 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) + ctrl->hmmin = le32_to_cpu(id->hmmin); + ctrl->hmminds = le32_to_cpu(id->hmminds); + ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); ++ ++ /* Grab required IO queue size */ ++ ctrl->iosqes = id->sqes & 0xf; ++ if (ctrl->iosqes < NVME_NVM_IOSQES) { ++ dev_err(ctrl->device, ++ "unsupported required IO queue size %d\n", ctrl->iosqes); ++ ret = -EINVAL; ++ goto out_free; ++ } ++ /* ++ * If our IO queue size isn't the default, update the setting ++ * in CC:IOSQES. ++ */ ++ if (ctrl->iosqes != NVME_NVM_IOSQES) { ++ ctrl->ctrl_config &= ~(0xfu << NVME_CC_IOSQES_SHIFT); ++ ctrl->ctrl_config |= ctrl->iosqes << NVME_CC_IOSQES_SHIFT; ++ ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ++ ctrl->ctrl_config); ++ if (ret) { ++ dev_err(ctrl->device, ++ "error updating CC register\n"); ++ goto out_free; ++ } ++ } + } + + ret = nvme_mpath_init(ctrl, id); +diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h +index 716a876119c8..34ef35fcd8a5 100644 +--- a/drivers/nvme/host/nvme.h ++++ b/drivers/nvme/host/nvme.h +@@ -244,6 +244,7 @@ struct nvme_ctrl { + u32 hmmin; + u32 hmminds; + u16 hmmaxd; ++ u8 iosqes; + + /* Fabrics only */ + u16 sqsize; +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index 8f006638452b..54b35ea4af88 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -28,7 +28,7 @@ + #include "trace.h" + #include "nvme.h" + +-#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) ++#define SQ_SIZE(q) ((q)->q_depth << (q)->sqes) + #define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) + + #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) +@@ -162,7 +162,7 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl) + struct nvme_queue { + struct nvme_dev *dev; + spinlock_t sq_lock; +- struct nvme_command *sq_cmds; ++ void *sq_cmds; + /* only used for poll queues: */ + spinlock_t cq_poll_lock ____cacheline_aligned_in_smp; + volatile struct nvme_completion *cqes; +@@ -178,6 +178,7 @@ struct nvme_queue { + u16 last_cq_head; + u16 qid; + u8 cq_phase; ++ u8 sqes; + unsigned long flags; + #define NVMEQ_ENABLED 0 + #define NVMEQ_SQ_CMB 1 +@@ -488,7 +489,8 @@ static void nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd, + bool write_sq) + { + spin_lock(&nvmeq->sq_lock); +- memcpy(&nvmeq->sq_cmds[nvmeq->sq_tail], cmd, sizeof(*cmd)); ++ memcpy(nvmeq->sq_cmds + (nvmeq->sq_tail << nvmeq->sqes), ++ cmd, sizeof(*cmd)); + if (++nvmeq->sq_tail == nvmeq->q_depth) + nvmeq->sq_tail = 0; + nvme_write_sq_db(nvmeq, write_sq); +@@ -1465,6 +1467,7 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) + if (dev->ctrl.queue_count > qid) + return 0; + ++ nvmeq->sqes = qid ? dev->ctrl.iosqes : NVME_NVM_ADMSQES; + nvmeq->q_depth = depth; + nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), + &nvmeq->cq_dma_addr, GFP_KERNEL); +diff --git a/include/linux/nvme.h b/include/linux/nvme.h +index 01aa6a6c241d..7af18965fb57 100644 +--- a/include/linux/nvme.h ++++ b/include/linux/nvme.h +@@ -141,6 +141,7 @@ enum { + * (In bytes and specified as a power of two (2^n)). + */ + #define NVME_NVM_IOSQES 6 ++#define NVME_NVM_ADMSQES 6 + #define NVME_NVM_IOCQES 4 + + enum { +diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c +index 716ebe87a2b8..480ea24d8cf4 100644 +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -2701,7 +2701,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) + ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); + + /* Grab required IO queue size */ +- ctrl->iosqes = id->sqes & 0xf; ++ if (ctrl->quirks & NVME_QUIRK_128_BYTES_SQES) ++ ctrl->iosqes = 7; ++ else ++ ctrl->iosqes = id->sqes & 0xf; + if (ctrl->iosqes < NVME_NVM_IOSQES) { + dev_err(ctrl->device, + "unsupported required IO queue size %d\n", ctrl->iosqes); +diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h +index 34ef35fcd8a5..b2a78d08b984 100644 +--- a/drivers/nvme/host/nvme.h ++++ b/drivers/nvme/host/nvme.h +@@ -92,6 +92,16 @@ enum nvme_quirks { + * Broken Write Zeroes. + */ + NVME_QUIRK_DISABLE_WRITE_ZEROES = (1 << 9), ++ ++ /* ++ * Use only one interrupt vector for all queues ++ */ ++ NVME_QUIRK_SINGLE_VECTOR = (1 << 10), ++ ++ /* ++ * Use non-standard 128 bytes SQEs. ++ */ ++ NVME_QUIRK_128_BYTES_SQES = (1 << 11), + }; + + /* +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index 54b35ea4af88..ab2358137419 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -2080,6 +2080,9 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues) + dev->io_queues[HCTX_TYPE_DEFAULT] = 1; + dev->io_queues[HCTX_TYPE_READ] = 0; + ++ if (dev->ctrl.quirks & NVME_QUIRK_SINGLE_VECTOR) ++ irq_queues = 1; ++ + return pci_alloc_irq_vectors_affinity(pdev, 1, irq_queues, + PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd); + } +@@ -3037,6 +3040,9 @@ static const struct pci_device_id nvme_id_table[] = { + { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, + { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, + { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005), ++ .driver_data = NVME_QUIRK_SINGLE_VECTOR | ++ NVME_QUIRK_128_BYTES_SQES }, + { 0, } + }; + MODULE_DEVICE_TABLE(pci, nvme_id_table); diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e941cd4ea41..edca017b3c7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -62,4 +62,10 @@ rec { name = "export_kernel_fpu_functions"; patch = ./export_kernel_fpu_functions.patch; }; + + # patches from https://lkml.org/lkml/2019/7/15/1748 + mac_nvme_t2 = rec { + name = "mac_nvme_t2"; + patch = ./mac-nvme-t2.patch; + }; } From ae1cb0bdf98a325062eb9c5bd6af350ca9cf6bf2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 18 Aug 2019 20:18:37 -0400 Subject: [PATCH 009/283] nixos/xfce4-14: init --- .../services/x11/desktop-managers/default.nix | 2 +- .../x11/desktop-managers/xfce4-14.nix | 157 ++++++++++++++++++ 2 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/x11/desktop-managers/xfce4-14.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 671a959cdde..dfb84113e13 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix + ./none.nix ./xterm.nix ./xfce.nix ./xfce4-14.nix ./plasma5.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix ./mate.nix ./pantheon.nix ./surf-display.nix ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix new file mode 100644 index 00000000000..16329c093f9 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -0,0 +1,157 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.desktopManager.xfce4-14; +in + +{ + # added 2019-08-18 + # needed to preserve some semblance of UI familarity + # with original XFCE module + imports = [ + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ] + [ "services" "xserver" "displayManager" "sessionCommands" ]) + ]; + + options = { + services.xserver.desktopManager.xfce4-14 = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the Xfce desktop environment."; + }; + + # TODO: support thunar plugins + # thunarPlugins = mkOption { + # default = []; + # type = types.listOf types.package; + # example = literalExample "[ pkgs.xfce4-14.thunar-archive-plugin ]"; + # description = '' + # A list of plugin that should be installed with Thunar. + # ''; + # }; + + noDesktop = mkOption { + type = types.bool; + default = false; + description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon)."; + }; + + enableXfwm = mkOption { + type = types.bool; + default = true; + description = "Enable the XFWM (default) window manager."; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs.xfce4-14 // pkgs; [ + glib # for gsettings + gtk3.out # gtk-update-icon-cache + + gnome3.adwaita-icon-theme + hicolor-icon-theme + tango-icon-theme + xfce4-icon-theme + + desktop-file-utils + shared-mime-info # for update-mime-database + + # For a polkit authentication agent + polkit_gnome + + # Needed by Xfce's xinitrc script + xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + + exo + garcon + gtk-xfce-engine + libxfce4ui + xfconf + + mousepad + ristretto + xfce4-appfinder + xfce4-screenshooter + xfce4-session + xfce4-settings + xfce4-terminal + + # TODO: resync patch for plugins + #(thunar.override { thunarPlugins = cfg.thunarPlugins; }) + thunar + ] # TODO: NetworkManager doesn't belong here + ++ optional config.networking.networkmanager.enable networkmanagerapplet + ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin + ++ optional config.powerManagement.enable xfce4-power-manager + ++ optional cfg.enableXfwm xfwm4 + ++ optionals (!cfg.noDesktop) [ + xfce4-panel + xfce4-notifyd + xfdesktop + ]; + + environment.pathsToLink = [ + "/share/xfce4" + "/lib/xfce4" + "/share/gtksourceview-3.0" + "/share/gtksourceview-4.0" + ]; + + # Use the correct gnome3 packageSet + networking.networkmanager.basePackages = mkIf config.networking.networkmanager.enable { + inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; + inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc + networkmanager-openconnect networkmanager-fortisslvpn + networkmanager-iodine networkmanager-l2tp; + }; + + services.xserver.desktopManager.session = [{ + name = "xfce4-14"; + bgSupport = true; + start = '' + # Set GTK_PATH so that GTK+ can find the theme engines. + export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" + + # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. + export GTK_DATA_PREFIX=${config.system.path} + + ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} & + waitPID=$! + ''; + }]; + + services.xserver.updateDbusEnvironment = true; + services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; + + # Enable helpful DBus services. + services.udisks2.enable = true; + security.polkit.enable = true; + services.accounts-daemon.enable = true; + services.upower.enable = config.powerManagement.enable; + services.gnome3.glib-networking.enable = true; + services.gvfs.enable = true; + services.gvfs.package = pkgs.xfce.gvfs; + services.tumbler.enable = true; + services.dbus.packages = + optional config.services.printing.enable pkgs.system-config-printer; + services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager + + # Enable default programs + programs.dconf.enable = true; + + # Shell integration for VTE terminals + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; + + # Systemd services + systemd.packages = with pkgs.xfce4-14; [ + thunar + ] ++ optional (!cfg.noDesktop) xfce4-notifyd; + + }; +} From de89ad124d0ccf8c1dfaa5edeac84be03173ce48 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 18 Aug 2019 20:24:09 -0400 Subject: [PATCH 010/283] xfce4-14.xfce4-mixer: drop obsoleted by xfce4-pulseaudio-plugin / dead package --- pkgs/desktops/xfce4-14/default.nix | 8 +++-- .../desktops/xfce4-14/xfce4-mixer/default.nix | 32 ------------------- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 pkgs/desktops/xfce4-14/xfce4-mixer/default.nix diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix index d3e46cf2365..e72aa97d9db 100644 --- a/pkgs/desktops/xfce4-14/default.nix +++ b/pkgs/desktops/xfce4-14/default.nix @@ -58,8 +58,6 @@ makeScope newScope (self: with self; { xfce4-dict = callPackage ./xfce4-dict { }; - xfce4-mixer = callPackage ./xfce4-mixer { }; - xfce4-netload-plugin = callPackage ./xfce4-netload-plugin { }; xfce4-notifyd = callPackage ./xfce4-notifyd { }; @@ -110,4 +108,10 @@ makeScope newScope (self: with self; { xfce4-namebar-plugin = callPackage ../xfce/panel-plugins/xfce4-namebar-plugin.nix { }; xfce4-windowck-plugin = callPackage ../xfce/panel-plugins/xfce4-windowck-plugin.nix { }; + + + ## ALIASES + + # added 2019-08-18 + xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; }) diff --git a/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix deleted file mode 100644 index a4bc0a3eadd..00000000000 --- a/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf, gst-plugins-base, libunique }: - -let - gst_plugins_minimal = gst-plugins-base.override { - minimalDeps = true; - }; -in -mkXfceDerivation rec { - category = "apps"; - pname = "xfce4-mixer"; - version = "4.11.0"; - - sha256 = "1kiz5ysn4rqkjfzz4dvbsfj64kqqayg7bqakcys3rw28g2q5qyys"; - - nativeBuildInputs = [ automakeAddFlags ]; - - postPatch = '' - automakeAddFlags panel-plugin/Makefile.am libmixer_la_CFLAGS DBUS_GLIB_CFLAGS - automakeAddFlags xfce4-mixer/Makefile.am xfce4_mixer_CFLAGS DBUS_GLIB_CFLAGS - ''; - - buildInputs = [ - dbus-glib - gst_plugins_minimal - gtk2 - libunique - libxfce4ui - libxfce4util - xfce4-panel - xfconf - ]; -} From fd7d31b50e087e790443cd57eaf52f41c3f99af1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 21 Aug 2019 22:04:29 -0400 Subject: [PATCH 011/283] nixosTests.xfce4-14: init This is pretty much identical to the xfce test we currently have. --- nixos/release-combined.nix | 1 + nixos/tests/all-tests.nix | 1 + nixos/tests/xfce4-14.nix | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 nixos/tests/xfce4-14.nix diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 7146aebf54b..ffa087bb6f2 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -136,6 +136,7 @@ in rec { (all nixos.tests.switchTest) (all nixos.tests.udisks2) (all nixos.tests.xfce) + (all nixos.tests.xfce4-14) nixpkgs.tarball (all allSupportedNixpkgs.emacs) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4eeee9c35c0..47eaec7c783 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -273,6 +273,7 @@ in xautolock = handleTest ./xautolock.nix {}; xdg-desktop-portal = handleTest ./xdg-desktop-portal.nix {}; xfce = handleTest ./xfce.nix {}; + xfce4-14 = handleTest ./xfce4-14.nix {}; xmonad = handleTest ./xmonad.nix {}; xrdp = handleTest ./xrdp.nix {}; xss-lock = handleTest ./xss-lock.nix {}; diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix new file mode 100644 index 00000000000..d9b10aabaa1 --- /dev/null +++ b/nixos/tests/xfce4-14.nix @@ -0,0 +1,33 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "xfce4-14"; + + machine = + { pkgs, ... }: + + { imports = [ ./common/user-account.nix ]; + + services.xserver.enable = true; + + services.xserver.displayManager.auto.enable = true; + services.xserver.displayManager.auto.user = "alice"; + + services.xserver.desktopManager.xfce4-14.enable = true; + }; + + testScript = + '' + $machine->waitForX; + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->waitForWindow(qr/xfce4-panel/); + $machine->sleep(10); + + # Check that logging in has given the user ownership of devices. + $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + + $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'"); + $machine->waitForWindow(qr/Terminal/); + $machine->sleep(10); + $machine->screenshot("screen"); + ''; +}) From 58d383a5dc35ae45db927b0bd22b302f8a0a9c07 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Fri, 23 Aug 2019 14:25:12 -0600 Subject: [PATCH 012/283] wine{,-mono,-unstable,-staging}: update wine: 4.0.1 -> 4.0.2 wine-mono: 4.9.0 -> 4.9.2 wine-unstable: 4.12.1 -> 4.14 wine-staging: 4.12.1 -> 4.14 --- pkgs/misc/emulators/wine/sources.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 4ccdb254daa..023e48fc991 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "4.0.1"; + version = "4.0.2"; url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; - sha256 = "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk"; + sha256 = "0x5x9pvhryzhq1m7i8gx5wwwj341zz05zymadlhfw5w45xlm0h4r"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -31,24 +31,24 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.9.0"; + version = "4.9.2"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "04y7w57cgay74227qci1bjbzwvclkawwljqvgd7a5yhhdz7cfblf"; + sha256 = "0x7z0216j21bzc9v1q283qlsvbfzn92yiaf26ilh6bd7zib4c7xr"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.12.1"; + version = "4.14"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "09yjfb2k14y11k19lm8dqmb8qwxyhh67d5q1gqv480y64mljvkx0"; + sha256 = "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1bvpvj6vcw2p6vcjm6mw5maarbs4lfw1ix3pj020w4n3kg4nmmc4"; + sha256 = "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 441f10cdaf89eaac92d1b991185e324e4dd6eb1e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 24 Aug 2019 18:11:18 +0200 Subject: [PATCH 013/283] maintainers: add sgo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 64836b746e0..17e39e2dc4c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5656,6 +5656,12 @@ githubId = 918365; name = "Stefan Frijters"; }; + sgo = { + email = "stig@stig.io"; + github = "stigtsp"; + githubId = 75371; + name = "Stig Palmquist"; + }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; From c8e863e25ecc7e20836f8f9275329d5afd5e4f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 26 Aug 2019 11:04:10 +0200 Subject: [PATCH 014/283] nixos/systemd: Add suspend-then-hibernate units Pretty useful for laptops. I use them with: ``` services.logind.lidSwitch = "suspend-then-hibernate"; environment.etc."systemd/sleep.conf".text = "HibernateDelaySec=8h"; ``` --- nixos/modules/system/boot/systemd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 23a2dd45d49..fedb2ebe86f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -112,11 +112,13 @@ let # Hibernate / suspend. "hibernate.target" "suspend.target" + "suspend-then-hibernate.target" "sleep.target" "hybrid-sleep.target" "systemd-hibernate.service" "systemd-hybrid-sleep.service" "systemd-suspend.service" + "systemd-suspend-then-hibernate.service" # Reboot stuff. "reboot.target" From fc4ca1aead492d11dc8e5c7a08d450776881b989 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jul 2019 18:09:25 +0200 Subject: [PATCH 015/283] magnetico: init at 0.8.1 --- .../networking/p2p/magnetico/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/networking/p2p/magnetico/default.nix diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix new file mode 100644 index 00000000000..1c266d247b7 --- /dev/null +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildGoModule, go-bindata }: + +buildGoModule rec { + pname = "magnetico"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "boramalper"; + repo = "magnetico"; + rev = "v${version}"; + sha256 = "1f7y3z9ql079ix6ycihkmd3z3da3sfiqw2fap31pbvvjs65sg644"; + }; + + modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf"; + + buildInputs = [ go-bindata ]; + buildPhase = '' + make magneticow magneticod + ''; + + doCheck = true; + checkPhase = '' + make test + ''; + + meta = with lib; { + description = "Autonomous (self-hosted) BitTorrent DHT search engine suite."; + homepage = https://github.com/boramalper/magnetico; + license = licenses.agpl3; + badPlatforms = platforms.darwin; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b56dbe6c15..081d6a912d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19062,6 +19062,8 @@ in marp = callPackage ../applications/office/marp { }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; + matchbox = callPackage ../applications/window-managers/matchbox { }; mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; From 8c60f67f2dbc0b1eeddf67db317964ae3619d646 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 26 Aug 2019 16:31:48 +0200 Subject: [PATCH 016/283] mint: Fix build --- pkgs/development/compilers/mint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 1c8e9fb7eb2..95b30da5b75 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -3,7 +3,7 @@ # wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock # nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' # -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: +{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: let crystalPackages = lib.mapAttrs (name: src: stdenv.mkDerivation { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; }; - nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ]; + nativeBuildInputs = [ which crystal zlib openssl_1_0_2 duktape libyaml ]; buildPhase = '' mkdir -p $out/bin tmp From a3aec20f266c57d989524f02b1243b4ad24020a2 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 26 Aug 2019 18:22:55 +0200 Subject: [PATCH 017/283] Implement crystal.buildCrystalPackage --- .../compilers/crystal/build-package.nix | 53 +++++++++++++++++++ .../development/compilers/crystal/default.nix | 11 ++-- 2 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/crystal/build-package.nix diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix new file mode 100644 index 00000000000..8ffa89a11b4 --- /dev/null +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }: +{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root + shardsFile ? null + # Specify binaries to build in the form { foo.src = "src/foo.cr"; } + # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } +, crystalBinaries ? {} +, ... +}@args: +let + mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ]; + + crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { + inherit name; + path = fetchFromGitHub value; + }) (import shardsFile)); + + defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ]; + +in stdenv.mkDerivation (mkDerivationArgs // { + + configurePhase = args.configurePhase or '' + runHook preConfigure + ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} + runHook postConfigure + ''; + + buildInputs = args.buildInputs or [] ++ [ crystal ]; + + buildPhase = args.buildPhase or '' + runHook preBuild + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: '' + crystal ${lib.escapeShellArgs ([ + "build" + "-o" bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ attrs.options or defaultOptions)} + '') crystalBinaries)} + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + mkdir -p "$out/bin" + ${lib.concatMapStringsSep "\n" (bin: '' + mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} + '') (lib.attrNames crystalBinaries)} + runHook postInstall + ''; + + meta = args.meta or {} // { + platforms = args.meta.platforms or crystal.meta.platforms; + }; +}) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index db57bc3e9df..0cb0a3733ed 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper , coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }: +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib +, callPackage }: # We need multiple binaries as a given binary isn't always able to build # (even slightly) older or newer versions. @@ -37,7 +38,7 @@ let }; generic = { version, sha256, binary, doCheck ? true }: - stdenv.mkDerivation rec { + let compiler = stdenv.mkDerivation rec { pname = "crystal"; inherit doCheck version; @@ -134,6 +135,10 @@ let export PATH=${lib.makeBinPath checkInputs}:$PATH ''; + passthru.buildCrystalPackage = callPackage ./build-package.nix { + crystal = compiler; + }; + meta = with lib; { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; @@ -141,7 +146,7 @@ let maintainers = with maintainers; [ manveru david50407 peterhoeg ]; platforms = builtins.attrNames archs; }; - }; + }; in compiler; in rec { binaryCrystal_0_26 = genericBinary { From 1ffdf01777360f548cc7c10ef5b168cbe78fd183 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 26 Aug 2019 18:23:55 +0200 Subject: [PATCH 018/283] crystal2nix: Put it into pkgs --- .../compilers/{mint => crystal}/crystal2nix.cr | 2 +- .../compilers/crystal/crystal2nix.nix | 16 ++++++++++++++++ pkgs/development/compilers/crystal/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 21 insertions(+), 2 deletions(-) rename pkgs/development/compilers/{mint => crystal}/crystal2nix.cr (94%) create mode 100644 pkgs/development/compilers/crystal/crystal2nix.nix diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/crystal/crystal2nix.cr similarity index 94% rename from pkgs/development/compilers/mint/crystal2nix.cr rename to pkgs/development/compilers/crystal/crystal2nix.cr index f608102a37b..0610de5cfa4 100644 --- a/pkgs/development/compilers/mint/crystal2nix.cr +++ b/pkgs/development/compilers/crystal/crystal2nix.cr @@ -26,7 +26,7 @@ File.open "shards.nix", "w+" do |file| sha256 = "" args = ["--url", url, "--rev", rev] - Process.run("nix-prefetch-git", args: args) do |x| + Process.run("@nixPrefetchGit@", args: args) do |x| x.error.each_line { |e| puts e } sha256 = PrefetchJSON.from_json(x.output).sha256 end diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix new file mode 100644 index 00000000000..ac69b9b3d96 --- /dev/null +++ b/pkgs/development/compilers/crystal/crystal2nix.nix @@ -0,0 +1,16 @@ +{ lib, crystal, nix-prefetch-git }: +crystal.buildCrystalPackage { + pname = "crystal2nix"; + version = "unstable-2018-07-31"; + + nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git"; + unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr"; + + crystalBinaries.crystal2nix.src = "crystal2nix.cr"; + + meta = with lib; { + description = "Utility to convert Crystal's shard.lock files to a Nix file"; + license = licenses.mit; + maintainers = [ maintainers.manveru ]; + }; +} diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 0cb0a3733ed..c7a74880e44 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -212,4 +212,6 @@ in rec { }; crystal = crystal_0_30; + + crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbe997367c8..d788224cf39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7453,7 +7453,8 @@ in crystal_0_27 crystal_0_29 crystal_0_30 - crystal; + crystal + crystal2nix; icr = callPackage ../development/tools/icr {}; From 910a4f2637ba570b6117583cbb65ed9b1bbe2fed Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:31:20 -0400 Subject: [PATCH 019/283] jetbrains.clion: 2019.1.4 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 844999b0366..a337edc8d48 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.1.4"; /* updated by script */ + version = "2019.2.1"; /* 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 = "1ccb7g5nzipfmvx6ycg9cn3s7bykpwws62239hg0frlb6xx9y969"; /* updated by script */ + sha256 = "13y2c3vzlklwz9cd7anpfdc3dqwh714xivm1g59s6p4x9sy172lp"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From f16366856fa532f49548c36eef274ab91794028e Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:31:40 -0400 Subject: [PATCH 020/283] jetbrains.datagrip: 2019.2.1 -> 2019.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a337edc8d48..94e095557cc 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.2"; /* 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 = "0va5dcvjxq7mlkz0di5zl1ra5gv6cls3wy40fvkpm2vlirg0m31s"; /* updated by script */ + sha256 = "1babydzmgaas1rxjv11yhgbp0l5scsdwy17l9927qwlbgccf24mb"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; From 26e598825eaaaa9b9c361a5a93f0286468a290cb Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:32:07 -0400 Subject: [PATCH 021/283] jetbrains.goland: 2019.1.3 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 94e095557cc..76a460b8343 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* 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 = "0nw9s4vc7dbj2daxi88m1hqyl3rbzvahbw4mhp409ngac3l2pqmh"; /* updated by script */ + sha256 = "16wmsf6c8x95d050grqgv6aaxlkc6pqhbqzlz6fzsngjnbkn64yj"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; From f7d8e1f5e8cef477863e4bcbcaca106712eb1d10 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:32:24 -0400 Subject: [PATCH 022/283] jetbrains.idea-community: 2019.1.3 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 76a460b8343..61598a1be43 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* 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 = "02ddxqwflqrr5xf27s1gmaz7ai400cxzlbiz2wrs9vqsdcpj9jbr"; /* updated by script */ + sha256 = "1pbqnyqly09m7lw6356dydbvppq4i94rsk7c3y40mrc285qzj413"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; From 19d68692fde8206a43bf84a039f0e06829d45a31 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:32:39 -0400 Subject: [PATCH 023/283] jetbrains.idea-ultimate: 2019.1.3 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 61598a1be43..c5cf5ffbf5e 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* 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 = "0qhj3wai0jb3bg8ddck27ivx2q60xsbk8pj6ryqp5dh75ja4zx1s"; /* updated by script */ + sha256 = "0mslmhakjjgwj76hbfw9dcidic6zprjfjryggic7dqywl7vjwc95"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; From b380c7c6193e9488ff5a7cda8671a7e981b5d936 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:33:02 -0400 Subject: [PATCH 024/283] jetbrains.phpstorm: 2019.1.3 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c5cf5ffbf5e..1e749764344 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* 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 = "04nrdgnyxywy0yfari26ghc371yni1rx3h0pmc4fw02ibbqx1f1y"; /* updated by script */ + sha256 = "1m198p6586dych6mrgwqxs486qndypsmnikl0rxx45ddrwfjl42g"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; From 75fdf58e112d084a8aeff09a523311fe60b10a3d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:33:23 -0400 Subject: [PATCH 025/283] jetbrains.pycharm-community: 2019.1.3 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 1e749764344..7188dec4bf5 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0acwfxp0ky3014zcvmlsig1732h87jvmf2wwjankamrk6ynmlvgh"; /* updated by script */ + sha256 = "0a3fi2wjj0166199pyhvvpaih9nx0xr6q7zf7jfj8i7khpkdk8i5"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; From 64e74365b70f6869e494401e1b24c024fdb3047f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:33:59 -0400 Subject: [PATCH 026/283] jetbrains.pycharm-professional: 2019.1.3 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 7188dec4bf5..db43c2ac259 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0948jlpfz5d4k12mn2xrl8z5kc44a3986kl5znvzr5b8h65xw8l3"; /* updated by script */ + sha256 = "03i7qi0kcnx0irih468xaz7hzicaa5yh399r676drs22ak23qwrq"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; From 64a7035504df5eebb627df18a76ecde919e0448d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:34:16 -0400 Subject: [PATCH 027/283] jetbrains.rider: 2019.1.2 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index db43c2ac259..34c030f39f2 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.2.1"; /* 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 = "0b0p18pcq4ml8nds4460a1ml8qjsq38kxwdrsh2ca5s194cbaapq"; /* updated by script */ + sha256 = "1p0mlch7qvkvgxjscx6rl65v6h8g6fwk8rcb8s27qkcjm0d78ic8"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; From 34d44f33de2fa7f6ed98c03dcfecc31ea97d4aa8 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 26 Aug 2019 13:34:40 -0400 Subject: [PATCH 028/283] jetbrains.ruby-mine: 2019.2 -> 2019.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 34c030f39f2..92355552fce 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.2"; /* updated by script */ + version = "2019.2.1"; /* 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 = "1f4mdarmh7m9jq432d0s9jds9288g0zgpxnlpmx12i26vvq8kykd"; /* updated by script */ + sha256 = "0l0kwc1mih55px8j6bvp1g3pxrv0scd9vpydwvkaqmq5x0r1n3jf"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; From 2f92cd6960f26f1f45e862cf4fea277305a07a4e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 26 Aug 2019 18:24:45 +0200 Subject: [PATCH 029/283] mint: Use buildCrystalPackage --- pkgs/development/compilers/mint/default.nix | 59 ++++----------------- 1 file changed, 11 insertions(+), 48 deletions(-) diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 95b30da5b75..5f72bd3649b 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,40 +1,7 @@ -# Updating the dependencies for this package: -# -# wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock -# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' -# -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: -let - crystalPackages = lib.mapAttrs (name: src: - stdenv.mkDerivation { - name = lib.replaceStrings ["/"] ["-"] name; - src = fetchFromGitHub src; - phases = "installPhase"; - installPhase = ''cp -r $src $out''; - passthru = { libName = name; }; - } - ) (import ./shards.nix); - - crystalLib = stdenv.mkDerivation { - name = "crystal-lib"; - src = lib.attrValues crystalPackages; - libNames = lib.mapAttrsToList (k: v: [k v]) crystalPackages; - phases = "buildPhase"; - buildPhase = '' - mkdir -p $out - linkup () { - while [ "$#" -gt 0 ]; do - ln -s $2 $out/$1 - shift; shift - done - } - linkup $libNames - ''; - }; -in -stdenv.mkDerivation rec { +{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: +crystal.buildCrystalPackage rec { version = "0.5.0"; - name = "mint-${version}"; + pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; @@ -42,23 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; }; - nativeBuildInputs = [ which crystal zlib openssl_1_0_2 duktape libyaml ]; + buildInputs = [ openssl_1_0_2 ]; - buildPhase = '' - mkdir -p $out/bin tmp - cd tmp - ln -s ${crystalLib} lib - cp -r $src/* . - crystal build src/mint.cr -o $out/bin/mint --verbose --progress --release --no-debug - ''; - - installPhase = ''true''; + # Update with + # nix-shell -p crystal2nix --run crystal2nix + # with mint's shard.lock file in the current directory + shardsFile = ./shards.nix; + crystalBinaries.mint.src = "src/mint.cr"; meta = { description = "A refreshing language for the front-end web"; homepage = https://mint-lang.com/; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ manveru ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } From 1d0749139d2edc1ce20ae71e5258cf1f802fba48 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 26 Aug 2019 20:12:15 +0200 Subject: [PATCH 030/283] docs: Add Crystal language framework section --- doc/languages-frameworks/crystal.section.md | 71 +++++++++++++++++++++ doc/languages-frameworks/index.xml | 1 + 2 files changed, 72 insertions(+) create mode 100644 doc/languages-frameworks/crystal.section.md diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md new file mode 100644 index 00000000000..07bfc65a553 --- /dev/null +++ b/doc/languages-frameworks/crystal.section.md @@ -0,0 +1,71 @@ +# Crystal + +## Building a Crystal package + +This section uses [Mint](https://github.com/mint-lang/mint) as an example for how to build a Crystal package. + +If the Crystal project has any dependencies, the first step is to get a `shards.nix` file encoding those. Get a copy of the project and go to its root directory such that its `shard.lock` file is in the current directory, then run `crystal2nix` in it +```bash +$ git clone https://github.com/mint-lang/mint +$ cd mint +$ git checkout 0.5.0 +$ nix-shell -p crystal2nix --run crystal2nix +``` + +This should have generated a `shards.nix` file. + +Next create a Nix file for your derivation and use `pkgs.crystal.buildCrystalPackage` as follows: +```nix +with import {}; +crystal.buildCrystalPackage rec { + pname = "mint"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "mint-lang"; + repo = "mint"; + rev = version; + sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; + }; + + # Insert the path to your shards.nix file here + shardsFile = ./shards.nix; + + ... +} +``` + +This won't build anything yet, because we haven't told it what files build. We can specify a mapping from binary names to source files with the `crystalBinaries` attribute. The project's compilation instructions should show this. For Mint, the binary is called "mint", which is compiled from the source file `src/mint.cr`, so we'll specify this as follows: + +```nix + crystalBinaries.mint.src = "src/mint.cr"; + + # ... +``` + +Additionally you can override the default `crystal build` options (which are currently `--release --progress --no-debug --verbose`) with + +```nix + crystalBinaries.mint.options = [ "--release" "--verbose" ]; +``` + +Depending on the project, you might need additional steps to get it to compile successfully. In Mint's case, we need to link against openssl, so in the end the Nix file looks as follows: + +```nix +with import {}; +crystal.buildCrystalPackage rec { + version = "0.5.0"; + pname = "mint"; + src = fetchFromGitHub { + owner = "mint-lang"; + repo = "mint"; + rev = version; + sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; + }; + + shardsFile = ./shards.nix; + crystalBinaries.mint.src = "src/mint.cr"; + + buildInputs = [ openssl_1_0_2 ]; +} +``` diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 4564df98fe9..cd4e95cfae6 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -32,4 +32,5 @@ + From bc22c2e07f954098bf6c0bf60543a9330a427e58 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Fri, 12 Jul 2019 15:35:03 +0200 Subject: [PATCH 031/283] sortmerna: init at 3.0.3 This is a useful package in bioinformatics, namely in processing short-read sequencing data from metagenomes --- .../science/biology/sortmerna/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/science/biology/sortmerna/default.nix diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix new file mode 100644 index 00000000000..4adce4461ed --- /dev/null +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -0,0 +1,38 @@ +{ stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }: + +stdenv.mkDerivation rec { + pname = "sortmerna"; + version = "3.0.3"; + + src = fetchFromGitHub { + repo = pname; + owner = "biocore"; + rev = "v${version}"; + sha256 = "0zx5fbzyr8wdr0zwphp8hhcn1xz43s5lg2ag4py5sv0pv5l1jh76"; + }; + + patches = [ + (fetchpatch { + name = "CMakeInstallPrefix.patch"; + url = "https://github.com/biocore/sortmerna/commit/4d36d620a3207e26cf3f588d4ec39889ea21eb79.patch"; + sha256 = "0hc3jwdr6ylbyigg52q8islqc0mb1k8rrjadvjfqaxnili099apd"; + }) + ]; + + nativeBuildInputs = [ cmake rapidjson pkgconfig ]; + buildInputs = [ zlib rocksdb rapidjson ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DROCKSDB_HOME=${rocksdb}" + "-DRAPIDJSON_HOME=${rapidjson}" + ]; + + meta = with stdenv.lib; { + description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data"; + license = licenses.lgpl3; + platforms = platforms.x86_64; + homepage = https://bioinfo.lifl.fr/RNA/sortmerna/; + maintainers = with maintainers; [ luispedro ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a40002f7c..6fe152f629d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22853,6 +22853,8 @@ in somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; + sortmerna = callPackage ../applications/science/biology/sortmerna { }; + stacks = callPackage ../applications/science/biology/stacks { }; star = callPackage ../applications/science/biology/star { }; From f1ce41d78e002b47fa3f57dbcde61e77b0cf61f0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 27 Aug 2019 01:06:35 -0400 Subject: [PATCH 032/283] gnome3.gnome-control-center: add optional sharing deps It appears that if gnome-control-center isn't wrapped with their schemas they won't be added to the panel. --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++++ 1 file changed, 4 insertions(+) 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 6f137cc65d5..04730f2370f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -60,6 +60,8 @@ , udisks2 , upower , vino +, gnome-user-share +, gnome-remote-desktop , wrapGAppsHook }: @@ -99,7 +101,9 @@ stdenv.mkDerivation rec { gnome-bluetooth gnome-desktop gnome-online-accounts + gnome-remote-desktop # optional, sharing panel gnome-settings-daemon + gnome-user-share # optional, sharing panel grilo grilo-plugins # for setting wallpaper from Flickr gsettings-desktop-schemas From 27977f030f4f0fc14e3c1f5cf3da212023a40d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 10 Jul 2019 01:39:30 +0200 Subject: [PATCH 033/283] claws: init at 0.3.2 --- pkgs/tools/misc/claws/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/claws/default.nix diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix new file mode 100644 index 00000000000..10347e6e794 --- /dev/null +++ b/pkgs/tools/misc/claws/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "claws"; + version = "0.3.2"; + + goPackagePath = "github.com/thehowl/${pname}"; + + src = fetchFromGitHub { + rev = version; + owner = "thehowl"; + repo = pname; + sha256 = "0nl7xvdivnabqr98mh3m1pwqznprsaqpagny6zcwwmz480x4pmfz"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/thehowl/claws"; + description = "Interactive command line client for testing websocket servers"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 267cbcc5bca..3dbd8d5a284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -770,6 +770,8 @@ in chkcrontab = callPackage ../tools/admin/chkcrontab { }; + claws = callPackage ../tools/misc/claws { }; + codespell = with python3Packages; toPythonApplication codespell; cozy = callPackage ../applications/audio/cozy-audiobooks { }; From 8a24bc2e08b2433bbb94626725e377965e244e9a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 27 Aug 2019 03:07:57 -0400 Subject: [PATCH 034/283] nixos/gnome-user-share: cleanup * No sessionPath! * add to systemd.packages This is for the gnome-user-share-webdav.service. * Update option description --- .../desktops/gnome3/gnome-user-share.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index 1f6ce2ae968..f8396287770 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -12,14 +12,7 @@ with lib; services.gnome3.gnome-user-share = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable GNOME User Share, a service that exports the - contents of the Public folder in your home directory on the local network. - ''; - }; + enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; }; @@ -30,12 +23,13 @@ with lib; config = mkIf config.services.gnome3.gnome-user-share.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-user-share ]; + environment.systemPackages = [ + pkgs.gnome3.gnome-user-share + ]; - services.xserver.displayManager.sessionCommands = with pkgs.gnome3; '' - # Don't let gnome-control-center depend upon gnome-user-share - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name} - ''; + systemd.packages = [ + pkgs.gnome3.gnome-user-share + ]; }; From 821daf6598d877ea345d4ab0e1f317371116720e Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 27 Aug 2019 13:04:18 +0200 Subject: [PATCH 035/283] wire-desktop: 3.9.2895 -> 3.10.2904, mac 3.9.2943 -> 3.10.3133 --- .../instant-messengers/wire-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 10b7eb7d439..36bd10781dc 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -18,13 +18,13 @@ let pname = "wire-desktop"; version = { - "x86_64-linux" = "3.9.2895"; - "x86_64-darwin" = "3.9.2943"; + "x86_64-linux" = "3.10.2904"; + "x86_64-darwin" = "3.10.3133"; }.${system} or throwSystem; sha256 = { - "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5"; - "x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k"; + "x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; + "x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; }.${system} or throwSystem; meta = with stdenv.lib; { From 2c23a35ff6a9e57a6e828919d82ddbdea59eca07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Tue, 27 Aug 2019 14:14:02 +0300 Subject: [PATCH 036/283] oil: 0.6.0 -> 0.7.pre3 --- pkgs/shells/oil/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 48c8fd0815e..9f1bf3ce6af 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,13 +1,12 @@ { stdenv, lib, fetchurl }: -let - version = "0.6.0"; -in -stdenv.mkDerivation { - name = "oil-${version}"; + +stdenv.mkDerivation rec { + pname = "oil"; + version = "0.7.pre3"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl"; + sha256 = "01zc36zaasaagr54rnh90k0j7pbnj0cc6a9pvz6gs6pk91i80lqg"; }; postPatch = '' @@ -22,10 +21,9 @@ stdenv.mkDerivation { dontStrip = true; meta = { + description = "A new unix shell"; homepage = https://www.oilshell.org/; - description = "A new unix shell, still in its early stages"; - license = with lib.licenses; [ psfl # Includes a portion of the python interpreter and standard library asl20 # Licence for Oil itself From b3899e38695fcbccb3585b8f947c1adc012a506c Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 27 Aug 2019 14:35:54 +0300 Subject: [PATCH 037/283] rclone: 1.48.0 -> 1.49.0 --- pkgs/applications/networking/sync/rclone/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 13d55bcf476..ce676566577 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.48.0"; + version = "1.49.0"; src = fetchFromGitHub { - owner = "ncw"; + owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0wxsn3ynkwh2np12sxdmy435nclg2ry7cw26brz11xc0ri4x9azg"; + sha256 = "13xzz6nl4863dyn9w1qczap77bbiwzp4znbifa9hg91qys0nj5ga"; }; - modSha256 = "0bbpny7xcwsvhmdypgbbr0gqc5pa40m71qhbps6k0v09rsgqhpn3"; + modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; subPackages = [ "." ]; From 1d6005e113431b63455c8323222c972e4ca3b3a5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 27 Aug 2019 12:00:26 +0200 Subject: [PATCH 038/283] jameica: 2.8.2 -> 2.8.4 --- pkgs/applications/office/jameica/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 61cc3ea78f0..7b4feed1733 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.8.2"; - _build = "450"; + _version = "2.8.4"; + _build = "453"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "197n35lvx51k6cbp3fhndvfb38sikl4mjqcd42fgvn2khy2sij68"; + sha256 = "1imm3wpdrgh2sr2wh9vgaf2mp1ixs845vgzk5ib82mak7lg9m1zl"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries From 41505960a7fdb7259ed74b89542549f1e93693fc Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Tue, 27 Aug 2019 16:33:00 +0200 Subject: [PATCH 039/283] gallery-dl: 1.10.1 -> 1.10.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 1ce9bfb1f67..6b57c74c123 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.10.1"; + version = "1.10.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "174d2q7w0kwa6xx9k3bl5gdwmk0gklvch963g7vl979wqsf7nskw"; + sha256 = "09q9l747vv6nrkscj08dv970qs6nm2azjcm015xf3bd5ab91l44r"; }; doCheck = false; From eee23c116f19c3398b571b217445b4be0b0c0257 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 27 Aug 2019 16:35:38 +0200 Subject: [PATCH 040/283] prometheus-gitlab-ci-pipelines-exporter: init at 0.2.5 --- .../gitlab-ci-pipelines-exporter.nix | 27 ++ .../gitlab-ci-pipelines-exporter_deps.nix | 390 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 418 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix create mode 100644 pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix new file mode 100644 index 00000000000..06eba474c99 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "gitlab-ci-pipelines-exporter"; + version = "0.2.5"; + + goPackagePath = "github.com/mvisonneau/gitlab-ci-pipelines-exporter"; + + goDeps = ./gitlab-ci-pipelines-exporter_deps.nix; + + src = fetchFromGitHub { + owner = "mvisonneau"; + repo = pname; + rev = version; + sha256 = "0qmy6pqfhx9bphgh1zqi68kp0nscwy1x7z13lfiaaz8pgsjh95yy"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights"; + homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; + license = licenses.asl20; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix new file mode 100644 index 00000000000..d439c9aab10 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix @@ -0,0 +1,390 @@ +# 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.34.0"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + 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.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + 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/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + 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/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { + goPackagePath = "github.com/heptiolabs/healthcheck"; + fetch = { + type = "git"; + url = "https://github.com/heptiolabs/healthcheck"; + rev = "6ff867650f40"; + sha256 = "17aqrqhx2ibv6mcxsmli6m3hmvwi06cnpaly05daimay3cys5q0l"; + }; + } + { + goPackagePath = "github.com/jpillora/backoff"; + fetch = { + type = "git"; + url = "https://github.com/jpillora/backoff"; + rev = "3050d21c67d7"; + sha256 = "1nxapdx9xg5gwiscfhq7m0w14hj4gaxb4avmgf1mx9zd3jnw9jxv"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + 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.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } + { + 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.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + 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.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.6.0"; + sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.3"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + 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.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/xanzy/go-gitlab"; + fetch = { + type = "git"; + url = "https://github.com/xanzy/go-gitlab"; + rev = "v0.19.0"; + sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "f99c8df09eb5"; + sha256 = "0jwi6c6366999mnpzwx3a2kr7hzvdx97qfwiphx0r7cy0mpf28hf"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ca1201d0de80"; + sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe45"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + }; + } + { + 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 = "fc99dfbffb4e"; + sha256 = "186x8bg926qb9sprs5zpd97xzvvhc2si7q1nhvyg12r5cd6v7zjd"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "d0a3d012864b"; + sha256 = "1s2jbb94hbcb01hgkd9kzb9js13grj80a72il7467pm57b3rnggg"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.6.1"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + 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 = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e15740dc371..da56a4c2989 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15013,6 +15013,7 @@ in prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; + 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-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; From 4081bec5ac3b60f757807356e1b41ddbee7824d8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 27 Aug 2019 11:00:58 -0400 Subject: [PATCH 041/283] zsh: remove unfunction on TERM=dumb Unfortunately this gives an error when precmd or preexec exists. Removing to avoid that. --- nixos/modules/programs/zsh/zsh.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 27f4166e100..6e9eefd74d1 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -214,7 +214,6 @@ in # Need to disable features to support TRAMP if [ "$TERM" = dumb ]; then unsetopt zle prompt_cr prompt_subst - unfunction precmd preexec unset RPS1 RPROMPT PS1='$ ' PROMPT='$ ' From 98a283af558a33013265a69a4471481070bc1a4b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 27 Aug 2019 14:30:06 +0300 Subject: [PATCH 042/283] mkgmap: init at 4289 --- pkgs/applications/misc/mkgmap/build.xml.patch | 11 ++++ pkgs/applications/misc/mkgmap/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 70 insertions(+) create mode 100644 pkgs/applications/misc/mkgmap/build.xml.patch create mode 100644 pkgs/applications/misc/mkgmap/default.nix diff --git a/pkgs/applications/misc/mkgmap/build.xml.patch b/pkgs/applications/misc/mkgmap/build.xml.patch new file mode 100644 index 00000000000..6ec40786b24 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/build.xml.patch @@ -0,0 +1,11 @@ +--- a/build.xml 2019-08-26 23:22:55.104829846 +0300 ++++ b/build.xml 2019-08-27 00:11:07.366257594 +0300 +@@ -227,7 +227,7 @@ + + + +- + + diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix new file mode 100644 index 00000000000..debcea78f55 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, fetchsvn, jdk, jre, ant, makeWrapper }: + +let + fastutil = fetchurl { + url = "http://ivy.mkgmap.org.uk/repo/it.unimi.dsi/fastutil/6.5.15-mkg.1b/jars/fastutil.jar"; + sha256 = "0d88m0rpi69wgxhnj5zh924q4zsvxq8m4ybk7m9mr3gz1hx0yx8c"; + }; + osmpbf = fetchurl { + url = "http://ivy.mkgmap.org.uk/repo/crosby/osmpbf/1.3.3/jars/osmpbf.jar"; + sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3"; + }; + protobuf = fetchurl { + url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; + sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0"; + }; +in + +stdenv.mkDerivation rec { + pname = "mkgmap"; + version = "4289"; + + src = fetchsvn { + url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; + rev = version; + sha256 = "1sm1pw71q7z0jrxm8bcgm6xjl2mcidyibcf0a3m8fv2andidxrb4"; + }; + + # This patch removes from the build process + # the automatic download of dependencies (see configurePhase) + patches = [ ./build.xml.patch ]; + + nativeBuildInputs = [ jdk ant makeWrapper ]; + + configurePhase = '' + mkdir -p lib/compile + cp ${fastutil} ${osmpbf} ${protobuf} lib/compile/ + ''; + + buildPhase = "ant"; + + installPhase = '' + cd dist + install -Dm644 mkgmap.jar $out/share/java/mkgmap/mkgmap.jar + install -Dm644 doc/mkgmap.1 $out/share/man/man1/mkgmap.1 + cp -r lib/ $out/share/java/mkgmap/ + makeWrapper ${jre}/bin/java $out/bin/mkgmap \ + --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" + ''; + + meta = with stdenv.lib; { + description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; + homepage = "http://www.mkgmap.org.uk"; + license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbe2e49bc8f..dc5c6ee5438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5027,6 +5027,8 @@ in milu = callPackage ../applications/misc/milu { }; + mkgmap = callPackage ../applications/misc/mkgmap { }; + mpack = callPackage ../tools/networking/mpack { }; mtm = callPackage ../tools/misc/mtm { }; From 1296b10c31b2205990ed7751dd01f103a2b06f70 Mon Sep 17 00:00:00 2001 From: Boris Babic Date: Mon, 26 Aug 2019 17:54:02 +0200 Subject: [PATCH 043/283] python3Packages.pre-commit: 1.18.1 -> 1.18.2 --- pkgs/development/python-modules/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 6b65af073f4..7b5377cc15a 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -14,12 +14,12 @@ buildPythonApplication rec { pname = "pre-commit"; - version = "1.18.1"; + version = "1.18.2"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp"; + sha256 = "1y6gd6nq8mfyjxknrgdryvn1bj5arvwaz2r00h41g054lfg3iki1"; }; propagatedBuildInputs = [ From b4a4d98c5297e8d9bfe7b1794e9a875bcb4e339f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 25 Aug 2019 18:06:33 +0200 Subject: [PATCH 044/283] vde2: build with `--disable-python` by default This package explicitly depends on `python2` which will be EOLed at the end of the year[1]. This package provides python bindings for `python2`, however the latest release (also used by other distros) is from 2011[2] and doesn't support v3. For instance, debian ships `vde2` without `python2` support since Debian Jessie[3]. KVM and QEMU appear to build fine, also NixOS tests and ISO builds are still functional. By running `nix-review` against this change, only `xen` packages failed, but those were already broken on master[4]. Finally it's also worth mentioning that the closure size of `vde2` drops from 99.5M to 33.5M without `python2` according to `nix path-info -S -h`. [1] https://pythonclock.org/ [2] https://github.com/virtualsquare/vde-2/releases/tag/vde-2 (vde.sourceforge.net redirects to this github page) [3] https://packages.debian.org/en/jessie/vde2 [4] https://hydra.nixos.org/build/99185451, https://hydra.nixos.org/build/99187262 --- pkgs/tools/networking/vde2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index ac87a5c10e9..4ea09cd7f00 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2 }: +{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }: stdenv.mkDerivation rec { name = "vde2-2.3.2"; @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { } ); + configureFlags = stdenv.lib.optional (!withPython) [ "--disable-python" ]; - buildInputs = [ openssl libpcap python2 ]; + buildInputs = [ openssl libpcap ] + ++ stdenv.lib.optional withPython python2; hardeningDisable = [ "format" ]; From bb3f8ea9e23f53ee2172c81df5d0aaab260bb3ac Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 25 Aug 2019 18:33:10 +0300 Subject: [PATCH 045/283] pykde4: pin to openssl 1.0.2 --- pkgs/development/python-modules/pykde4/default.nix | 8 +++++--- pkgs/development/python-modules/pykde4/kdelibs.nix | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix index 0770520ceee..850e6400073 100644 --- a/pkgs/development/python-modules/pykde4/default.nix +++ b/pkgs/development/python-modules/pykde4/default.nix @@ -1,8 +1,10 @@ -{ pyqt4, - stdenv, callPackage, fetchurl, cmake, automoc4, sip }: +{ pyqt4, openssl_1_0_2 +, stdenv, callPackage, fetchurl, cmake, automoc4, sip }: let - kdelibs = callPackage ./kdelibs.nix {}; + kdelibs = callPackage ./kdelibs.nix { + openssl = openssl_1_0_2; + }; sip4_19_3 = sip.overrideAttrs (oldAttrs: rec { src = fetchurl { url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz"; diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix index c5e148d1500..073a2e624a5 100644 --- a/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -2,7 +2,7 @@ stdenv, fetchurl, automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info, attica, docbook_xml_dtd_42, docbook_xsl, giflib, - libdbusmenu_qt, libjpeg, phonon, qt4 + libdbusmenu_qt, libjpeg, phonon, qt4, openssl }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info ]; buildInputs = [ - attica giflib libdbusmenu_qt libjpeg + attica giflib libdbusmenu_qt libjpeg openssl ]; propagatedBuildInputs = [ qt4 phonon ]; From c09bc3e7e2f29b860bc554e04176953989a5b940 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 27 Aug 2019 17:45:00 +0200 Subject: [PATCH 046/283] svtplay-dl: 2.1 -> 2.2 Also remove no longer supported dependency on rtmpdump. --- pkgs/tools/misc/svtplay-dl/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5502f2542f1..15b8f1bf3b4 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,27 +1,24 @@ { stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip -, rtmpdump, gitMinimal }: +, gitMinimal }: let inherit (python3Packages) python nose pycrypto pyyaml requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1cnc32gbhs955391hs1x1jpjsl3b6pqy7ysdydmp9q1i2rw105ln"; + sha256 = "02yjz17x8dl5spn7mcbj1ji7vsyx0qwwa60zqyrdxpr03g1rnhdz"; }; pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths; + buildInputs = [ python perl nose mock makeWrapper ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip ]; postPatch = '' - substituteInPlace lib/svtplay_dl/fetcher/rtmp.py \ - --replace '"rtmpdump"' '"${rtmpdump}/bin/rtmpdump"' - substituteInPlace scripts/run-tests.sh \ --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' ''; From 19fbc4a1dad091f7e1e3dea245c900b6e4f9ef52 Mon Sep 17 00:00:00 2001 From: Vika Date: Tue, 27 Aug 2019 19:31:06 +0300 Subject: [PATCH 047/283] brave: 0.67.123 -> 0.68.131 --- 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 ca5d3d0b665..45fb820a076 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.67.123"; + version = "0.68.131"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "00kpysk84xwmlwziq7pjizmi2ljgiq45l1x743qkfflxlh0pj21m"; + sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l"; }; dontConfigure = true; From 56a7bc05e1265a2ef964f25a5df2de2f1f776df2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 24 Aug 2019 16:52:17 +0200 Subject: [PATCH 048/283] nixos/treewide: drop dependencies to `keys.target` The `keys.target` is used to indicate whether all NixOps keys were successfully uploaded on an unattended reboot. However this can cause startup issues e.g. with NixOS containers (see #67265) and can block boots even though this might not be needed (e.g. with a dovecot2 instance running that doesn't need any of the NixOps keys). As described in the NixOps manual[1], dependencies to keys should be defined like this now: ``` nix { systemd.services.myservice = { after = [ "secret-key.service" ]; wants = [ "secret-key.service" ]; }; } ``` However I'd leave the issue open until it's discussed whether or not to keep `keys.target` in `nixpkgs`. [1] https://nixos.org/nixops/manual/#idm140737322342384 --- nixos/doc/manual/release-notes/rl-1909.xml | 20 +++++++++++++++++++ nixos/modules/services/mail/dovecot.nix | 3 +-- nixos/modules/services/networking/nsd.nix | 3 +-- .../modules/services/networking/softether.nix | 2 -- .../networking/strongswan-swanctl/module.nix | 5 ++--- .../services/networking/strongswan.nix | 3 +-- .../web-servers/apache-httpd/default.nix | 3 +-- 7 files changed, 26 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 6493bb99596..93cc1f2a138 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -291,6 +291,26 @@ configuration while being better type-checked and mergeable. + + + No service depends on keys.target anymore which is a systemd + target that indicates if all NixOps keys were successfully uploaded. + Instead, <key-name>-key.service should be used to define + a dependency of a key in a service. The full issue behind the keys.target + dependency is described at NixOS/nixpkgs#67265. + + + The following services are affected by this: + + services.dovecot2 + services.nsd + services.softether + services.strongswan + services.strongswan-swanctl + services.httpd + + + diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 139011dca23..cdbb776454b 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -344,8 +344,7 @@ in systemd.services.dovecot2 = { description = "Dovecot IMAP/POP3 server"; - after = [ "keys.target" "network.target" ]; - wants = [ "keys.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ cfg.configFile ]; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 8b918dab86d..c69b77f9dee 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -916,9 +916,8 @@ in systemd.services.nsd = { description = "NSD authoritative only domain name service"; - after = [ "keys.target" "network.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - wants = [ "keys.target" ]; serviceConfig = { ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf"; diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 0046dcd366f..65df93a00da 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -70,8 +70,6 @@ in systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; - after = [ "keys.target" ]; - wants = [ "keys.target" ]; wantedBy = [ "network.target" ]; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index 817b5ec55f7..0fec3ef00ad 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -62,9 +62,8 @@ in { systemd.services.strongswan-swanctl = { description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" "keys.target" ]; - wants = [ "keys.target" ]; - path = with pkgs; [ kmod iproute iptables utillinux ]; + after = [ "network-online.target" ]; + path = with pkgs; [ kmod iproute iptables utillinux ]; environment = { STRONGSWAN_CONF = pkgs.writeTextFile { name = "strongswan.conf"; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 41b69039ba7..4ff9c486059 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -151,8 +151,7 @@ in description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux - wants = [ "keys.target" ]; - after = [ "network-online.target" "keys.target" ]; + after = [ "network-online.target" ]; environment = { STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 12200c879be..098160ee369 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -670,8 +670,7 @@ in { description = "Apache HTTPD"; wantedBy = [ "multi-user.target" ]; - wants = [ "keys.target" ]; - after = [ "network.target" "fs.target" "keys.target" ]; + after = [ "network.target" "fs.target" ]; path = [ httpd pkgs.coreutils pkgs.gnugrep ] From 6270d567b2dd4b48500ec6d167a74598d3974598 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Aug 2019 20:03:38 +0200 Subject: [PATCH 049/283] gcc-arm-embedded: 8-2018-q4-major -> 8-2019-q3-update --- pkgs/development/compilers/gcc-arm-embedded/8/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index ee57dcc8c14..562a21716b7 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -4,19 +4,19 @@ with lib; stdenv.mkDerivation rec { name = "gcc-arm-embedded-${version}"; - version = "8-2018-q4-major"; - subdir = "8-2018q4"; + version = "8-2019-q3-update"; + subdir = "8-2019q3/RC1.1"; src = if stdenv.isLinux then fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; + sha256="b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; } else if stdenv.isDarwin then fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; - sha256="0q44r57fizpk1z3ngcjwal3rxgsnzjyfknpgwlwzmw5r9p98wlhb"; + sha256="fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; } else throw "unsupported platform"; From c34746d52cb07a991edc32b89a75329b041c25a6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 27 Aug 2019 09:46:57 +0200 Subject: [PATCH 050/283] sdrangel: add airpsy, hackrf, rtlsdr support --- pkgs/applications/radio/sdrangel/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 63e36fc9143..346c6aeed8e 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -1,4 +1,5 @@ { +airspy, boost, cm256cc, cmake, @@ -6,6 +7,7 @@ codec2, fetchFromGitHub, fftwFloat, glew, +hackrf, lib, libav, libiio, @@ -20,6 +22,7 @@ pkgconfig, qtbase, qtmultimedia, qtwebsockets, +rtl-sdr, serialdv }: @@ -49,9 +52,8 @@ in mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio - qtbase qtwebsockets qtmultimedia - fftwFloat - codec2' cm256cc serialdv + qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf + fftwFloat codec2' cm256cc serialdv ]; cmakeFlags = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" From 540b04493e3edcc91ee98d926cafe8826217d3b0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 13 Aug 2019 15:39:43 +0000 Subject: [PATCH 051/283] xfce4-14.xfdashboard: init at 0.7.5 --- pkgs/desktops/xfce4-14/default.nix | 2 + .../desktops/xfce4-14/xfdashboard/default.nix | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/xfce4-14/xfdashboard/default.nix diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix index d3e46cf2365..82fe5b65356 100644 --- a/pkgs/desktops/xfce4-14/default.nix +++ b/pkgs/desktops/xfce4-14/default.nix @@ -83,6 +83,8 @@ makeScope newScope (self: with self; { xfce4-terminal = callPackage ./xfce4-terminal { }; + xfdashboard = callPackage ./xfdashboard { }; + xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { }; xfce4-whiskermenu-plugin = callPackage ./xfce4-whiskermenu-plugin { }; diff --git a/pkgs/desktops/xfce4-14/xfdashboard/default.nix b/pkgs/desktops/xfce4-14/xfdashboard/default.nix new file mode 100644 index 00000000000..a17c29f6723 --- /dev/null +++ b/pkgs/desktops/xfce4-14/xfdashboard/default.nix @@ -0,0 +1,44 @@ +{ mkXfceDerivation +, clutter +, libXcomposite +, libXinerama +, libXdamage +, libX11 +, libwnck3 +, libxfce4ui +, libxfce4util +, garcon +, xfconf +, gtk3 +, glib +, dbus-glib +}: + +mkXfceDerivation { + category = "apps"; + pname = "xfdashboard"; + version = "0.7.5"; + rev = "0.7.5"; + + sha256 = "0d0kg90h3li41bs75z3xldljsglkz220pba39c54qznnzb8v8a2i"; + + buildInputs = [ + clutter + dbus-glib + garcon + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXinerama + libwnck3 + libxfce4ui + libxfce4util + xfconf + ]; + + meta = { + description = "Gnome shell like dashboard"; + }; +} From 35c1c170d7dc49bf3f878a2170be487c5d27c8b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Aug 2019 21:17:20 +0200 Subject: [PATCH 052/283] nix.conf: Set sandbox-fallback = false For security, we don't want the sandbox to be disabled silently. --- nixos/modules/services/misc/nix-daemon.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 6bc88c66dc1..088dfd71860 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -8,7 +8,9 @@ let nix = cfg.package.out; - isNix20 = versionAtLeast (getVersion nix) "2.0pre"; + nixVersion = getVersion nix; + + isNix20 = versionAtLeast nixVersion "2.0pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -61,6 +63,9 @@ let builders = ''} system-features = ${toString cfg.systemFeatures} + ${optionalString (versionAtLeast nixVersion "2.3pre") '' + sandbox-fallback = false + ''} $extraOptions END '' + optionalString cfg.checkConfig ( From 1d30da1e2b463ae0f3c5d2438c27e580206322f6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 26 Aug 2019 14:13:45 -0400 Subject: [PATCH 053/283] pythonPackages.elpy: 1.28.0 -> 1.29.1 add tests --- .../python-modules/elpy/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix index 3816a8c42e7..f30dc218379 100644 --- a/pkgs/development/python-modules/elpy/default.nix +++ b/pkgs/development/python-modules/elpy/default.nix @@ -1,32 +1,43 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , rope , flake8 , autopep8 , jedi , importmagic -, isPy27 +, black +, mock +, nose +, yapf +, isPy3k }: buildPythonPackage rec { pname = "elpy"; - version = "1.28.0"; + version = "1.29.1"; - src = fetchPypi { - inherit pname version; - sha256 = "0lx6bf6ajx6wmnns03gva5sh1mmmxahjaqrn735cgwn6j4ikyqfs"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = pname; + rev = version; + sha256 = "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf"; }; - propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ] - ++ stdenv.lib.optionals isPy27 [ rope ]; + propagatedBuildInputs = [ flake8 autopep8 jedi importmagic rope yapf ] + ++ stdenv.lib.optionals isPy3k [ black ]; - doCheck = false; # there are no tests + checkInputs = [ mock nose ]; + + checkPhase = '' + HOME=$(mktemp -d) nosetests -e "test_should_complete_top_level_modules_for_import" + ''; meta = with stdenv.lib; { description = "Backend for the elpy Emacs mode"; homepage = "https://github.com/jorgenschaefer/elpy"; license = licenses.gpl3; + maintainers = [ maintainers.costrouc ]; }; } From 2c0bb593c6af2edcd8bff478298ba436123c1f3f Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Tue, 27 Aug 2019 19:30:56 +0000 Subject: [PATCH 054/283] dino: 2019-02-06 -> 2019-08-27 --- .../networking/instant-messengers/dino/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 2158409471f..c333ae7ddcb 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2019-03-07"; + name = "dino-unstable-2019-08-27"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "cc7b0aa7bd5b6599159f654fdd8a2fd111e16a3e"; - sha256 = "1cq62vif92fz38si2bl49qwy4ys9gxdrvzkv25av6c6nwmyih4gv"; + rev = "ff6caf241c4d57d3ef124a8b7c3144a09f320ea0"; + sha256 = "1gjxfnywlypi3slvxb91b2mycrsqjinmafnkkngahyikr7gmqgnf"; fetchSubmodules = true; }; From eb5ba591d9d5defc3a4e90322c9dda3a767723d9 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sun, 25 Aug 2019 14:26:03 +0200 Subject: [PATCH 055/283] elmPackages: share node-env.nix, add elm-live & elm-xref --- pkgs/development/compilers/elm/default.nix | 5 +- .../elm/packages/generate-node-packages.sh | 6 +- .../elm/packages/node-composition.nix | 2 +- .../compilers/elm/packages/node-env.nix | 540 ------ .../compilers/elm/packages/node-packages.json | 6 +- .../compilers/elm/packages/node-packages.nix | 1722 ++++++++++++----- 6 files changed, 1296 insertions(+), 985 deletions(-) delete mode 100644 pkgs/development/compilers/elm/packages/node-env.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index fbb991d7b5a..c8bef546b6d 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -56,8 +56,9 @@ let */ elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test; elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples; - elm-analyse = elmNodePackages.elm-analyse; - inherit (elmNodePackages) elm-doc-preview elm-upgrade; + # elm-analyse@0.16.4 build is not working + elm-analyse = elmNodePackages."elm-analyse-0.16.3"; + inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref; }; in elmPkgs // { inherit elmPkgs; diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 0e1835c6ffa..1d24df549ea 100755 --- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -4,4 +4,8 @@ set -eu -o pipefail rm -f node-env.nix -node2nix --nodejs-10 -i node-packages.json -o node-packages.nix -c node-composition.nix +node2nix --nodejs-10 \ + -i node-packages.json \ + -o node-packages.nix \ + -c node-composition.nix \ + --no-copy-node-env -e ../../../node-packages/node-env.nix diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index fa0a1482f97..1ffd758ac82 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -5,7 +5,7 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let - nodeEnv = import ./node-env.nix { + nodeEnv = import ../../../node-packages/node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix deleted file mode 100644 index 670556bf271..00000000000 --- a/pkgs/development/compilers/elm/packages/node-env.nix +++ /dev/null @@ -1,540 +0,0 @@ -# This file originates from node2nix - -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: - -let - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${stdenv.lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # 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 - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - if [ "$dontNpmInstall" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node_${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < Date: Tue, 27 Aug 2019 17:15:47 -0300 Subject: [PATCH 056/283] enlightenment.efl: 1.22.2 -> 1.22.3 --- pkgs/desktops/enlightenment/efl.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index a7f5eaf6339..1876cce6c8a 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - name = "efl-${version}"; - version = "1.22.2"; + pname = "efl"; + version = "1.22.3"; src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n"; + url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky"; }; nativeBuildInputs = [ pkgconfig gtk3 ]; From ca15e26d4d858c6683c16f0d291af64b2aaf1dc9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Aug 2019 21:46:43 +0200 Subject: [PATCH 057/283] appstream-glib: clean up dependencies --- .../libraries/appstream-glib/default.nix | 59 +++++++++++++++---- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 4068e36badf..694d91d5a0a 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,7 +1,26 @@ -{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib -, gtk-doc, libarchive, gobject-introspection, libxslt, pngquant -, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42 -, libuuid, json-glib, meson, gperf, ninja, gdk-pixbuf +{ stdenv +, fetchFromGitHub +, substituteAll +, docbook_xml_dtd_42 +, docbook_xsl +, fontconfig +, freetype +, gdk-pixbuf +, gettext +, glib +, gobject-introspection +, gperf +, gtk-doc +, gtk3 +, json-glib +, libarchive +, libsoup +, libuuid +, libxslt +, meson +, ninja +, pkgconfig +, pngquant }: stdenv.mkDerivation rec { name = "appstream-glib-0.7.15"; @@ -12,19 +31,39 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; - rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; + rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; sha256 = "16cqs1s7nqc551sipgaxbbzwap1km0n12s4lcgfbxzzl9bcjbp9m"; }; nativeBuildInputs = [ - meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 gobject-introspection + docbook_xml_dtd_42 + docbook_xsl + gettext + gobject-introspection + gperf + gtk-doc + libxslt + meson + ninja + pkgconfig ]; + buildInputs = [ - glib gettext sqlite libsoup - attr acl libuuid json-glib - libarchive gperf gdk-pixbuf + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + json-glib + libarchive + libsoup + libuuid + ]; + + propagatedBuildInputs = [ + glib + gdk-pixbuf ]; - propagatedBuildInputs = [ gtk3 ]; patches = [ (substituteAll { From 70f0d81861c71317828dde3262c0439c55dda83f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Aug 2019 22:37:17 +0200 Subject: [PATCH 058/283] androidStudioPackages.{dev,canary}: 3.6.0.7 -> 3.6.0.8 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 7f57d24b263..4b9e2f40950 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.7"; # "Android Studio 3.6 Canary 7" - build = "192.5807797"; - sha256Hash = "1l47miiyd8z7v0hbvda06953pp9ilyrsma83gxqx35ghnc0n7g81"; + version = "3.6.0.8"; # "Android Studio 3.6 Canary 8" + build = "192.5825043"; + sha256Hash = "1nh8p880pz3x7hlwa3inkr9qkd95amkg0sv4f0m7bb70k9v5mnvv"; }; in rec { # Attributes are named by their corresponding release channels From 81e643d2fdb843d2c1f5f005d9e210519a6808ea Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Aug 2019 22:38:46 +0200 Subject: [PATCH 059/283] python3Packages.glances: 3.1.1 -> 3.1.2 Changelog: https://github.com/nicolargo/glances/blob/v3.1.2/NEWS.rst#version-312 Note/TODO: Theoretically the IP test should work(?) now: > Bugs corrected: > - Error with IP Plugin : object has no attribute bug #1528 > - ip plugin empty interface bug #1509 but the test is still failing inside the Nix build sandbox. --- pkgs/development/python-modules/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix index dd5d90bb968..95c64e7187b 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/development/python-modules/glances/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { name = "glances-${version}"; - version = "3.1.1"; + version = "3.1.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1x9gw7hzw3p8zki82wdf359yxj0ylfw2096a4y621kj0p4xqsr4q"; + sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): From 0a72c327232108a90153a9bd69f86271553039af Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Mon, 8 Jul 2019 06:49:41 -0600 Subject: [PATCH 060/283] libplacebo: init at 1.1.8.0 --- .../libraries/libplacebo/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/libraries/libplacebo/default.nix diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix new file mode 100644 index 00000000000..3fd8f86612c --- /dev/null +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, vulkan-headers +, vulkan-loader +, shaderc +, glslang +, lcms2 +}: + +stdenv.mkDerivation rec { + pname = "libplacebo"; + version = "1.18.0"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = pname; + rev = "v${version}"; + sha256 = "0ib12i2491piwiz0g5n5izr5jmn5fhwzicq97vfki3r7wrdb54mz"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + vulkan-headers + vulkan-loader + shaderc + glslang + lcms2 + ]; + + meta = with stdenv.lib; { + description = "Reusable library for GPU-accelerated video/image rendering primitives"; + homepage = "https://code.videolan.org/videolan/libplacebo"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3abf9eaa090..69734fb117f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12268,6 +12268,8 @@ in libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libplacebo = callPackage ../development/libraries/libplacebo { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; From 61ba5d88ef87fa5f484518054810c90da3835409 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Aug 2019 23:20:06 +0200 Subject: [PATCH 061/283] dav1d: Add optional Vulkan support (experimental) --- pkgs/development/libraries/dav1d/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 5f7ca179d4a..d065554d7c9 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchFromGitLab , meson, ninja, nasm, pkgconfig , withTools ? false, SDL2 +, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers }: +assert useVulkan -> withTools; + stdenv.mkDerivation rec { pname = "dav1d"; version = "0.4.0"; @@ -17,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja nasm pkgconfig ]; # TODO: doxygen (currently only HTML and not build by default). - buildInputs = stdenv.lib.optional withTools SDL2; + buildInputs = stdenv.lib.optional withTools SDL2 + ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; mesonFlags= [ "-Denable_tools=${stdenv.lib.boolToString withTools}" From 09b1501d7ce05dfd70a333e6eb4113376f4e0931 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 27 Aug 2019 23:57:35 +0200 Subject: [PATCH 062/283] thanos: 0.6.0 -> 0.6.1 --- pkgs/servers/monitoring/thanos/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 28218b8f66d..ab2f187e504 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,13 +1,13 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { rev = "v${version}"; - owner = "improbable-eng"; + owner = "thanos-io"; repo = "thanos"; - sha256 = "0vcp7m8fsk4jyk49jh9wmbvkx5k03xw10f4lbsxfmwib1y5pz2x0"; + sha256 = "06vy22cy81rd71py8057bia3265vjm6ffp16wpx06faramdazq6p"; }; modSha256 = "139b66jdryqv4s1hjbn9fzkyzn1160wr4z6a6wmmvm3f6p6wgjxp"; @@ -25,7 +25,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Highly available Prometheus setup with long term storage capabilities"; - homepage = "https://github.com/improbable-eng/thanos"; + homepage = "https://github.com/thanos-io/thanos"; license = licenses.asl20; maintainers = with maintainers; [ basvandijk ]; platforms = platforms.unix; From 6e672974ccb6ba12e80ca4c589a11dad85d19f95 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Tue, 27 Aug 2019 17:58:20 -0500 Subject: [PATCH 063/283] unixODBCDrivers.msodbcsql17: 17.2.0.1 -> 17.4.1.1 --- .../libraries/unixODBCDrivers/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 7b72e12a66b..99535ec395e 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -125,16 +125,16 @@ version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; - versionMinor = "2"; - versionAdditional = "0.1"; + versionMinor = "4"; + versionAdditional = "1.1"; src = fetchurl { url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; - sha256 = "1966ymbbk0jsacqwzi3dmhxv2n8hfgnpjsx3hr3n7s9d88chgpx5"; + sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ unixODBC dpkg openssl kerberos curl libuuid stdenv.cc.cc ]; + buildInputs = [ unixODBC dpkg kerberos libuuid stdenv.cc.cc ]; unpackPhase = "dpkg -x $src ./"; buildPhase = ""; @@ -142,8 +142,6 @@ installPhase = '' mkdir -p $out mkdir -p $out/lib - ln -s ${lib.getLib openssl}/lib/libssl.so.1.0.0 $out/lib/libssl.so.1.0.2 - ln -s ${lib.getLib openssl}/lib/libcrypto.so.1.0.0 $out/lib/libcrypto.so.1.0.2 cp -r opt/microsoft/msodbcsql${versionMajor}/lib64 opt/microsoft/msodbcsql${versionMajor}/share $out/ ''; From 3d321db0f25c6419357441398a64cdcbe9371244 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Wed, 28 Aug 2019 01:00:33 +0200 Subject: [PATCH 064/283] cryptpad: 2.23.0 -> 2.25.0 (#67592) Update to latest stable version. Remove patched load-config.js, because it is no longer necessary. --- .../web-apps/cryptpad/bower-packages.nix | 10 +- pkgs/servers/web-apps/cryptpad/default.nix | 9 -- .../cryptpad/node-packages-generated.nix | 96 ++++++------------- .../web-apps/cryptpad/node-packages.json | 2 +- .../web-apps/cryptpad/node-packages.nix | 2 +- 5 files changed, 37 insertions(+), 82 deletions(-) diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix index 72511c16eeb..8d3d3def695 100644 --- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -5,7 +5,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g") (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1") (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414") - (fetchbower "codemirror" "5.47.0" "^5.19.0" "0h9kjmljd9i5hsdk53f6klx3k8vf9kfn14j0s7k3ivb5d0x0r1p4") + (fetchbower "codemirror" "5.48.4" "^5.19.0" "1066jrf11dygdr8v7xv2nyzrq4ks7sc6j8wdqvrwl689pw3ycypf") (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli") (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r") (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv") @@ -22,7 +22,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9") (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") - (fetchbower "nthen" "0.1.7" "^0.1.5" "1bxfjw7qzs0sidv6wf1rjrj4fm0x0j7pr5yi3v4nw3d7cjjgd3wg") + (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8") (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") @@ -31,9 +31,9 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x") (fetchbower "sortablejs" "1.9.0" "^1.6.0" "12gncd70fi3craqqpb3la12hg7pm2wf4y01l1r2vvmnzmb5apdan") (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") - (fetchbower "jszip" "Stuk/jszip#3.2.0" "Stuk/jszip#^3.1.5" "1gyhm07dsqw2bmj6xddfk91f05gj7xd3gxjd94lsxy8z66z6zia5") + (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp") (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") - (fetchbower "chainpad-netflux" "0.7.5" "^0.7.0" "1dgi1x00msbr203xf3lz8pqhd0w2h5nqa3pqzly1559jfxbyw8g0") - (fetchbower "netflux-websocket" "0.1.19" "^0.1.19" "0gzn4bxa6biad083aawn6qpwmg3raqb059mapzalaqjb9bvs8x26") + (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc") + (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s") (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") ]; } diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix index 679cedf2522..f406aa83e35 100644 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -45,12 +45,6 @@ let nodePackages ; - # Get the patched load-config.js that allows loading config from the env - dynamicConfig = fetchurl { - url = "https://raw.githubusercontent.com/zimbatm/cryptpad/35dd3abbb5ef6e3f9d5fb0b31b693c430d159b4a/lib/load-config.js"; - sha256 = "1ch6r4fkcvyxhc501nmdc39zpnxcqwgwkj7nb39ayflkhil19f6a"; - }; - combined = cryptpad.override { postInstall = '' out_cryptpad=$out/lib/node_modules/cryptpad @@ -60,9 +54,6 @@ let ${bowerPackages}/bower_components \ $out_cryptpad/www/bower_components - # patch the load-config.js file - cp ${dynamicConfig} $out_cryptpad/lib/load-config.js - # add executable mkdir $out/bin cat < $out/bin/cryptpad diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index f53a1dcf66b..b2a943dc2df 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -22,13 +22,13 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; - "async-limiter-1.0.0" = { + "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "body-parser-1.18.3" = { @@ -49,13 +49,13 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "chainpad-server-3.0.2" = { + "chainpad-server-3.0.3" = { name = "chainpad-server"; packageName = "chainpad-server"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.2.tgz"; - sha512 = "c5aEljVAapDKKs0+Rt2jymKAszm8X4ZeLFNJj1yxflwBqoh0jr8OANYvbfjtNaYFe2Wdflp/1i4gibYX4IMc+g=="; + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.3.tgz"; + sha512 = "NRfV7FFBEYy4ZVX7h0P5znu55X8v5K4iGWeMGihkfWZLKu70GmCPUTwpBCP79dUvnCToKEa4/e8aoSPcvZC8pA=="; }; }; "content-disposition-0.5.2" = { @@ -220,13 +220,13 @@ let sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; }; }; - "graceful-fs-4.1.15" = { + "graceful-fs-4.2.2" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.15"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; - sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; }; }; "http-errors-1.6.3" = { @@ -364,13 +364,13 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "nthen-0.1.8" = { + "nthen-0.1.10" = { name = "nthen"; packageName = "nthen"; - version = "0.1.8"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; - sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; + url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz"; + sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA=="; }; }; "on-finished-2.3.0" = { @@ -382,15 +382,6 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; - "options-0.0.6" = { - name = "options"; - packageName = "options"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -418,13 +409,13 @@ let sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; }; }; - "pull-stream-3.6.12" = { + "pull-stream-3.6.14" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.12"; + version = "3.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.12.tgz"; - sha512 = "+LO1XIVyTMmeoH26UHznpgrgX2npTVYccTkMpgk/EyiQjFt1FmoNm+w+/zMLuz9U3bpvT5sSUicMKEe/2JjgEA=="; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz"; + sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; }; }; "qs-6.5.2" = { @@ -571,15 +562,6 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "ultron-1.0.2" = { - name = "ultron"; - packageName = "ultron"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; - }; - }; "ultron-1.1.1" = { name = "ultron"; packageName = "ultron"; @@ -625,15 +607,6 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "ws-1.1.5" = { - name = "ws"; - packageName = "ws"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; - }; - }; "ws-3.3.3" = { name = "ws"; packageName = "ws"; @@ -646,26 +619,22 @@ let }; in { - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" = nodeEnv.buildNodePackage { + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage { name = "cryptpad"; packageName = "cryptpad"; - version = "2.23.0"; + version = "2.25.0"; src = fetchgit { url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "980e3f964a5b8bcd7c33da92dbe005f42b20cb30"; - sha256 = "a094708e4a275ee55ca3a59a2890f20f2f9f7dcfe50274b7e3ecd260502c583b"; + rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8"; + sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7"; }; dependencies = [ sources."accepts-1.3.7" sources."array-flatten-1.1.1" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."body-parser-1.18.3" sources."bytes-3.0.0" - (sources."chainpad-server-3.0.2" // { - dependencies = [ - sources."ws-3.3.3" - ]; - }) + sources."chainpad-server-3.0.3" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -684,7 +653,7 @@ in sources."fs-extra-7.0.1" sources."gar-1.0.4" sources."get-folder-size-2.0.1" - sources."graceful-fs-4.1.15" + sources."graceful-fs-4.2.2" sources."http-errors-1.6.3" sources."iconv-lite-0.4.23" sources."inherits-2.0.3" @@ -700,13 +669,12 @@ in sources."mime-types-2.1.24" sources."ms-2.0.0" sources."negotiator-0.6.2" - sources."nthen-0.1.8" + sources."nthen-0.1.10" sources."on-finished-2.3.0" - sources."options-0.0.6" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.5" - sources."pull-stream-3.6.12" + sources."pull-stream-3.6.14" sources."qs-6.5.2" sources."range-parser-1.2.1" sources."raw-body-2.3.3" @@ -728,11 +696,7 @@ in sources."unpipe-1.0.0" sources."utils-merge-1.0.1" sources."vary-1.1.2" - (sources."ws-1.1.5" // { - dependencies = [ - sources."ultron-1.0.2" - ]; - }) + sources."ws-3.3.3" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json index 9d2b233f767..c37d984ae12 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.json +++ b/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -1,3 +1,3 @@ [ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" } + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" } ] diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index 75e28e2382e..36c5996286f 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { From d15019d43919e1aa31b0d1b4e51183cc2960a403 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 27 Aug 2019 23:40:01 +0200 Subject: [PATCH 065/283] gnome2.libglade: make python2 build optional Python2 is only needed for `libglade-convert`[1] which is a simple script that converts old glade files into new glade files and for tests and docs which we currently don't generate. As Python2 is about to get EOLed and this is mostly a tool to migrate old data, it shouldn't be built by default. With this change, `xscreensaver` and `xsecurelock` don't depend on Python2 anymore. [1] https://manpages.ubuntu.com/manpages/trusty/man1/libglade-convert.1.html --- pkgs/desktops/gnome-2/platform/libglade/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index c61ecc16f15..d51cccf7906 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, pkgconfig, gtk2, libxml2, python, gettext}: +{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: + +assert withLibgladeConvert -> python2 != null; stdenv.mkDerivation { name = "libglade-2.6.4"; @@ -11,7 +13,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 python gettext ]; + buildInputs = [ gtk2 gettext ] + ++ stdenv.lib.optional withLibgladeConvert python2; NIX_LDFLAGS = "-lgmodule-2.0"; From 1aee94dc428138cfb3e0c74451a88c60412c6e6f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Aug 2019 22:40:43 -0500 Subject: [PATCH 066/283] cadvisor: 0.33.1 -> 0.34.0 --- pkgs/servers/monitoring/cadvisor/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 502a3026b2a..d6f3e18e49b 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "15wddg0xwkz42n5y2f72yq3imhbvnp83g1jq6p81ddw9qzbz62zs"; + sha256 = "1hshmhsclja50ja2jqxx2f5lcvbs64n6aw6dw28wbnq3z9v0q8ad"; }; nativeBuildInputs = [ go ]; @@ -17,12 +17,15 @@ stdenv.mkDerivation rec { export GOCACHE="$TMPDIR/go-cache" mkdir -p Godeps/_workspace/src/github.com/google/ ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor - GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor github.com/google/cadvisor + GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor -ldflags="-s -w -X github.com/google/cadvisor/version.Version=${version}" github.com/google/cadvisor ''; installPhase = '' - mkdir -p $out/bin - mv cadvisor $out/bin + runHook preInstall + + install -Dm755 -t $out/bin cadvisor + + runHook postInstall ''; meta = with stdenv.lib; { From 1f3aa24274b8628c799446d577b34802d1470846 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Aug 2019 22:57:05 -0500 Subject: [PATCH 067/283] postgresqlPackages.plv8: 2.3.12 -> 2.3.13 Changes: https://github.com/plv8/plv8/compare/v2.3.12...v2.3.13 --- pkgs/servers/sql/postgresql/ext/plv8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index 89138baa91c..b4f4c357d42 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "plv8"; - version = "2.3.12"; + version = "2.3.13"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "1yi1ibiibvd0x4z5dm698w32ljrj3yr4j25jm1zkgkwd4ii8y644"; + sha256 = "12xpcc1ylzyy75wi1m4vijknzv2gxab05w9z90jb03faq18cnlql"; }; makefile = "Makefile.shared"; From 53641dc81eef26b05ebf1c14d9f5a9892283d45b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Aug 2019 00:00:00 -0500 Subject: [PATCH 068/283] wtf: 0.19.1 -> 0.20.0 --- pkgs/applications/misc/wtf/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 07538f749e8..52462d1c1f3 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "wtf"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "19qzg5blqm5p7rrnaqh4f9aj53i743mawjnd1h9lfahbgmil1d24"; + sha256 = "03k3x3fnxz23b75n5x8mlr6srr063q3dwq05wh55b4bgqsf7lgzd"; }; - modSha256 = "1q21pc4yyiq4dihsb9n7261ssj52nnik8dq6fg4gvlnnpgcjp570"; + modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; # As per https://github.com/wtfutil/wtf/issues/501, one of the # dependencies can't be fetched, so vendored dependencies should From a86fe43558f226b4c748b71c037e82034bff771c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Aug 2019 05:10:10 +0000 Subject: [PATCH 069/283] ocamlPackages.lambdaTerm: remove at 1.6 --- .../ocaml-modules/lambda-term/1.6.nix | 42 ------------------- pkgs/top-level/ocaml-packages.nix | 6 +-- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/lambda-term/1.6.nix diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix deleted file mode 100644 index c0532ff0325..00000000000 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }: - -stdenv.mkDerivation rec { - version = "1.6"; - name = "lambda-term-${version}"; - - src = fetchurl { - url = https://github.com/diml/lambda-term/archive/1.6.tar.gz; - sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; - }; - - buildInputs = [ libev ocaml findlib ocamlbuild lwt react ]; - - propagatedBuildInputs = [ camlp4 zed ]; - - createFindlibDestdir = true; - - meta = { description = "Terminal manipulation library for OCaml"; - longDescription = '' - Lambda-term is a cross-platform library for - manipulating the terminal. It provides an abstraction for keys, - mouse events, colors, as well as a set of widgets to write - curses-like applications. - - The main objective of lambda-term is to provide a higher level - functional interface to terminal manipulation than, for example, - ncurses, by providing a native OCaml interface instead of bindings to - a C library. - - Lambda-term integrates with zed to provide text edition facilities in - console applications. - ''; - - homepage = https://github.com/diml/lambda-term; - license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; - branch = "1.6"; - maintainers = [ - stdenv.lib.maintainers.gal_bolle - ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 16dd32a8a7a..7eabfccf85f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -382,11 +382,7 @@ let lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; - lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; - lambdaTerm = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/lambda-term { } - else lambdaTerm-1_6; + lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; linenoise = callPackage ../development/ocaml-modules/linenoise { }; From f7387ad383926b37f40aa3a87e5383b7765e1448 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Aug 2019 05:10:15 +0000 Subject: [PATCH 070/283] ocamlPackages.utop: 2.3.0 -> 2.4.1 ocamlPackages.zed: 1.6 -> 2.0.3 ocamlPackages.lambdaTerm: 1.13 -> 2.0.2 --- .../ocaml-modules/lambda-term/default.nix | 10 +++------- pkgs/development/ocaml-modules/zed/default.nix | 14 ++++++++------ pkgs/development/tools/ocaml/utop/default.nix | 8 ++++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 18fe235710f..1b5594d5565 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -2,20 +2,16 @@ buildDunePackage rec { pname = "lambda-term"; - version = "1.13"; - - minimumOCamlVersion = "4.02"; + version = "2.0.2"; src = fetchurl { - url = "https://github.com/diml/${pname}/archive/${version}.tar.gz"; - sha256 = "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l"; + url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz"; + sha256 = "1p9yczrx78pf5hvhcg1qiqb2vdlmw6bmhhjsm4wiqjq2cc6piaqw"; }; buildInputs = [ libev ]; propagatedBuildInputs = [ zed lwt_log lwt_react ]; - hasSharedObjects = true; - meta = { description = "Terminal manipulation library for OCaml"; longDescription = '' Lambda-term is a cross-platform library for diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index d9dcf1a5385..9fa42e68c56 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }: let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.6"; - sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v"; + version = "2.0.3"; + sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"; buildInputs = [ dune ]; + propagatedBuildInputs = [ charInfo_width ]; extra = { buildPhase = "dune build -p zed"; inherit (dune) installPhase; }; } else { version = "1.4"; sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; - buildInputs = []; + buildInputs = [ ocamlbuild ]; + propagatedBuildInputs = [ camomile ]; extra = { createFindlibDestdir = true; }; } ; in @@ -26,9 +28,9 @@ stdenv.mkDerivation (rec { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs; + buildInputs = [ ocaml findlib ] ++ param.buildInputs; - propagatedBuildInputs = [ react camomile ]; + propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs; meta = { description = "Abstract engine for text edition in OCaml"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index d9e563952ea..161c08a7f82 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune +{ stdenv, fetchurl, ocaml, findlib, dune , lambdaTerm, cppo, makeWrapper }: @@ -7,16 +7,16 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3.0"; + version = "2.4.1"; name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "1g1xf19fhzwsikp33pv1wf6wb2qdc5y7dzqi46h8c4l850cwscjh"; + sha256 = "0kbg7sfn7jaic7xcy7dm543yzsywirxbgpiv2rzwnp9ny2510f9g"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml findlib ocamlbuild cppo dune ]; + buildInputs = [ ocaml findlib cppo dune ]; propagatedBuildInputs = [ lambdaTerm ]; From d95dca26ab7c7a0031df89e555515afa94e1d137 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 28 Aug 2019 09:47:03 +0200 Subject: [PATCH 071/283] vault: 1.0.2 -> 1.2.2 This upgrades Vault to version 1.2.2. To accomplish this, we migrate to using the `buildGoModule` helper, as since 1.0.2 the Vault build process migrated to modules, and does not vendor its dependencies. We also stop using the vault build script, and gox, as it only really provides value for local development, where it configures GOOS/GOARCH and installs into some convenient dev locations. --- pkgs/tools/security/vault/default.nix | 33 +++++++++------------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 3f366a58320..dcded065276 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,36 +1,25 @@ -{ stdenv, fetchFromGitHub, go, gox, removeReferencesTo }: +{ stdenv, fetchFromGitHub, buildGoModule }: -stdenv.mkDerivation rec { +buildGoModule rec { name = "vault-${version}"; - version = "1.1.3"; + version = "1.2.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0dylwvs95crvn1p7pbyzib979rxzp4ivzvi5k4f5ivp4ygnp597s"; + sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl"; }; - nativeBuildInputs = [ go gox removeReferencesTo ]; + modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; - preBuild = '' - patchShebangs ./ - substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' - sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh - - mkdir -p .git/hooks src/github.com/hashicorp - ln -s $(pwd) src/github.com/hashicorp/vault - - export GOPATH=$(pwd) - export GOCACHE="$TMPDIR/go-cache" - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/bash-completion/completions - - cp pkg/*/* $out/bin/ - find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + buildFlagsArray = [ + "-tags='vault'" + "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\"" + ]; + postInstall = '' + mkdir -p $out/share/bash-completion/completions echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault ''; From 0ecbc63bf0e333217d6315309c4ace92f5af1da7 Mon Sep 17 00:00:00 2001 From: Manuel Mendez <708570+mmlb@users.noreply.github.com> Date: Wed, 28 Aug 2019 04:01:23 -0400 Subject: [PATCH 072/283] zoom-us: 2.9.265650.0716 -> 3.0.285090.0826 (#67588) --- .../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 8aa732fd6ba..5ce59adb2ae 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.9.265650.0716"; + version = "3.0.285090.0826"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1wg5yw8g0c6p9y0wcqxr1rndgclasg7v1ybbx8s1a2p98izjkcaa"; + sha256 = "0brpb5i1lc1hwal0c5n2zh27wxrm4gfbqc6bm2dgwnck04y8i4c5"; }; }; From 83bac3d9740629b2c3dccca10dffb0e9156ff9a3 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Wed, 28 Aug 2019 11:44:57 +0300 Subject: [PATCH 073/283] kanshi: 2019-02-02 -> 1.0.0 --- pkgs/tools/misc/kanshi/default.nix | 47 +++++++++++++----------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/misc/kanshi/default.nix index dac3b0c2c32..d3e0ba029f3 100644 --- a/pkgs/tools/misc/kanshi/default.nix +++ b/pkgs/tools/misc/kanshi/default.nix @@ -1,40 +1,33 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, udev }: -rustPlatform.buildRustPackage -{ - pname = "kanshi-unstable"; - version = "2019-02-02"; +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, wayland }: + +stdenv.mkDerivation rec { + pname = "kanshi"; + version = "1.0.0"; src = fetchFromGitHub { owner = "emersion"; repo = "kanshi"; - rev = "970267e400c21a6bb51a1c80a0aadfd1e6660a7b"; - sha256 = "10lfdan86bmwazpma6ixnv46z9cnf879gxln8gx87v7a1x3ss0bh"; + rev = "v${version}"; + sha256 = "0v50q1s105c2rar6mi1pijm8llsnsp62gv4swd3ddjn5rwallg46"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + buildInputs = [ wayland ]; - cargoSha256 = "0pvkrdjrg9y38vsrqkrvsknzp78sknpmq14rskvij450a9mpihii"; - - meta = { + meta = with stdenv.lib; { description = "Dynamic display configuration tool"; - longDescription = - '' - Kanshi uses a configuration file and a list of available displays to choose - the right settings for each display. It's useful if your window manager - doesn't support multiple display configurations (e.g. i3/Sway). - - For now, it only supports: - - sysfs as backend - - udev as notifier (optional) - - Configuration file - - GNOME (~/.config/monitors.xml) - - Kanshi (see below) - - Sway as frontend + longDescription = '' + kanshi allows you to define output profiles that are automatically enabled + and disabled on hotplug. For instance, this can be used to turn a laptop's + internal screen off when docked. + + kanshi can be used on Wayland compositors supporting the + wlr-output-management protocol. ''; homepage = "https://github.com/emersion/kanshi"; downloadPage = "https://github.com/emersion/kanshi"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.balsoft ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ balsoft ]; + platforms = platforms.linux; }; } From 74ed54cf0c4a589343ae56a4bcd78cb2036b44d9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 28 Aug 2019 16:58:18 +0800 Subject: [PATCH 074/283] hidapi: 0.8.0-RC1 -> 0.9.0 --- pkgs/development/libraries/hidapi/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 05e180161c0..28e96244ba5 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb , darwin }: stdenv.mkDerivation rec { - name = "hidapi-0.8.0-rc1"; + pname = "hidapi"; + version = "0.9.0"; src = fetchFromGitHub { - owner = "signal11"; + owner = "libusb"; repo = "hidapi"; - rev = name; - sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; + rev = "${pname}-${version}"; + sha256 = "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ]; + + enableParallelBuilding = true; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); meta = with stdenv.lib; { - homepage = https://github.com/signal11/hidapi; description = "Library for communicating with USB and Bluetooth HID devices"; + homepage = "https://github.com/libusb/hidapi"; # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; From 07054b42d8c49c2f4fcd71f666837ae2350f235d Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Wed, 28 Aug 2019 11:37:54 +0200 Subject: [PATCH 075/283] wayback_machine_downloader: init at 2.2.1 (#67533) * wayback_machine_downloader: init at 2.2.1 * Fix description --- .../wayback_machine_downloader/Gemfile | 5 +++++ .../wayback_machine_downloader/Gemfile.lock | 13 +++++++++++++ .../wayback_machine_downloader/default.nix | 16 ++++++++++++++++ .../wayback_machine_downloader/gemset.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 48 insertions(+) create mode 100644 pkgs/applications/networking/wayback_machine_downloader/Gemfile create mode 100644 pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock create mode 100644 pkgs/applications/networking/wayback_machine_downloader/default.nix create mode 100644 pkgs/applications/networking/wayback_machine_downloader/gemset.nix diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile b/pkgs/applications/networking/wayback_machine_downloader/Gemfile new file mode 100644 index 00000000000..e519efbf570 --- /dev/null +++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' do + gem 'wayback_machine_downloader' +end diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock new file mode 100644 index 00000000000..86e064347b6 --- /dev/null +++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + wayback_machine_downloader (2.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + wayback_machine_downloader! + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/applications/networking/wayback_machine_downloader/default.nix b/pkgs/applications/networking/wayback_machine_downloader/default.nix new file mode 100644 index 00000000000..49471ebf7e3 --- /dev/null +++ b/pkgs/applications/networking/wayback_machine_downloader/default.nix @@ -0,0 +1,16 @@ +{ lib, bundlerApp, bundlerUpdateScript }: +bundlerApp { + pname = "wayback_machine_downloader"; + exes = [ "wayback_machine_downloader" ]; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "wayback_machine_downloader"; + + meta = with lib; { + description = "Download websites from the Internet Archive Wayback Machine"; + homepage = "https://github.com/hartator/wayback-machine-downloader"; + license = licenses.mit; + maintainers = [ maintainers.manveru ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix new file mode 100644 index 00000000000..615570f1f09 --- /dev/null +++ b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix @@ -0,0 +1,12 @@ +{ + wayback_machine_downloader = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12kb1qmvmmsaihqab1prn6cmynkn6cgb4vf41mgv22wkcgv5wgk2"; + type = "gem"; + }; + version = "2.2.1"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69734fb117f..1f996f185d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5738,6 +5738,8 @@ in qview = libsForQt5.callPackage ../applications/graphics/qview {}; + wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { }; + wiggle = callPackage ../development/tools/wiggle { }; radamsa = callPackage ../tools/security/radamsa { }; From 2d36aa63fdf5ca1dcd7b0ba36ea59c59a8864b03 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 24 Aug 2019 16:41:00 +0200 Subject: [PATCH 076/283] ripasso-cursive: init unstable at 2019-08-27 --- pkgs/tools/security/ripasso/cursive.nix | 30 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/security/ripasso/cursive.nix diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix new file mode 100644 index 00000000000..9eac6b6e5ca --- /dev/null +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, ncurses, python3, openssl, libgpgerror, gpgme, xorg }: + +with rustPlatform; +buildRustPackage rec { + version = "unstable-2019-08-27"; + pname = "ripasso-cursive"; + + src = fetchFromGitHub { + owner = "cortex"; + repo = "ripasso"; + rev = "1b5ef4ae19f95f1422ba5cb09e9e689880599c40"; + sha256 = "1lh1in8knpqz4vbsmdyd4hh8y4bfhxjciysfbq3qzdpdpihgj0nn"; + }; + + cargoSha256 = "0dwaa106vj7jbgshhqpjabsr0zmkg1a5syzky7jcaasvc7r7njwl"; + cargoBuildFlags = [ "-p ripasso-cursive" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + ncurses python3 openssl libgpgerror gpgme xorg.libxcb + ]; + + meta = with stdenv.lib; { + description = "A simple password manager written in Rust"; + homepage = "https://github.com/cortex/ripasso"; + license = licenses.gpl3; + maintainers = with maintainers; [ sgo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df43828460b..8f4fc4502ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1924,6 +1924,8 @@ in conf = config.riot-web.conf or null; }; + ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {}; + roundcube = callPackage ../servers/roundcube { }; roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); From 4d11f5dabda5098e66a59fa1bd909befd39d841f Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 24 Aug 2019 11:41:55 +0000 Subject: [PATCH 077/283] ljsyscall: init at 20180515 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 19 ++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 9117e6d1c55..0ec9ff3d84d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -18,6 +18,7 @@ http,,,,,vcunat inspect,,,,, ldoc,,,,, lgi,,,,, +ljsyscall,,,,lua5_1,lblasc lpeg,,,,,vyp lpeg_patterns,,,,, lpeglabel,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 348f5ef7529..4b8369456b7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -412,6 +412,26 @@ lgi = buildLuarocksPackage { }; }; }; +ljsyscall = buildLuarocksPackage { + pname = "ljsyscall"; + version = "0.12-1"; + + src = fetchurl { + url = https://luarocks.org/ljsyscall-0.12-1.src.rock; + sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; + }; + disabled = (lua.luaversion != "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "http://www.myriabit.com/ljsyscall/"; + description = "LuaJIT Linux syscall FFI"; + maintainers = with maintainers; [ lblasc ]; + license = { + fullName = "MIT"; + }; + }; +}; lpeg = buildLuarocksPackage { pname = "lpeg"; version = "1.0.2-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index e765118464d..a4c1c7fa324 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -80,6 +80,25 @@ with super; */ }); + ljsyscall = super.ljsyscall.override(rec { + version = "unstable-20180515"; + # package hasn't seen any release for a long time + src = pkgs.fetchFromGitHub { + owner = "justincormack"; + repo = "ljsyscall"; + rev = "e587f8c55aad3955dddab3a4fa6c1968037b5c6e"; + sha256 = "06v52agqyziwnbp2my3r7liv245ddmb217zmyqakh0ldjdsr8lz4"; + }; + knownRockspec = "rockspec/ljsyscall-scm-1.rockspec"; + # actually library works fine with lua 5.2 + preConfigure = '' + sed -i 's/lua == 5.1/lua >= 5.1, < 5.3/' ${knownRockspec} + ''; + disabled = luaOlder "5.1" || luaAtLeast "5.3"; + + propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi; + }); + lgi = super.lgi.override({ nativeBuildInputs = [ pkgs.pkgconfig From 75214a9c8b1def725560a8a5999695a11c0727f4 Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Tue, 27 Aug 2019 21:28:56 +1000 Subject: [PATCH 078/283] qt5ct: fix missing app icon and name when running under Wayland Patch has been upstreamed (https://sourceforge.net/p/qt5ct/code/549/) and will be removed in the future. --- pkgs/tools/misc/qt5ct/default.nix | 5 +++++ pkgs/tools/misc/qt5ct/wayland.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/qt5ct/wayland.patch diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 9069821fe35..fbb56b98be7 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -15,6 +15,11 @@ mkDerivation rec { buildInputs = [ qtbase ]; + # Wayland needs to know the desktop file name in order to show the app name and icon. + # Patch has been upstreamed and can be removed in the future. + # See: https://sourceforge.net/p/qt5ct/code/549/ + patches = [ ./wayland.patch ]; + qmakeFlags = [ "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" ]; diff --git a/pkgs/tools/misc/qt5ct/wayland.patch b/pkgs/tools/misc/qt5ct/wayland.patch new file mode 100644 index 00000000000..fe186cfa469 --- /dev/null +++ b/pkgs/tools/misc/qt5ct/wayland.patch @@ -0,0 +1,22 @@ +--- a/src/qt5ct/main.cpp ++++ b/src/qt5ct/main.cpp +@@ -29,14 +29,18 @@ + #include + #include + #include +-#include "qt5ct.h" ++#include + #include + #include ++#include "qt5ct.h" + #include "mainwindow.h" + + int main(int argc, char **argv) + { + QApplication app(argc, argv); ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) ++ QGuiApplication::setDesktopFileName("qt5ct.desktop"); ++#endif + QTranslator translator; + QString locale = Qt5CT::systemLanguageID(); + translator.load(QString(":/qt5ct_") + locale); \ No newline at end of file From 182830f542ef693095cd9ba2db29a3d401705bb7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 26 Aug 2019 11:33:44 +0200 Subject: [PATCH 079/283] nixos/magnetico: init service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/torrent/magnetico.nix | 214 +++++++++++++++++++ 2 files changed, 215 insertions(+) create mode 100644 nixos/modules/services/torrent/magnetico.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index db47e69bd4a..4fd75bab0ab 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -755,6 +755,7 @@ ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix + ./services/torrent/magnetico.nix ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix ./services/torrent/transmission.nix diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix new file mode 100644 index 00000000000..02fa2ac0750 --- /dev/null +++ b/nixos/modules/services/torrent/magnetico.nix @@ -0,0 +1,214 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.magnetico; + + dataDir = "/var/lib/magnetico"; + + credFile = with cfg.web; + if credentialsFile != null + then credentialsFile + else pkgs.writeText "magnetico-credentials" + (concatStrings (mapAttrsToList + (user: hash: "${user}:${hash}\n") + cfg.web.credentials)); + + # default options in magneticod/main.go + dbURI = concatStrings + [ "sqlite3://${dataDir}/database.sqlite3" + "?_journal_mode=WAL" + "&_busy_timeout=3000" + "&_foreign_keys=true" + ]; + + crawlerArgs = with cfg.crawler; escapeShellArgs + ([ "--database=${dbURI}" + "--indexer-addr=${address}:${toString port}" + "--indexer-max-neighbors=${toString maxNeighbors}" + "--leech-max-n=${toString maxLeeches}" + ] ++ extraOptions); + + webArgs = with cfg.web; escapeShellArgs + ([ "--database=${dbURI}" + (if (cfg.web.credentialsFile != null || cfg.web.credentials != { }) + then "--credentials=${toString credFile}" + else "--no-auth") + ] ++ extraOptions); + +in { + + ###### interface + + options.services.magnetico = { + enable = mkEnableOption "Magnetico, Bittorrent DHT crawler"; + + crawler.address = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "1.2.3.4"; + description = '' + Address to be used for indexing DHT nodes. + ''; + }; + + crawler.port = mkOption { + type = types.port; + default = 0; + description = '' + Port to be used for indexing DHT nodes. + This port should be added to + . + ''; + }; + + crawler.maxNeighbors = mkOption { + type = types.ints.positive; + default = 1000; + description = '' + Maximum number of simultaneous neighbors of an indexer. + Be careful changing this number: high values can very + easily cause your network to be congested or even crash + your router. + ''; + }; + + crawler.maxLeeches = mkOption { + type = types.ints.positive; + default = 200; + description = '' + Maximum number of simultaneous leeches. + ''; + }; + + crawler.extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra command line arguments to pass to magneticod. + ''; + }; + + web.address = mkOption { + type = types.str; + default = "localhost"; + example = "1.2.3.4"; + description = '' + Address the web interface will listen to. + ''; + }; + + web.port = mkOption { + type = types.port; + default = 8080; + description = '' + Port the web interface will listen to. + ''; + }; + + web.credentials = mkOption { + type = types.attrsOf types.str; + default = {}; + example = lib.literalExample '' + { + myuser = "$2y$12$YE01LZ8jrbQbx6c0s2hdZO71dSjn2p/O9XsYJpz.5968yCysUgiaG"; + } + ''; + description = '' + The credentials to access the web interface, in case authentication is + enabled, in the format username:hash. If unset no + authentication will be required. + + Usernames must start with a lowercase ([a-z]) ASCII character, might + contain non-consecutive underscores except at the end, and consists of + small-case a-z characters and digits 0-9. The + htpasswd tool from the apacheHttpd + package may be used to generate the hash: htpasswd + -bnBC 12 username password + + + + The hashes will be stored world-readable in the nix store. + Consider using the credentialsFile option if you + don't want this. + + + ''; + }; + + web.credentialsFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + The path to the file holding the credentials to access the web + interface. If unset no authentication will be required. + + The file must constain user names and password hashes in the format + username:hash , one for each line. Usernames must + start with a lowecase ([a-z]) ASCII character, might contain + non-consecutive underscores except at the end, and consists of + small-case a-z characters and digits 0-9. + The htpasswd tool from the apacheHttpd + package may be used to generate the hash: + htpasswd -bnBC 12 username password + ''; + }; + + web.extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra command line arguments to pass to magneticow. + ''; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + users.users.magnetico = { + description = "Magnetico daemons user"; + }; + + systemd.services.magneticod = { + description = "Magnetico DHT crawler"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + User = "magnetico"; + Restart = "on-failure"; + ExecStart = "${pkgs.magnetico}/bin/magneticod ${crawlerArgs}"; + }; + }; + + systemd.services.magneticow = { + description = "Magnetico web interface"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" "magneticod.service"]; + + serviceConfig = { + User = "magnetico"; + StateDirectory = "magnetico"; + Restart = "on-failure"; + ExecStart = "${pkgs.magnetico}/bin/magneticow ${webArgs}"; + }; + }; + + assertions = + [ + { + assertion = cfg.web.credentialsFile != null || cfg.web.credentials != { }; + message = '' + The options services.magnetico.web.credentialsFile and + services.magnetico.web.credentials are mutually exclusives. + ''; + } + ]; + + }; + +} From ea40c66bf5aa739d02f483921082fc3b8e3a0d1b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 28 Aug 2019 10:34:29 +0200 Subject: [PATCH 080/283] nixos/magnetico: add test --- nixos/tests/magnetico.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 nixos/tests/magnetico.nix diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix new file mode 100644 index 00000000000..bc7aef653ee --- /dev/null +++ b/nixos/tests/magnetico.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "magnetico"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + machine = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + networking.firewall.allowedTCPPorts = [ 9000 ]; + + services.magnetico = { + enable = true; + crawler.port = 9000; + web.credentials.user = "$2y$12$P88ZF6soFthiiAeXnz64aOWDsY3Dw7Yw8fZ6GtiqFNjknD70zDmNe"; + }; + }; + + testScript = + '' + startAll; + $machine->waitForUnit("magneticod"); + $machine->waitForUnit("magneticow"); + $machine->succeed("${pkgs.curl}/bin/curl -u user:password http://localhost:8080"); + $machine->succeed("${pkgs.curl}/bin/curl -u user:wrongpwd http://localhost:8080") =~ "Unauthorised." or die; + $machine->shutdown(); + ''; +}) From 89b87cdb4431c2ce6a13e8e2387fa61b0ef6d858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Aug 2019 09:40:12 -0300 Subject: [PATCH 081/283] enlightenment.rage: 0.3.0 -> 0.3.1 --- pkgs/desktops/enlightenment/rage.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index a1de3f95131..8d99ce6e8e0 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "rage-${version}"; - version = "0.3.0"; + pname = "rage"; + version = "0.3.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz"; - sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "04fdk23bbgvni212zrfy4ndg7vmshbsjgicrhckdvhay87pk9i75"; }; nativeBuildInputs = [ From eba686ddfad91d8f59d61e3ca0e26f1360ff9a81 Mon Sep 17 00:00:00 2001 From: davidak Date: Wed, 31 Jul 2019 16:19:18 +0200 Subject: [PATCH 082/283] nixos-containers: add TimeoutStartSec option Default is now 1m instead of global default of 15sec. It is also configurable. Fixes issue where start of many containers (40+) fail https://github.com/NixOS/nixpkgs/issues/65001 --- nixos/modules/virtualisation/containers.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index b65374c9257..b61558b2201 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -256,6 +256,10 @@ let RestartForceExitStatus = "133"; SuccessExitStatus = "133"; + # Some containers take long to start + # especially when you automatically start many at once + TimeoutStartSec = cfg.timeoutStartSec; + Restart = "on-failure"; Slice = "machine.slice"; @@ -423,6 +427,7 @@ let extraVeths = {}; additionalCapabilities = []; ephemeral = false; + timeoutStartSec = "15s"; allowedDevices = []; hostAddress = null; hostAddress6 = null; @@ -595,6 +600,18 @@ in ''; }; + timeoutStartSec = mkOption { + type = types.str; + default = "1min"; + description = '' + Time for the container to start. In case of a timeout, + the container processes get killed. + See systemd.time + 7 + for more information about the format. + ''; + }; + bindMounts = mkOption { type = with types; loaOf (submodule bindMountOpts); default = {}; From fe213736e99cb7d7c0b9ad1b6116d53dabde3134 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Wed, 28 Aug 2019 10:50:58 +0100 Subject: [PATCH 083/283] evtest-qt: use qt5's mkDerivation See #65399 --- pkgs/applications/misc/evtest-qt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix index de75c7b68a8..86f2d007092 100644 --- a/pkgs/applications/misc/evtest-qt/default.nix +++ b/pkgs/applications/misc/evtest-qt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, qtbase, cmake, fetchFromGitHub }: +{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "evtest-qt"; version = "0.2.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple input device tester for linux with Qt GUI"; homepage = "https://github.com/Grumbel/evtest-qt"; maintainers = with maintainers; [ alexarice ]; From d7582c994d0cfe46e8a973bf5ec60117fc869b98 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Wed, 28 Aug 2019 15:01:36 +0200 Subject: [PATCH 084/283] dovecot: 2.3.7.1 -> 2.3.7.2 (CVE-2019-11500) --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 780264cf42b..e3afd1f9879 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.7.1"; + name = "dovecot-2.3.7.2"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1hq333vj4px4xa9djl8c1v3c8rac98v2mrb9vx1wisg6frpiv9f5"; + sha256 = "0q0jgcv3ni2znkgyhc966ffphj1wk73y76wssh0yciqafs2f0v36"; }; enableParallelBuilding = true; From 674d71b6b584101da3ffad14c5157632c2bdcf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Aug 2019 10:19:09 -0300 Subject: [PATCH 085/283] enlightenment.enlightenment: define pname attribute --- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 07aac3d611b..dc0469cd144 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "enlightenment-${version}"; + pname = "enlightenment"; version = "0.22.4"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r"; }; From 722b2158a65497172b0c0b28087445cd905c7316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Aug 2019 10:21:04 -0300 Subject: [PATCH 086/283] enlightenment.enlightenment: 0.22.4 -> 0.23.0 --- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index dc0469cd144..6e55d73e24f 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.22.4"; + version = "0.23.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r"; + sha256 = "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq"; }; nativeBuildInputs = [ From b6d906732c823b0e5f55b3a9309a9cc120c977aa Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 28 Aug 2019 09:48:48 -0400 Subject: [PATCH 087/283] aggregateModules: use stdenvNoCC instead of stdenv (#67579) --- pkgs/os-specific/linux/kmod/aggregator.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index afa8867dd07..4da87a557cb 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -1,4 +1,4 @@ -{ stdenv, kmod, modules, buildEnv, name ? "kernel-modules" }: +{ stdenvNoCC, kmod, modules, buildEnv, name ? "kernel-modules" }: buildEnv { inherit name; @@ -7,7 +7,7 @@ buildEnv { postBuild = '' - source ${stdenv}/setup + source ${stdenvNoCC}/setup if ! test -d "$out/lib/modules"; then echo "No modules found." From 722746c0567e5e0a104aca79637e07019a66a5d3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 28 Aug 2019 09:57:01 -0400 Subject: [PATCH 088/283] rl-1909: add note about Xfce 4.14 --- nixos/doc/manual/release-notes/rl-1909.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 6493bb99596..2111b25930e 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -48,6 +48,15 @@ To gain root privileges use sudo -i without a password. + + + We've updated to Xfce 4.14, which brings a new module . + If you'd like to upgrade, please switch from the module as it + will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support + and it isn't recommended to use + and simultaneously or to downgrade from Xfce 4.14 after upgrading. + + From 3595e93f6f046f543159de85c43926f2a5c46718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Aug 2019 11:13:17 -0300 Subject: [PATCH 089/283] enlightenment.enlightenment: bluetooth support --- pkgs/desktops/enlightenment/enlightenment.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 6e55d73e24f..13aa0eb7858 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa, - xkeyboard_config, pcre + xkeyboard_config, pcre, + + bluetoothSupport ? true, bluez5, }: stdenv.mkDerivation rec { @@ -36,8 +38,10 @@ stdenv.mkDerivation rec { pcre mesa xkeyboard_config - ] ++ - stdenv.lib.optionals stdenv.isLinux [ libcap ]; + ] + ++ stdenv.lib.optional stdenv.isLinux libcap + ++ stdenv.lib.optional bluetoothSupport bluez5 + ; patches = [ # Some programs installed by enlightenment (to set the cpu frequency, From a23798e4788c093f34df3d6e547ce3be5ce71b69 Mon Sep 17 00:00:00 2001 From: Hugo Geoffroy Date: Sat, 15 Jun 2019 05:22:35 +0200 Subject: [PATCH 090/283] nixos/x11: provide selected session to custom session The custom session script is always executed (when it exists). This change passes the selected session script and select session name to the custom session script, so that it can defer to the selected session script based on the value of the selected session name. --- nixos/modules/services/x11/display-managers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 0e87e6adbab..bf6b048654b 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -109,7 +109,7 @@ let # Allow the user to setup a custom session type. if test -x ~/.xsession; then - exec ~/.xsession + eval exec ~/.xsession "$@" fi if test "$1"; then From 9e04b3173ea53b2445d65be53b4c93049a52e77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Aug 2019 12:45:09 -0300 Subject: [PATCH 091/283] enlightenment.enlightenment: pulseaudio support --- pkgs/desktops/enlightenment/enlightenment.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 13aa0eb7858..b2a9d398709 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,6 +4,7 @@ xkeyboard_config, pcre, bluetoothSupport ? true, bluez5, + pulseSupport ? !stdenv.isDarwin, libpulseaudio, }: stdenv.mkDerivation rec { @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isLinux libcap ++ stdenv.lib.optional bluetoothSupport bluez5 + ++ stdenv.lib.optional pulseSupport libpulseaudio ; patches = [ From c9c2aed2ac70e5ae53ddea8892622672c9decc4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 10:03:49 +0200 Subject: [PATCH 092/283] LTS Haskell 14.3 --- .../configuration-hackage2nix.yaml | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b279652a5d5..82d567cf4f0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.2 + # LTS Haskell 14.3 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -70,7 +70,7 @@ default-package-overrides: - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - al ==0.1.4.2 - - alarmclock ==0.7.0.1 + - alarmclock ==0.7.0.2 - alerts ==0.1.2.0 - alex ==3.2.4 - alg ==0.2.10.0 @@ -91,7 +91,7 @@ default-package-overrides: - ANum ==0.2.0.2 - aos-signature ==0.1.1 - apecs ==0.8.1 - - apecs-gloss ==0.2.2 + - apecs-gloss ==0.2.3 - apecs-physics ==0.4.2 - api-field-json-th ==0.1.0.2 - appar ==0.1.8 @@ -144,7 +144,7 @@ default-package-overrides: - aws-cloudfront-signed-cookies ==0.2.0.1 - aws-lambda-haskell-runtime ==2.0.1 - backprop ==0.2.6.3 - - bank-holidays-england ==0.2.0.1 + - bank-holidays-england ==0.2.0.2 - barbies ==1.1.3.0 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 @@ -639,7 +639,7 @@ default-package-overrides: - explicit-exception ==0.1.10 - exp-pairs ==0.2.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.17 + - extra ==1.6.18 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 @@ -774,7 +774,7 @@ default-package-overrides: - ghc-lib ==8.8.0.20190424 - ghc-lib-parser ==8.8.0.20190424 - ghc-parser ==0.2.0.3 - - ghc-paths ==0.1.0.9 + - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.5 - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 @@ -963,7 +963,7 @@ default-package-overrides: - hsinstall ==2.2 - HSlippyMap ==3.0.1 - hslogger ==1.2.12 - - hslua ==1.0.3.1 + - hslua ==1.0.3.2 - hslua-aeson ==1.0.0 - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 @@ -1258,7 +1258,7 @@ default-package-overrides: - loopbreaker ==0.1.1.0 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.6.0.0 + - lsp-test ==0.6.1.0 - lucid ==2.9.11 - lucid-extras ==0.2.2 - lxd-client-config ==0.1.0.1 @@ -1415,6 +1415,7 @@ default-package-overrides: - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 - netpbm ==1.0.3 + - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 @@ -1510,7 +1511,7 @@ default-package-overrides: - pandoc-csv2table ==1.0.7 - pandoc-markdown-ghci-filter ==0.1.0.0 - pandoc-pyplot ==2.1.5.1 - - pandoc-types ==1.17.5.4 + - pandoc-types ==1.17.6 - pantry ==0.1.1.1 - parallel ==3.2.2.0 - parallel-io ==0.3.3 @@ -1808,9 +1809,9 @@ default-package-overrides: - safe-json ==0.1.0 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.3.4.1 - - salak-toml ==0.3.4.1 - - salak-yaml ==0.3.4.1 + - salak ==0.3.5.1 + - salak-toml ==0.3.5.1 + - salak-yaml ==0.3.5.1 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1824,7 +1825,7 @@ default-package-overrides: - scalpel-core ==0.6.0 - scanf ==0.1.0.0 - scanner ==0.3 - - scheduler ==1.4.1 + - scheduler ==1.4.2 - scientific ==0.3.6.2 - scotty ==0.11.4 - scrypt ==0.5.0 @@ -1957,6 +1958,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 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.3.5 @@ -2418,7 +2420,7 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.1.0 + - yaml ==0.11.1.1 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 From 30a31cc908f48c3336c26f37cb4a4976ad7d8a4f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 10:00:55 +0200 Subject: [PATCH 093/283] hackage2nix: keep ghc-lib-parser-8.8.0.20190723 until hlint updates its dependencies --- 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 82d567cf4f0..9da89156df6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2486,6 +2486,7 @@ extra-packages: - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x + - ghc-lib-parser == 8.8.0.20190723 # required by hlint-2.2.2 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock < 2.17 # required on GHC 7.10.x - haddock == 2.17.* # required on GHC 8.0.x From 4792a6db4cbadf40f7d855b4504b1820631b3d9a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Aug 2019 04:20:00 -0500 Subject: [PATCH 094/283] haskell-dhall-json: disable broken test suite to fix the build --- 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 d920baa0daf..c37667af558 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1059,9 +1059,11 @@ self: super: { dontCheck super.dhall ); + # Missing test files in source distribution, fixed once 1.4.0 is bumped + # https://github.com/dhall-lang/dhall-haskell/pull/997 dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] ( - super.dhall-json + dontCheck super.dhall-json ); dhall-nix = From ecea5f47285245d5e5eda8b0ee70401adde3e262 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Aug 2019 04:21:00 -0500 Subject: [PATCH 095/283] hackage2nix: unbreak dhall-json build --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9da89156df6..c689b9303de 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4283,7 +4283,6 @@ broken-packages: - dgim - dgs - dhall-check - - dhall-json - dhall-lsp-server - dhall-nix - dhall-to-cabal diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 68925186925..a85d4a046b0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -67316,8 +67316,6 @@ self: { ]; description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhall-json_1_4_0" = callPackage From 034dcc2ab8ae1e03834402db7f50ba1821b2dfee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 10:11:34 +0200 Subject: [PATCH 096/283] hackage2nix: disable builds depended on broken packages that break evaluation on Hydra --- .../haskell-modules/configuration-hackage2nix.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c689b9303de..db9e9c2f6ad 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3464,6 +3464,8 @@ broken-packages: - boombox - boomslang - boots-app + - boots-cloud + - boots-web - borel - boring-window-switcher - bot @@ -3525,6 +3527,7 @@ broken-packages: - bv-sized - bytable - byteslice + - bytesmith - bytestring-builder-varword - bytestring-class - bytestring-csv @@ -7617,6 +7620,7 @@ broken-packages: - notcpp - notmuch-haskell - notmuch-web + - now-haskell - np-linear - nptools - ntha From 1b8e14b38d25074fcbe6e5140ab98b0b23f48c68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:29:15 +0000 Subject: [PATCH 097/283] hackage2nix: keep resolv-0.1.1.2 around for ghc versions prior to 8.8.x --- 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 db9e9c2f6ad..0a269acbdb6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2519,6 +2519,7 @@ extra-packages: - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - QuickCheck < 2 # required by test-framework-quickcheck and its users + - 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 - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x From 0fc727c3e1833e512103c6fb9198de1cb96b665c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Aug 2019 02:30:55 +0200 Subject: [PATCH 098/283] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f3caaa39bd8e093c5142acad87b17c51fb7a207d. --- .../haskell-modules/hackage-packages.nix | 1537 ++++++++++++----- 1 file changed, 1124 insertions(+), 413 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a85d4a046b0..a6fd9209005 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1243,22 +1243,23 @@ self: { "BNFC" = callPackage ({ mkDerivation, alex, array, base, containers, deepseq, directory , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process - , QuickCheck, temporary + , QuickCheck, semigroups, temporary, time }: mkDerivation { pname = "BNFC"; - version = "2.8.2"; - sha256 = "1n4zgm6gls6lpasn8y5hy0m75qkkbk6mj18g2yhjrw8514a5860h"; + version = "2.8.3"; + sha256 = "00w8g0kn4sgjyiq4hykkz8k0kl5b5861v7d9g2021vca78gif6wl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; executableHaskellDepends = [ array base containers deepseq directory filepath mtl pretty process + semigroups time ]; executableToolDepends = [ alex happy ]; testHaskellDepends = [ array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck temporary + HUnit mtl pretty process QuickCheck semigroups temporary time ]; description = "A compiler front-end generator"; license = stdenv.lib.licenses.gpl2; @@ -12698,8 +12699,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.0.2.0"; - sha256 = "1imnnd5plp3dqpfrpviwgabd0c47fxfxvh10gyxvssmslxi1k27p"; + version = "0.1.1.0"; + sha256 = "0x5sy115f5yx580g8pl8jkjwzd0ih2n4fbvh5f5ch2i749l4dyq1"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -15740,8 +15741,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.8.0.0"; - sha256 = "0np08pyx5kd1wbnrxbzcbp6zryvh38iy2mbz1xbb6ldfmn98r78p"; + version = "0.8.0.1"; + sha256 = "1bv57hi26nmrhcdr4hki62ycd0k5p0i0jdwcdcxi7vmhjavnyq08"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec template-haskell text @@ -24327,24 +24328,6 @@ self: { }) {inherit (pkgs) openal;}; "alarmclock" = callPackage - ({ mkDerivation, async, base, clock, hspec, stm, time - , unbounded-delays - }: - mkDerivation { - pname = "alarmclock"; - version = "0.7.0.1"; - sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf"; - libraryHaskellDepends = [ - async base clock stm time unbounded-delays - ]; - testHaskellDepends = [ - async base clock hspec stm time unbounded-delays - ]; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alarmclock_0_7_0_2" = callPackage ({ mkDerivation, async, base, clock, hspec, stm, time , unbounded-delays }: @@ -24360,7 +24343,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alea" = callPackage @@ -29266,8 +29248,8 @@ self: { }: mkDerivation { pname = "apecs-gloss"; - version = "0.2.2"; - sha256 = "0p8r8hraqa49f13p045j54kzyrcvgscppgqllwnqgdx0in8j71cf"; + version = "0.2.3"; + sha256 = "0f2cvjlsf00w69a6m52pwcp9srk441qfzbpdvdwh8pm2vl6nax69"; libraryHaskellDepends = [ apecs apecs-physics base containers gloss linear ]; @@ -35216,18 +35198,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.2.0.1"; - sha256 = "0vnadqs924k54f5zdm0airnss47gafqbrak59wvrmc667xn01k0h"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_2" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -35237,7 +35207,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -35540,6 +35509,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base-noprelude_4_13_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-noprelude"; + version = "4.13.0.0"; + sha256 = "1ld1phm7jpyvm33dj568gy28inbiklrj00yvb83v5y7rn01w32kp"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "\"base\" package sans \"Prelude\" module"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck }: @@ -36229,6 +36211,25 @@ self: { broken = true; }) {}; + "bcp47" = callPackage + ({ mkDerivation, aeson, base, containers, country, doctest + , generic-arbitrary, hspec, iso639, megaparsec, QuickCheck, text + }: + mkDerivation { + pname = "bcp47"; + version = "0.1.0.0"; + sha256 = "1cy2wdp97mvyg1fvkmi6vzd8vd9v8645nd5cfzgp4whhy0v5y7rj"; + libraryHaskellDepends = [ + aeson base containers country generic-arbitrary iso639 megaparsec + QuickCheck text + ]; + testHaskellDepends = [ + aeson base containers country doctest hspec iso639 QuickCheck text + ]; + description = "Language tags as specified by BCP 47"; + license = stdenv.lib.licenses.mit; + }) {}; + "bcrypt" = callPackage ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { @@ -37230,6 +37231,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_5_5" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.5"; + sha256 = "0rn47q8dzv0g1fyams99p4py6q0asxdc50q9k0nj497brk738xcb"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -39924,8 +39948,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; - revision = "1"; - editedCabalFile = "1h6dbjmznd3pvz7j5f8xwaaxxhx57fxszli2k430wcn65bc9y0zs"; + revision = "2"; + editedCabalFile = "1mnh3629kgfivjwbbqwrkcyvg6iah5pncc5jzgq3ka5cq0kg09gz"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -41600,12 +41624,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "boots_0_1_1" = callPackage + "boots_0_2" = callPackage ({ mkDerivation, base, exceptions, hspec, mtl }: mkDerivation { pname = "boots"; - version = "0.1.1"; - sha256 = "1z9h8i1r0jccqn0230nzn97yqzrlsapc84dnwhczzvdbaryykhbz"; + version = "0.2"; + sha256 = "0v7p2pfs4kcczc4wpswb0rgl2ak9xijq7ha9c6lagyb1av17sx9r"; libraryHaskellDepends = [ base exceptions mtl ]; testHaskellDepends = [ base exceptions hspec mtl ]; description = "IoC Monad in Haskell"; @@ -41615,28 +41639,64 @@ self: { "boots-app" = callPackage ({ mkDerivation, base, boots, data-default, exceptions, fast-logger - , hspec, menshen, microlens, monad-logger, mtl, salak, salak-yaml - , splitmix, text, unliftio-core, vault + , menshen, microlens, mtl, salak, salak-yaml, splitmix, text, time + , unliftio-core, unordered-containers }: mkDerivation { pname = "boots-app"; - version = "0.1.1"; - sha256 = "1v8qbap22mpasjpmi9bd0n14q4vz80ksmlmk67yw840f2ly8sn0d"; + version = "0.2"; + sha256 = "0rnlb9fzaxcx4lvacqklv1kr2ygzgssgz1xzcfmbgkqpzp08nxqx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base boots data-default exceptions fast-logger menshen microlens - monad-logger mtl salak salak-yaml splitmix text unliftio-core vault + mtl salak salak-yaml splitmix text unliftio-core + unordered-containers ]; - testHaskellDepends = [ - base boots data-default exceptions fast-logger hspec menshen - microlens monad-logger mtl salak salak-yaml splitmix text - unliftio-core vault - ]; - description = "Startup factories using IoC monad"; + executableHaskellDepends = [ base time ]; + description = "Factory for quickly building an application"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "boots-cloud" = callPackage + ({ mkDerivation, aeson, base, boots, boots-app, boots-web + , bytestring, http-client, salak, servant, servant-client, text + , unordered-containers + }: + mkDerivation { + pname = "boots-cloud"; + version = "0.2"; + sha256 = "0wfbzf753h3bgfdw0gfh4cwi40qv2ghyyznfahwxkh9aabrwckqp"; + libraryHaskellDepends = [ + aeson base boots boots-app boots-web bytestring http-client salak + servant servant-client text unordered-containers + ]; + description = "Factory for quickly building a microservice"; + license = stdenv.lib.licenses.mit; + }) {}; + + "boots-web" = callPackage + ({ mkDerivation, aeson, base, boots, boots-app, bytestring + , containers, ekg-core, http-types, microlens, monad-logger, salak + , servant-server, servant-swagger, swagger2, text, time + , unordered-containers, vault, wai, warp + }: + mkDerivation { + pname = "boots-web"; + version = "0.2"; + sha256 = "00f55k7gc4dirzxmgngw9vpcl0w8fgklsyscy5h584pbhd84x4mj"; + libraryHaskellDepends = [ + aeson base boots boots-app bytestring containers ekg-core + http-types microlens monad-logger salak servant-server + servant-swagger swagger2 text time unordered-containers vault wai + warp + ]; + description = "Factory for quickly building a web application"; + license = stdenv.lib.licenses.mit; + }) {}; + "bootstrap-types" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -41911,8 +41971,8 @@ self: { ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }: mkDerivation { pname = "bowntz"; - version = "1"; - sha256 = "0b5fv59v7c896g56ixyhip8cnbfw2p2qvdmgj2dg97jvgjkxwpfn"; + version = "2"; + sha256 = "0i8fi5xq04s9mzyy1vdshmlyybzhim0sr9nyxxfdbvcaai796i5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42691,6 +42751,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; + revision = "1"; + editedCabalFile = "07k9422yaw7rz66awmc20ni17xw2bd1pn48ja79c66d5va89f6wz"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -43516,6 +43578,8 @@ self: { pname = "butterflies"; version = "0.3.0.2"; sha256 = "0syykvrgq6i0zxy1pn934j1r9glv4yypva1mfkn0vc0nikh9fm31"; + revision = "1"; + editedCabalFile = "1xxdc352fp11b8mhhr3rwj5kffkglvbry2smwwfj1f10wr749zn9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -43715,6 +43779,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytes_0_16" = callPackage + ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal + , cabal-doctest, cereal, containers, directory, doctest, filepath + , hashable, mtl, scientific, text, time, transformers + , transformers-compat, unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.16"; + sha256 = "1m8nkviq4ckqi9v1w1fxzicdzmvb3wfxcmqmppjrrmkwawn4c6i9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary binary-orphans bytestring cereal containers hashable + mtl scientific text time transformers transformers-compat + unordered-containers void + ]; + testHaskellDepends = [ base directory doctest filepath ]; + description = "Sharing code for serialization between binary and cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -43751,6 +43837,8 @@ self: { testHaskellDepends = [ base byteslice primitive ]; description = "Nonresumable byte parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring_0_10_10_0" = callPackage @@ -44716,27 +44804,23 @@ self: { "cabal-debian" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal , containers, data-default, debian, deepseq, Diff, directory - , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl - , network-uri, newtype-generics, optparse-applicative, parsec - , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix - , Unixutils, utf8-string + , 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 = "4.39"; - sha256 = "0cp1q9pa6wdij23bq7c3dac1byxxdr7maxvjj3jyi3v4d2mhgyvp"; + version = "5.0"; + sha256 = "1brbn45zg8ki54xl429qlzhzn30mgy7i1sidq1imd54c0rnai46v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base bifunctors Cabal containers data-default debian - deepseq Diff directory exceptions filepath hsemail HUnit lens - memoize mtl network-uri newtype-generics optparse-applicative - parsec pretty process pureMD5 regex-tdfa set-extra syb text unix - Unixutils utf8-string - ]; - executableHaskellDepends = [ - base Cabal debian lens mtl pretty Unixutils + 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; @@ -44812,6 +44896,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_7" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.7"; + sha256 = "1v5dlwsxd9kdll07x5apnf76j2g2pqfp138pacc64j6agrgyv00h"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + description = "A Setup.hs helper for doctests running"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-file-th" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: @@ -44966,15 +45062,12 @@ self: { , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security , hashable, HTTP, mtl, network, network-uri, parsec, pretty - , process, random, resolv, stm, tar, text, time, unix, zip-archive - , zlib + , process, random, resolv, stm, tar, text, time, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "2.4.1.0"; - sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39"; - revision = "3"; - editedCabalFile = "1mnm6mfrgavq3blvkm3wz45pqrj10apjihg1g9cds58qp19m9r1h"; + version = "3.0.0.0"; + sha256 = "1wda29ifkn50376jidj6ihfk60a64y0bsd7lh3yw15py7a2sfcm4"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; @@ -44982,8 +45075,7 @@ self: { array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance filepath hackage-security hashable HTTP mtl network network-uri - parsec pretty process random resolv stm tar text time unix - zip-archive zlib + parsec pretty process random resolv stm tar text time unix zlib ]; doCheck = false; postInstall = '' @@ -48881,6 +48973,25 @@ self: { license = "LGPL"; }) {}; + "chart-cli" = callPackage + ({ mkDerivation, attoparsec, base, Chart, Chart-cairo, colour + , data-default-class, dates, filepath, hashable, lens + , optparse-applicative, text, time + }: + mkDerivation { + pname = "chart-cli"; + version = "0.1.0.0"; + sha256 = "0z90jzhw0k1z20gn227r0jcpnfj6ajr9y54y5g7phb6cy1ff2iv3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base Chart Chart-cairo colour data-default-class dates + filepath hashable lens optparse-applicative text time + ]; + description = "Command-line utility to draw charts from input data easily"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chart-histogram" = callPackage ({ mkDerivation, base, Chart }: mkDerivation { @@ -51018,8 +51129,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.25.0"; - sha256 = "1jgxchshpkpbgpkn31iymswb08wjjfmvqglv5brs0zw4ialirrh9"; + version = "0.25.2"; + sha256 = "087k0n6ri0pg5wmjnw3gkjaz5d627519vby9kmiagck7id7f89q9"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -54374,8 +54485,8 @@ self: { pname = "complex-generic"; version = "0.1.1.1"; sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz"; - revision = "3"; - editedCabalFile = "0vm0i25bib0bzlw7fw209pqn3963y5hx0vkri049q4v7y0qld8k9"; + revision = "4"; + editedCabalFile = "00v0mr5fc090wph3s9ks3ppf81nqbkd0yfa347fkn3zrq3daqr8f"; libraryHaskellDepends = [ base template-haskell ]; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; @@ -56810,15 +56921,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "constraints_0_11" = callPackage + "constraints_0_11_1" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec , hspec-discover, mtl, semigroups, transformers , transformers-compat }: mkDerivation { pname = "constraints"; - version = "0.11"; - sha256 = "1ik97w6ci9kw5ppw9nmh65j6ldqq2az8c37jlg3h5x3prn2cds1d"; + version = "0.11.1"; + sha256 = "15768bcd8z70wq0b2igvz8mrl62bqaqad6cpdp9p4awyylba37y6"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl semigroups transformers transformers-compat @@ -58666,15 +58777,15 @@ self: { }) {}; "cpsa" = callPackage - ({ mkDerivation, base, containers, parallel }: + ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.2"; - sha256 = "0byrfj9lqv4k5d0s3d7ib6bwcz50bl23qnk2nk8bzk9s1356g6yi"; + version = "3.6.3"; + sha256 = "121lrj9zhlcs4r2xghxw8cah705s5k9jkcl9g3mj5ixzki3b2bdm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ base containers parallel ]; + executableHaskellDepends = [ base containers directory parallel ]; description = "Symbolic cryptographic protocol analyzer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -60255,8 +60366,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.101.0"; sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; - revision = "2"; - editedCabalFile = "0m5h68xm60wrjv88gg6cn1q5qki5674mxl4d6sn3vxpbcj9b5417"; + revision = "3"; + editedCabalFile = "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -65263,28 +65374,26 @@ self: { "debian" = callPackage ({ mkDerivation, base, bytestring, bzlib, Cabal, containers - , directory, either, exceptions, filepath, HaXml, hostname, HUnit - , lens, ListLike, mtl, network-uri, old-locale, parsec, pretty - , process, process-extras, pureMD5, QuickCheck, regex-compat - , regex-tdfa, SHA, syb, template-haskell, text, th-lift, th-orphans - , time, unix, Unixutils, utf8-string, zlib + , directory, either, exceptions, filepath, hostname, HUnit, lens + , ListLike, mtl, network-uri, old-locale, parsec, pretty, process + , process-extras, pureMD5, QuickCheck, regex-compat, regex-tdfa + , SHA, syb, template-haskell, temporary, text, th-lift, th-orphans + , time, unix, utf8-string, zlib }: mkDerivation { pname = "debian"; - version = "3.95.1"; - sha256 = "1sfvjq9vilibvvcpm404z6j64ic54bd1s7yri8plfg849miynh95"; + version = "4.0.0"; + sha256 = "1gshvsgbgghskl4csngffdpnf49z27yhap86bwqnkp4asbh553h6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring bzlib Cabal containers directory either exceptions - filepath HaXml hostname HUnit lens ListLike mtl network-uri - old-locale parsec pretty process process-extras pureMD5 QuickCheck - regex-compat regex-tdfa SHA syb template-haskell text th-lift - th-orphans time unix Unixutils utf8-string zlib - ]; - executableHaskellDepends = [ - base directory filepath HaXml pretty process unix + filepath hostname HUnit lens ListLike mtl network-uri old-locale + parsec pretty process process-extras pureMD5 QuickCheck + regex-compat regex-tdfa SHA syb template-haskell temporary text + th-lift th-orphans time unix utf8-string zlib ]; + executableHaskellDepends = [ base directory filepath process ]; testHaskellDepends = [ base Cabal HUnit parsec pretty regex-tdfa text ]; @@ -65512,14 +65621,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "decidable_0_2_0_0" = callPackage + "decidable_0_2_1_0" = callPackage ({ mkDerivation, base, functor-products, microlens, singletons , vinyl }: mkDerivation { pname = "decidable"; - version = "0.2.0.0"; - sha256 = "1b0mnkgk60qm84wim9lq6hlgm2ijxjx0s4gahvd5fjkccdryz2h2"; + version = "0.2.1.0"; + sha256 = "1l307j4n9xagarbqqa48c729fs63qlzy5sqzgfyzfqwnas8yrqhx"; libraryHaskellDepends = [ base functor-products microlens singletons vinyl ]; @@ -66355,12 +66464,13 @@ self: { }: mkDerivation { pname = "dependent-sum-aeson-orphans"; - version = "0.2.0.0"; - sha256 = "0cb3yhrqn2mwa3spfz6sky9bh9kh92kl4959187d6kqvvhqqmafj"; + version = "0.2.1.0"; + sha256 = "04flfszrn4ah9vrm6hyp2pk0sbldcjp0jjibdny7lxdmv0fskzj5"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum ]; + description = "JSON instances for DSum, DMap, and Some"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -66744,6 +66854,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_7" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.7"; + sha256 = "0bp4f0is84cv139s35669dv23mcp6lhp2wall72yvkk12lp2l2mg"; + 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 + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -67346,7 +67480,6 @@ self: { description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhall-lex" = callPackage @@ -71113,6 +71246,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doclayout" = callPackage + ({ mkDerivation, base, criterion, mtl, safe, tasty, tasty-golden + , tasty-hunit, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.1"; + sha256 = "1dmjj3z15vr5czy5gkwzs5zvz23ap1qpya3qlqfs5phslpbsada3"; + 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; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text, th-lift @@ -71165,23 +71316,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_3_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, filepath - , Glob, mtl, parsec, scientific, tasty, tasty-golden, tasty-hunit - , temporary, text, unordered-containers, vector + "doctemplates_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty + , tasty-golden, tasty-hunit, temporary, text, unordered-containers + , vector }: mkDerivation { pname = "doctemplates"; - version = "0.3.0.1"; - sha256 = "11xvrmk9qb2izq8y61pna0lxlsfr5yb94nlk5ih8z1fcdn7ghl3j"; + version = "0.5"; + sha256 = "0xdma2j1bim31mvkqc6362rbmv193fyznd3y4ipdgd113zkj7hy6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers filepath mtl parsec scientific text - unordered-containers vector + aeson base containers doclayout filepath mtl parsec safe scientific + text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring filepath Glob mtl tasty tasty-golden - tasty-hunit temporary text + aeson base bytestring filepath Glob tasty tasty-golden tasty-hunit + temporary text + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion filepath mtl text ]; description = "Pandoc-style document templates"; license = stdenv.lib.licenses.bsd3; @@ -71216,6 +71371,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doctest_0_16_2" = callPackage + ({ mkDerivation, base, base-compat, code-page, deepseq, directory + , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process + , QuickCheck, setenv, silently, stringbuilder, syb, transformers + }: + mkDerivation { + pname = "doctest"; + version = "0.16.2"; + sha256 = "0lk4cjfzi5bx2snfzw1zi06li0gvgz3ckfh2kwa98l7nxfdl39ag"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + executableHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + testHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + hspec HUnit mockery process QuickCheck setenv silently + stringbuilder syb transformers + ]; + description = "Test interactive Haskell examples"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -73126,6 +73310,19 @@ self: { broken = true; }) {}; + "dyepack" = callPackage + ({ mkDerivation, base, generics-sop }: + mkDerivation { + pname = "dyepack"; + version = "0.1.0.0"; + sha256 = "02kdcfnagp0aadfjhn17b47pz9bknl0yisyqpnf79v7g27szb74a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base generics-sop ]; + description = "Programatically identify space leaks in your program"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynamic" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava , containers, http-conduit, text, unordered-containers, vector @@ -73434,6 +73631,41 @@ self: { broken = true; }) {}; + "dzen-dhall" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, dhall, directory + , file-embed-lzma, filepath, generic-random, hashable, hourglass + , hspec, http-conduit, http-types, HUnit, megaparsec, microlens + , microlens-th, network-uri, optparse-applicative, parsec, parsers + , pipes, prettyprinter, prettyprinter-ansi-terminal, process + , QuickCheck, random, tasty, tasty-hspec, tasty-hunit + , tasty-quickcheck, template-haskell, text, transformers, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "dzen-dhall"; + version = "1.0.0"; + sha256 = "0im78kvjwanlbi097pyvvpj2isssf3iblqbbqsk2iccvdqjyqf5z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring dhall directory file-embed-lzma + filepath hashable hourglass http-conduit http-types megaparsec + microlens microlens-th network-uri optparse-applicative parsec + parsers pipes prettyprinter prettyprinter-ansi-terminal process + random text transformers unix unordered-containers utf8-string + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base dhall filepath generic-random hspec HUnit microlens + network-uri optparse-applicative parsec QuickCheck tasty + tasty-hspec tasty-hunit tasty-quickcheck template-haskell text + unordered-containers vector + ]; + description = "Configure dzen2 bars in Dhall language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dzen-utils" = callPackage ({ mkDerivation, base, colour, process }: mkDerivation { @@ -74925,6 +75157,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators_0_6" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.6"; + sha256 = "1mxjp2ygf72k3yaiqpfi4lrmhwhx69zkm5kznrb6wainw5r6h0if"; + libraryHaskellDepends = [ + base extra singleton-nats singletons template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons ]; + testToolDepends = [ hspec-discover ]; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -78596,6 +78847,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_10_3" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.10.3"; + sha256 = "1w25j4ys5s6v239vbqlbipm9fdwxl1j2ap2lzms7f7rgnik5ir24"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exchangerates" = callPackage ({ mkDerivation, aeson, base, containers, directory, genvalidity , genvalidity-containers, genvalidity-hspec @@ -79588,22 +79861,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, semigroups, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.6.17"; - sha256 = "1zgp64ich4sjg59vwv6rgfz5amhhydcplv9l8k50p1mc49h2h2vc"; - libraryHaskellDepends = [ - base clock directory filepath process semigroups time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_18" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, semigroups, time, unix }: @@ -79617,7 +79874,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -85703,6 +85959,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1_2" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, mtl, profunctors, semigroupoids, template-haskell + , transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.2"; + sha256 = "0vlf3f2ckl3cr7z2zl8c9c8qkdlfgvmh04gxkp2fg0z9dz80nlyb"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions mtl profunctors + semigroupoids template-haskell transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, constraints, containers, data-fix, dlist , free, groups, hedgehog, kan-extensions, mtl, natural-numbers @@ -89050,6 +89324,18 @@ self: { broken = true; }) {}; + "generic-constraints" = callPackage + ({ mkDerivation, base, HUnit, template-haskell, th-abstraction }: + mkDerivation { + pname = "generic-constraints"; + version = "1.1.0"; + sha256 = "1f7d1z8l68f89p1kfiylwv3qb6n2x7njni4rhlxk9vvyllxgnqcb"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + testHaskellDepends = [ base HUnit ]; + description = "Constraints via Generic"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-data" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion , deepseq, generic-lens, one-liner, show-combinators, tasty @@ -89130,6 +89416,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-deriving_1_13" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.13"; + sha256 = "0k4av4jamgpavn82q54g345la5i2ckfbq2w9nnf2a6vhvk1lnw8g"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -89442,6 +89746,8 @@ self: { pname = "generics-sop"; version = "0.5.0.0"; sha256 = "18dkdain2g46b1637f3pbv0fkzg4b1a8frm16hfqvhpfk46i7rzc"; + revision = "1"; + editedCabalFile = "10zfjhcipm77zfx32ls7bc8vk3affa5v7cyphwpw93d6sfqc9wym"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell ]; @@ -90927,15 +91233,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib_8_8_0_20190723" = callPackage + "ghc-lib_8_8_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy , haskeline, hpc, pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "8.8.0.20190723"; - sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63"; + version = "8.8.1"; + sha256 = "0lilr12pamss6x2vkqb700zy7yd15vd4y8f0h4q8fdp068bxn177"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90992,6 +91298,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-lib-parser_8_8_1" = 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.1"; + sha256 = "12aicsvc45ld2hv2qq0wdky4qa2mg8s6hhamilavcbp0da2s6wnh"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -91148,20 +91474,6 @@ self: { }) {}; "ghc-paths" = callPackage - ({ mkDerivation, base, Cabal, directory }: - mkDerivation { - pname = "ghc-paths"; - version = "0.1.0.9"; - sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; - revision = "4"; - editedCabalFile = "1fp0jyvi6prqsv0dxn010c7q4mmiwlcy1xk6ppd4d539adxxy67d"; - setupHaskellDepends = [ base Cabal directory ]; - libraryHaskellDepends = [ base ]; - description = "Knowledge of GHC's installation directories"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-paths_0_1_0_12" = callPackage ({ mkDerivation, base, Cabal, directory }: mkDerivation { pname = "ghc-paths"; @@ -91171,7 +91483,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-pkg-autofix" = callPackage @@ -91420,8 +91731,8 @@ self: { pname = "ghc-tcplugins-extra"; version = "0.3"; sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h"; - revision = "1"; - editedCabalFile = "0x2d4bp5lhyfrqjshmgbirdn2ihc057a8a6khqmz91jj9zlhf7vb"; + revision = "2"; + editedCabalFile = "1hrbvixm25x1dx1ljy9x7f63kcan4ffz885xj6qsl8l070wj96s1"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = stdenv.lib.licenses.bsd2; @@ -91494,6 +91805,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_3_1" = 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.1"; + sha256 = "0v29lqz6q6wsdrhbcljyvcfdz1i7bvrp341816m2n5kbrkrk48ha"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck @@ -91514,6 +91849,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_7" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.7"; + sha256 = "00f8m3kmp572r8jr246m8r6lwzxmiqj4hml06w09l9n3lzvjwv7b"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell, transformers @@ -91530,6 +91886,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_7" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra + , integer-gmp, tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.7"; + sha256 = "1rfw67hhhka3ga8v3224ain7jvdc390glz5cr7vvxm1yqs1wgwx4"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra integer-gmp transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc , ghc-tcplugins-extra, mtl, pretty, reflection, singletons, syb @@ -93449,11 +93822,13 @@ self: { inherit (pkgs) which;}; "git-brunch" = callPackage - ({ mkDerivation, base, brick, microlens, process, vector, vty }: + ({ mkDerivation, base, brick, hspec, microlens, process, vector + , vty + }: mkDerivation { pname = "git-brunch"; - version = "1.0.4.0"; - sha256 = "1ss2axjwjx7pqx9dq7mxhbnn43k1g1zj7n54f2xq7zwq2ngd5x8f"; + version = "1.0.5.0"; + sha256 = "0bnag71l6vjygn5bbfav229pk44xn491jzj13n7m8xdc7nvh7zz1"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -93462,7 +93837,9 @@ self: { executableHaskellDepends = [ base brick microlens process vector vty ]; - testHaskellDepends = [ base brick microlens process vector vty ]; + testHaskellDepends = [ + base brick hspec microlens process vector vty + ]; doHaddock = false; description = "git checkout command-line tool"; license = stdenv.lib.licenses.bsd3; @@ -100587,8 +100964,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.2.1.0"; - sha256 = "0a4hhcggfbgxraq2jj40gvrg64nw37h7y6jj7pgswa623m85040j"; + version = "0.2.2.0"; + sha256 = "1h8zg9yyyckyp5irw9gcbzfysav67hn2rlrkwakyh3ghb1rnl71k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107343,12 +107720,13 @@ self: { }) {}; "haskell-holes-th" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { pname = "haskell-holes-th"; - version = "1.0.0.0"; - sha256 = "13xyxck9f15mwi641zs9zw77cnrgh30p2771f66haby96k8wx9jf"; - libraryHaskellDepends = [ base template-haskell ]; + version = "2.0.0.0"; + sha256 = "045spgarz68bay5yqd5cfllkmzja2jax9swcqhxc7gw5msfgxxw1"; + libraryHaskellDepends = [ base template-haskell transformers ]; + testHaskellDepends = [ base template-haskell transformers ]; description = "Infer haskell code by given type"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -114774,8 +115152,8 @@ self: { pname = "hgmp"; version = "0.1.1"; sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr"; - revision = "3"; - editedCabalFile = "0z2xbqzyrgm9apy3xl353wgwhbnc3hdb1giw2j6fyvv705fmpb62"; + revision = "4"; + editedCabalFile = "00rg7f223716dlqk0w92ixnyj7a9imj6yqcs5qx833jv7lk8lbyj"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; @@ -117559,25 +117937,28 @@ self: { }) {}; "hmatrix-sundials" = callPackage - ({ mkDerivation, base, containers, diagrams-lib - , diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots + ({ mkDerivation, base, bytestring, cassava, clock, containers + , deepseq, diagrams-lib, diagrams-rasterific, hmatrix, hspec + , inline-c, lens, optparse-applicative, plots, split , sundials_arkode, sundials_cvode, template-haskell, vector }: mkDerivation { pname = "hmatrix-sundials"; - version = "0.19.1.0"; - sha256 = "1vbpx8661nnj15vrg177qwaylfvlp0fxdnpzncwkm4ka81v65hb5"; - revision = "1"; - editedCabalFile = "0vl85crf6zpbjpvrkydi5qk7ziaxcwr3bpm15cbxw6k94a3y9lvx"; + version = "0.20.1.0"; + sha256 = "0ysh3zamv8vm3i1a9bz0iqikfdxpmh95g4b0k8kgayjchhs3l6yn"; libraryHaskellDepends = [ - base containers hmatrix inline-c template-haskell vector + base containers deepseq hmatrix inline-c split template-haskell + vector ]; librarySystemDepends = [ sundials_arkode sundials_cvode ]; testHaskellDepends = [ base containers diagrams-lib diagrams-rasterific hmatrix hspec - inline-c lens plots template-haskell vector + inline-c lens plots split template-haskell vector ]; testSystemDepends = [ sundials_arkode sundials_cvode ]; + benchmarkHaskellDepends = [ + base bytestring cassava clock hmatrix optparse-applicative + ]; description = "hmatrix interface to sundials"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -119050,8 +119431,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.10"; - sha256 = "12s3n3l6lf2vwmh4jbxnra694fpnzjgd8c236pnan0jdcb6x82vl"; + version = "5.0.17.11"; + sha256 = "1svp8z9pad8z2j386pr0dda0ds8ddxab0salnz4gm51q877w93p1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -121318,8 +121699,8 @@ self: { }: mkDerivation { pname = "hs-rqlite"; - version = "0.1.0.0"; - sha256 = "04q9vnwil3f30972pljs613wq1kb71w61jivdyxxy9i14grfcxsq"; + version = "0.1.2.0"; + sha256 = "1xfsbpfcy0s340jzdkl0bnx7isgx8dxhxvfdkrr9fpsga4s0l9bd"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers HTTP scientific text unordered-containers @@ -121894,6 +122275,27 @@ self: { broken = true; }) {}; + "hsc2hs_0_68_6" = callPackage + ({ mkDerivation, base, containers, directory, filepath, process + , tasty, tasty-hspec + }: + mkDerivation { + pname = "hsc2hs"; + version = "0.68.6"; + sha256 = "1clj6bgs9vmiv3mjzp82lvyyik5zr5411nxab7hydbrgq94pbk70"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base containers directory filepath process + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + description = "A preprocessor that helps with writing Haskell bindings to C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hsc3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-ordlist, directory, filepath, hosc, murmur-hash, network @@ -123040,8 +123442,8 @@ self: { ({ mkDerivation, base, directory, ghc, ghc-boot, ghc-paths, time }: mkDerivation { pname = "hsinspect"; - version = "0.0.1"; - sha256 = "13z7dk42cnwdxfqnadis56m2wy0s5kyzw2dv55dnspd77hd5v28k"; + version = "0.0.3"; + sha256 = "11jn8knnh859wvzfqljkhlsaqsrm20m4ryf3ncg7rhs6jcm3vknr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory ghc ghc-boot time ]; @@ -123239,29 +123641,6 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances - , tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua"; - version = "1.0.3.1"; - sha256 = "1w11d5csjl5jdzjzcq8gkd7lzyfsgaxmby5gq97jaj6r32l3zy9m"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ - base bytestring containers exceptions fail mtl text - ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ - base bytestring containers exceptions fail mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "hslua_1_0_3_2" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances , tasty, tasty-hunit, tasty-quickcheck, text @@ -123282,7 +123661,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Bindings to Lua, an embeddable scripting language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage @@ -124115,6 +124493,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-parsec" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, parsec }: + mkDerivation { + pname = "hspec-parsec"; + version = "0"; + sha256 = "1q5484dzc9vpbwv7bpx83xha9ly7lsbwn4zjd6z8z5j4p8r5mk6y"; + revision = "1"; + editedCabalFile = "03nsxwc5p6whq21dqwba0289g8fqqqws453kyanwgb6vvg1f0s9l"; + libraryHaskellDepends = [ base hspec-expectations parsec ]; + testHaskellDepends = [ base hspec parsec ]; + description = "Hspec expectations for testing Parsec parsers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -126111,6 +126503,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-overrides" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, network-uri, tasty, tasty-hunit + , text, yaml + }: + mkDerivation { + pname = "http-client-overrides"; + version = "0.1.0.0"; + sha256 = "1s6qblbw4z9afzdy43hk8rfhgxj3k60x03p3y0dmp1l2i712x89g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types network-uri text yaml + ]; + executableHaskellDepends = [ base http-client http-client-tls ]; + testHaskellDepends = [ + base bytestring http-client tasty tasty-hunit text + ]; + description = "HTTP client overrides"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-client-request-modifiers" = callPackage ({ mkDerivation, base, bytestring, exceptions, http-client , http-media, http-types, network, network-uri @@ -127821,6 +128235,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hvega-theme" = callPackage + ({ mkDerivation, base, hvega, text }: + mkDerivation { + pname = "hvega-theme"; + version = "0.1.0.0"; + sha256 = "03rm4fl8vgl3yv60wx6vrj1dfbwsxwksm1dbiz0wzz1scdax1gc4"; + libraryHaskellDepends = [ base hvega text ]; + description = "Theme for hvega"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hw-aeson" = callPackage ({ mkDerivation, aeson, base, hedgehog, hspec, text }: mkDerivation { @@ -136928,6 +137353,17 @@ self: { broken = true; }) {}; + "joint" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "joint"; + version = "0.1.0"; + sha256 = "0hzbczwy1w1mw8c4lf52nm6ighjlpiyj91siy9fmqih4fv22a1p2"; + libraryHaskellDepends = [ base ]; + description = "Trying to compose non-composable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jonathanscard" = callPackage ({ mkDerivation, base, bytestring, containers, HTTP, json, mtl , network, old-locale, time @@ -147277,28 +147713,44 @@ self: { ({ mkDerivation, base, bytestring, bytestring-conversion , case-insensitive, either, exceptions, hspec, http-types , io-streams, mtl, QuickCheck, quickcheck-classes - , quickcheck-instances, text, transformers, uri-encode, utf8-string - , wai, warp + , quickcheck-instances, text, transformers, uri-encode, wai, warp }: mkDerivation { pname = "linnet"; - version = "0.1.0.0"; - sha256 = "0ikrw7xm490rs46l7555mirkly3h5565kadwfrdjbqgrqv1cjx7k"; + version = "0.1.0.1"; + sha256 = "074np5a8xx25k88c82spmvmwiwcm993pvfbwfhjjkcqjqxwwgglf"; libraryHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either exceptions http-types io-streams mtl text transformers uri-encode - utf8-string wai warp + wai warp ]; testHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either exceptions hspec http-types io-streams mtl QuickCheck quickcheck-classes quickcheck-instances text transformers - uri-encode utf8-string wai warp + uri-encode wai warp ]; description = "Lightweight library for building HTTP API"; license = stdenv.lib.licenses.asl20; }) {}; + "linnet-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, linnet, QuickCheck + , quickcheck-classes, quickcheck-instances, text + }: + mkDerivation { + pname = "linnet-aeson"; + version = "0.1.0.1"; + sha256 = "1syfi3ha3z2l1g8qdy5rpla6xafw6dqcwicgns1xy9q9d8jrcjs3"; + libraryHaskellDepends = [ aeson base bytestring linnet ]; + testHaskellDepends = [ + aeson base bytestring hspec linnet QuickCheck quickcheck-classes + quickcheck-instances text + ]; + description = "Aeson JSON support for Linnet"; + license = stdenv.lib.licenses.asl20; + }) {}; + "linode" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , errors, lens, process, retry, safe, tasty, tasty-hunit @@ -148017,14 +148469,14 @@ self: { broken = true; }) {}; - "list-witnesses_0_1_2_0" = callPackage + "list-witnesses_0_1_3_2" = callPackage ({ mkDerivation, base, decidable, functor-products, microlens , profunctors, singletons, vinyl }: mkDerivation { pname = "list-witnesses"; - version = "0.1.2.0"; - sha256 = "10bflmrj747xs2ga8s0vw7hb419wvrwnm0bakxw7x1l7bcaa7z7m"; + version = "0.1.3.2"; + sha256 = "1hzm8ijx8id5ij199dg362ai1wmdrs8mr10qkv57639hv61almyq"; libraryHaskellDepends = [ base decidable functor-products microlens profunctors singletons vinyl @@ -149357,8 +149809,8 @@ self: { }: mkDerivation { pname = "log4hs"; - version = "0.0.7.0"; - sha256 = "0f05sqjrfg3wkr1avdwljfllfs40bakyims9xd5kn9fv48fzvran"; + version = "0.1.0.0"; + sha256 = "12crsq6gxhvamsn9ks3qn2r7aihf92aw1fcvck2wzjw9vps0y3ra"; libraryHaskellDepends = [ aeson base containers data-default directory filepath generic-lens lens template-haskell text time @@ -149991,8 +150443,8 @@ self: { pname = "long-double"; version = "0.1"; sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j"; - revision = "1"; - editedCabalFile = "12vmzzrxgb4yqf9axf1fildl4m0dfm3zqxk4vg6k6m5qi6haz1yn"; + revision = "2"; + editedCabalFile = "03x83ycib19k2lmd3spwq2zmylfl5ihammb406fxxqqbyv4jw1mg"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = stdenv.lib.licenses.bsd3; @@ -150296,8 +150748,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.1.0"; - sha256 = "1gipdhbnyb7sll30ffcl42k8rqqwphi970ls7rn2g98yb39jk498"; + version = "2.1.1"; + sha256 = "0dynm0kib4lgyz00gbg4gi0ds5cgpbdx40davk53cknwxv7icri0"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -150409,8 +150861,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.6.0.0"; - sha256 = "01l5i41907rqxrndhqmnb2kcp62k4mz1dpbamp7zvff22pyd5zzv"; + version = "0.6.1.0"; + sha256 = "195p9m4992l01k8xsc8yxwsx3g74xfn6rdi00bwlzxw4ijy06lfi"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -153187,8 +153639,8 @@ self: { }: mkDerivation { pname = "marxup"; - version = "3.1.0.0"; - sha256 = "0bszb1czqm7pvz8m24z06irzfrw4ch8bm8g59apdgvmp8y0yvp91"; + version = "3.1.1.0"; + sha256 = "0b22mf14qajkpf7hlm6086d951g0wgihlyiw93m0nh4yl1kmgf5q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -157378,8 +157830,8 @@ self: { }: mkDerivation { pname = "mixpanel-client"; - version = "0.2.0"; - sha256 = "1c0lgysznql57wff90r5s6mwq7gwah0j6pw10i4wppqs6pdiiwik"; + version = "0.2.1"; + sha256 = "1gangs1ivbg0hyc804flmxq7fgai3qlf2fnsw1r9dyjb5d91smp1"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring http-client http-client-tls servant servant-client string-conv text time @@ -159898,14 +160350,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_5_0_1" = callPackage + "monoidal-containers_0_6" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens , newtype, semialign, semigroups, these, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.5.0.1"; - sha256 = "1d7a4kkwv86f69zv5g6wxq9bkxq3bxarb26rr5q9gxkyx9m5rwd3"; + version = "0.6"; + sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -160272,32 +160724,35 @@ self: { }) {}; "morpheus-graphql" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, megaparsec - , mtl, scientific, scotty, tasty, tasty-hunit, text, transformers - , unordered-containers, uuid, vector, wai, wai-websockets, warp - , websockets + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , filepath, lens, megaparsec, mtl, optparse-applicative, scientific + , scotty, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, utf8-string, uuid, vector, wai + , wai-websockets, warp, websockets }: mkDerivation { pname = "morpheus-graphql"; - version = "0.1.1"; - sha256 = "1sp7dpbqd9kksldcqc2z43zv0g39qs4qxv9xxy1zg7hw4rwislfn"; + version = "0.2.1"; + sha256 = "1qdd21mwxsn3yw9c0vxcsmx6ixp90lpy2ghk6ix2s06cs4d5s3h9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific text - transformers unordered-containers uuid vector wai-websockets - websockets + aeson attoparsec base bytestring containers lens megaparsec mtl + scientific template-haskell text transformers unordered-containers + utf8-string uuid vector wai-websockets websockets ]; executableHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific scotty - text transformers unordered-containers uuid vector wai - wai-websockets warp websockets + aeson attoparsec base bytestring containers filepath lens + megaparsec mtl optparse-applicative scientific scotty + template-haskell text transformers unordered-containers utf8-string + uuid vector wai wai-websockets warp websockets ]; testHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific tasty - tasty-hunit text transformers unordered-containers uuid vector - wai-websockets websockets + aeson attoparsec base bytestring containers lens megaparsec mtl + scientific tasty tasty-hunit template-haskell text transformers + unordered-containers utf8-string uuid vector wai-websockets + websockets ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.bsd3; @@ -160926,8 +161381,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.3.0.0"; - sha256 = "0pdv9x6743qaqk6fcm02hfrr09ckwbd9fpgzgmgmgnqhqxm0y9y6"; + version = "0.4.0.0"; + sha256 = "0smdr7inwix9hbllj5r217pa17i6ha0wbciqnq9cjsjs9wjnybhh"; libraryHaskellDepends = [ array base binary bytestring crypto-random data-default-class mtl network template-haskell text time tls uuid-types x509-store @@ -161063,20 +161518,20 @@ self: { }) {}; "mssql-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, hostname, ms-tds - , network, template-haskell, text, time, tls + ({ mkDerivation, base, binary, bytestring, hostname, ms-tds, mtl + , network, template-haskell, text, time, tls, uuid-types }: mkDerivation { pname = "mssql-simple"; - version = "0.4.0.2"; - sha256 = "0pa1q404xlq23ywdwkx9w1v8dn2nznkpng9ijwixkcd520bnx043"; + version = "0.5.0.0"; + sha256 = "0k0j87h37hya42fv045z44p9issic0a0wswy75ymclizsbip1fl4"; libraryHaskellDepends = [ - base binary bytestring hostname ms-tds network template-haskell - text time tls + base binary bytestring hostname ms-tds mtl network template-haskell + text time tls uuid-types ]; testHaskellDepends = [ - base binary bytestring hostname ms-tds network template-haskell - text time tls + base binary bytestring hostname ms-tds mtl network template-haskell + text time tls uuid-types ]; description = "SQL Server client library implemented in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -168095,6 +168550,8 @@ self: { ]; description = "Zeit Now haskell-side integration and introspection tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nowdoc" = callPackage @@ -173189,6 +173646,7 @@ self: { pname = "pandoc-placetable"; version = "0.5.1"; sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112"; + configureFlags = [ "-finlineMarkdown" ]; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -173295,10 +173753,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.5.4"; - sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j"; - revision = "1"; - editedCabalFile = "0bpd2iqmriajl5qg44j4z9c4agb9gsdwbn5l4c5yry6flivysq3c"; + version = "1.17.6"; + sha256 = "1c4yf284wd2zbskhrqk0lhqkdyry40db087cdy86b5ywr0yy1li7"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -173551,6 +174007,59 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pantry_0_1_1_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans + , base64-bytestring, bytestring, Cabal, conduit, conduit-extra + , containers, contravariant, cryptonite, cryptonite-conduit + , deepseq, digest, directory, exceptions, filelock, filepath + , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog + , hpack, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, integer-gmp, memory, mono-traversable + , mtl, network, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , safe, syb, tar-conduit, template-haskell, text, text-metrics + , th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unix-compat, unliftio + , unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.1.1.2"; + sha256 = "1m1sps9kc7y8zpba486lv5z8an3z8493zxb1qhghql6pybsprsgi"; + libraryHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory filelock + filepath generic-deriving ghc-prim hackage-security hashable hpack + http-client http-client-tls http-conduit http-download http-types + integer-gmp memory mono-traversable mtl network network-uri path + path-io persistent persistent-sqlite persistent-template primitive + resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit + template-haskell text text-metrics th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory exceptions + filelock filepath generic-deriving ghc-prim hackage-security + hashable hedgehog hpack hspec http-client http-client-tls + http-conduit http-download http-types integer-gmp memory + mono-traversable mtl network network-uri path path-io persistent + persistent-sqlite persistent-template primitive QuickCheck + raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb + tar-conduit template-haskell text text-metrics th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unix-compat unliftio unordered-containers vector yaml + zip-archive + ]; + description = "Content addressable Haskell package management"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -176585,29 +177094,28 @@ self: { "perceptual-hash" = callPackage ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip - , optparse-applicative, par-traverse, pHash, primitive, repa, stm + , hspec, optparse-applicative, par-traverse, primitive, repa, stm , vector, vector-algorithms }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.1.0"; - sha256 = "107f5xb4wg4zmwqldw8a04byazqyzd0vkn6zl5iv4f5ii2sdb5yh"; - revision = "1"; - editedCabalFile = "001nr9brgk05bbhz9lw8viqrc6rgfy0rjp08fcdhn302j55j33i3"; + version = "0.1.2.0"; + sha256 = "0wj5bnm4f2n2fd1ykf0n5cbf974x34nzy16dh7z2wxv2yn7b4f9r"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hip primitive repa vector vector-algorithms ]; executableHaskellDepends = [ base containers filepath optparse-applicative par-traverse stm ]; - benchmarkHaskellDepends = [ base criterion ]; - benchmarkPkgconfigDepends = [ pHash ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion filepath ]; benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; license = stdenv.lib.licenses.bsd3; - }) {pHash = null;}; + }) {}; "perdure" = callPackage ({ mkDerivation, array, base, binary, bytestring, cognimeta-utils @@ -178677,6 +179185,17 @@ self: { broken = true; }) {}; + "pickle" = callPackage + ({ mkDerivation, base, containers, network, text }: + mkDerivation { + pname = "pickle"; + version = "0.1.0.0"; + sha256 = "1jai9ys9mznc8v6z9jsh1yc4xdf12cr3gw7ci2nx9xzjspn4qy8z"; + libraryHaskellDepends = [ base containers network text ]; + description = "Instant StatsD in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "picologic" = callPackage ({ mkDerivation, base, containers, mtl, parsec, picosat, pretty , QuickCheck @@ -179156,6 +179675,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_12" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.12"; + sha256 = "0ni5szs9jl4map05lcyl97dgb69g2xk1a1rdiw8p4024vfyskp8c"; + libraryHaskellDepends = [ + base exceptions mmorph mtl semigroups transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -182712,6 +183255,17 @@ self: { broken = true; }) {}; + "postgres-options" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "postgres-options"; + version = "0.1.0.0"; + sha256 = "17a2w4fb85mp9v1rghgkm0cvgzxvvahcvfi3vmlzrdqhlsm0si7c"; + libraryHaskellDepends = [ base ]; + description = "An Options type representing options for postgres connections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgres-tmp" = callPackage ({ mkDerivation, base, bytestring, postgresql-simple, text }: mkDerivation { @@ -182978,10 +183532,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.5.0"; - sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp"; - revision = "1"; - editedCabalFile = "11clkx7j4k3wgk6h1g0flq7frvkfxhh4dhbjjrchc5f7rd5gmjbp"; + version = "3.6.0"; + sha256 = "1mf9441yb72jl1gm9zpfgwwjdiipcl0gghnazf1871dgvahbx3jz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -187537,8 +188089,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20190630"; - sha256 = "0b35jayk5n8p7zn2nkgzvqgpiai0h7g3pf27i5bzxlaw2zwm9320"; + version = "0.20190826"; + sha256 = "1z6apxnp88jjpf5q7zg04r18lja7rafwlx1w2cy7d74qfrh1v2b7"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -192417,8 +192969,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.1"; - sha256 = "0wflw7rpknjj6qpf2ma1cxd03xg5v25rmfrmnli472h55jdcwdnz"; + version = "0.5.2"; + sha256 = "1gd6d3r0dsawi6zkr4fnkyrszikg1xzgfavxsaaswl4rw09znr7x"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -193782,6 +194334,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflection_2_1_5" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "reflection"; + version = "2.1.5"; + sha256 = "0xr947nj1vww5b8fwqmypxm3y3j5sxl4z8wnf834f83jzfzyjbi7"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflection-extras" = callPackage ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged }: @@ -193817,26 +194385,26 @@ self: { , filepath, haskell-src-exts, haskell-src-meta, hlint, lens , loch-th, MemoTrie, monad-control, monoidal-containers, mtl , prim-uniq, primitive, process, profunctors, random, ref-tf - , reflection, semigroupoids, semigroups, split, stm, syb - , template-haskell, these, time, transformers, transformers-compat + , reflection, semialign, semigroupoids, split, stm, syb + , template-haskell, these, these-lens, time, transformers , unbounded-delays, witherable }: mkDerivation { pname = "reflex"; - version = "0.6.2.1"; - sha256 = "0s8saim58bqqhg1nbrrdw2blnph7jrhqw97wxf73g4r1d8jacg3z"; + version = "0.6.2.4"; + sha256 = "1gm8w2ri16apy3b13i2f17pk1nsrsi0vbcrkckd1abbm4r4i16cd"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta lens MemoTrie monad-control monoidal-containers mtl prim-uniq primitive profunctors random ref-tf reflection - semigroupoids semigroups stm syb template-haskell these time - transformers transformers-compat unbounded-delays witherable + semialign semigroupoids stm syb template-haskell these time + transformers unbounded-delays witherable ]; testHaskellDepends = [ base bifunctors containers deepseq dependent-map dependent-sum directory filemanip filepath hlint lens monoidal-containers mtl - ref-tf semigroups split these transformers + ref-tf semialign split these these-lens transformers ]; benchmarkHaskellDepends = [ base containers criterion deepseq dependent-map dependent-sum @@ -194182,8 +194750,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.1.0"; - sha256 = "1nhi33d0yqx2pjccrcbsgwp2l56sdmqpl11vpvkvx4wkxckyz2qf"; + version = "0.1.1.1"; + sha256 = "1qhmpdfwavr4vip39p1ih3hz0yb1b308g3m24w80n3zw7xqnqz6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196143,6 +196711,18 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "replace-megaparsec" = callPackage + ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.0.1.0"; + sha256 = "18aipcrmic0xgfjg1cia6zs7m5a9xq7srm1r713qxri9pm5ynqd6"; + libraryHaskellDepends = [ base megaparsec ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + description = "Stream editing with parsers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "replica" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff , file-embed, http-types, QuickCheck, quickcheck-instances @@ -196609,7 +197189,7 @@ self: { broken = true; }) {}; - "resolv" = callPackage + "resolv_0_1_1_2" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , containers, directory, filepath, tasty, tasty-hunit }: @@ -196625,6 +197205,25 @@ self: { ]; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "resolv" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , containers, directory, filepath, tasty, tasty-hunit + }: + mkDerivation { + pname = "resolv"; + version = "0.1.1.3"; + sha256 = "10y9x63m2w87qfmx9fxjfliq9881cp1x8zkf94sb0hq52rgxd3r4"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring containers + ]; + testHaskellDepends = [ + base bytestring directory filepath tasty tasty-hunit + ]; + description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; + license = stdenv.lib.licenses.gpl2Plus; }) {}; "resolve" = callPackage @@ -198101,6 +198700,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_12_0" = 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.12.0"; + sha256 = "0xzjkh6aavynpyskikhs8dmv0zhkiqiwz9zdn80zbd25b2182pif"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rio-orphans" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base @@ -200811,37 +201436,6 @@ self: { }) {}; "salak" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, dlist, exceptions, filepath, hashable - , heaps, hspec, hspec-discover, megaparsec, menshen, mtl - , QuickCheck, random, scientific, text, time, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "salak"; - version = "0.3.4.1"; - sha256 = "178vjvyqvs2m6671wckw8yb5s5xy0nvdivxvyxqq9w8ckdnnk1q0"; - libraryHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps megaparsec menshen mtl scientific text time - unliftio-core unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps hspec megaparsec menshen mtl QuickCheck - random scientific text time unliftio-core unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion data-default directory dlist - exceptions filepath hashable heaps megaparsec menshen mtl - scientific text time unliftio-core unordered-containers - ]; - description = "Configuration (re)Loader and Parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salak_0_3_5_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, dlist, exceptions, filepath, hashable , heaps, hspec, hspec-discover, megaparsec, menshen, mtl @@ -200870,34 +201464,38 @@ self: { ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; + }) {}; + + "salak_0_3_5_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, directory, dlist, exceptions, filepath, hashable + , heaps, hspec, hspec-discover, megaparsec, menshen, mtl + , QuickCheck, random, scientific, text, time, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "salak"; + version = "0.3.5.2"; + sha256 = "1zz1dy3350amn9mbkmpysk4ykz8x40bmhrbbkbswrqf5kaa2d7xn"; + libraryHaskellDepends = [ + base bytestring containers data-default directory dlist exceptions + filepath hashable heaps megaparsec menshen mtl scientific text time + unliftio-core unordered-containers + ]; + testHaskellDepends = [ + base hspec mtl QuickCheck random scientific text + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion data-default mtl text time + ]; + description = "Configuration (re)Loader and Parser"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak-toml" = callPackage - ({ mkDerivation, base, criterion, exceptions, hspec, mtl - , QuickCheck, salak, text, time, tomland, unordered-containers - }: - mkDerivation { - pname = "salak-toml"; - version = "0.3.4.1"; - sha256 = "1gsgl6wzrzhpgbz1paig9xbxknm9g5z3g3cq47i198qzxnmqad7c"; - libraryHaskellDepends = [ - base salak text time tomland unordered-containers - ]; - testHaskellDepends = [ - base exceptions hspec mtl QuickCheck salak text time tomland - unordered-containers - ]; - benchmarkHaskellDepends = [ - base criterion salak text time tomland unordered-containers - ]; - description = "Configuration Loader for toml"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "salak-toml_0_3_5_1" = callPackage ({ mkDerivation, base, criterion, exceptions, hspec, mtl , QuickCheck, salak, text, time, tomland, unordered-containers }: @@ -200922,25 +201520,6 @@ self: { }) {}; "salak-yaml" = callPackage - ({ mkDerivation, base, conduit, criterion, exceptions, hspec - , libyaml, mtl, QuickCheck, salak, text - }: - mkDerivation { - pname = "salak-yaml"; - version = "0.3.4.1"; - sha256 = "083ba1pdv6pnlzc9ijh9pzvxn056yjhy46283jf49m4sbma105w4"; - libraryHaskellDepends = [ base conduit libyaml salak text ]; - testHaskellDepends = [ - base conduit exceptions hspec libyaml mtl QuickCheck salak text - ]; - benchmarkHaskellDepends = [ - base conduit criterion libyaml salak text - ]; - description = "Configuration Loader for yaml"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salak-yaml_0_3_5_1" = callPackage ({ mkDerivation, base, conduit, criterion, exceptions, hspec , libyaml, mtl, QuickCheck, salak, text }: @@ -200957,7 +201536,6 @@ self: { ]; description = "Configuration Loader for yaml"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "saltine" = callPackage @@ -202088,32 +202666,6 @@ self: { }) {}; "scheduler" = callPackage - ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest - , criterion, deepseq, doctest, exceptions, fib, hspec, monad-par - , mwc-random, parallel, primitive, QuickCheck, streamly - , template-haskell, unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "scheduler"; - version = "1.4.1"; - sha256 = "1m8l780pv9il661faa0angq05a5db9jpkyxxkil73285fx459fkl"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - atomic-primops base deepseq exceptions primitive unliftio-core - ]; - testHaskellDepends = [ - base deepseq doctest hspec mwc-random QuickCheck template-haskell - unliftio vector - ]; - benchmarkHaskellDepends = [ - async base criterion deepseq fib monad-par parallel streamly - unliftio - ]; - description = "Work stealing scheduler"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scheduler_1_4_2" = callPackage ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest , criterion, deepseq, doctest, exceptions, fib, genvalidity-hspec , hspec, monad-par, mwc-random, parallel, primitive, QuickCheck @@ -202137,7 +202689,6 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedyield" = callPackage @@ -204098,6 +204649,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_3" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, tagged, template-haskell, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.3"; + sha256 = "016hc4imr9l4szs3p7f1aahvxr5wv4clvr3qzrm3nibssg5vrs61"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -204133,12 +204706,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semigroups_0_19" = callPackage + "semigroups_0_19_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; - version = "0.19"; - sha256 = "1ficdd32y0v6bi0dxzjn9fph03ql0nmyjy0x3ahr8c4508xh779r"; + version = "0.19.1"; + sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; @@ -204651,8 +205224,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.3.2"; - sha256 = "0ghmhn9cmgxwn9nix309q300ma23snkvhmhg4vsl5gnx6bhg7caj"; + version = "1.3.2.1"; + sha256 = "0fl3sg4znmnil08vbjf50xcbs5blh9pvg1jakbhikj1aab68vpp5"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -208417,8 +208990,8 @@ self: { ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "3.1.0.0"; - sha256 = "1lbdz4bv95d0rwfpk1l494lrfd5qp029awbfiv1wpydbvvspdvx6"; + version = "3.1.0.2"; + sha256 = "04nhjq2s7iycjabh33jwbdc8pxdyxnfrwjvl1mxmwrx0zx96dbi9"; libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; @@ -211094,6 +211667,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-nats_0_4_3" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "singleton-nats"; + version = "0.4.3"; + sha256 = "0xj5w6dszm832y90qxmwqnyiwpav30q199cjcdbdxr7q1d4klszi"; + libraryHaskellDepends = [ base singletons ]; + description = "Unary natural numbers relying on the singletons infrastructure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-typelits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -211126,6 +211711,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singletons_2_6" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden + , template-haskell, text, th-desugar, transformers, turtle + }: + mkDerivation { + pname = "singletons"; + version = "2.6"; + sha256 = "1lc6p1f3h0j4nq5ppqwjihrjlgcwl5sx5fsw449m9lvs07vp39xy"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl pretty syb template-haskell text + th-desugar transformers + ]; + testHaskellDepends = [ + base filepath process tasty tasty-golden text turtle + ]; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singnal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -215504,6 +216111,30 @@ self: { broken = true; }) {}; + "sparse-tensor_0_2_1_1" = 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.1"; + sha256 = "1bjia89as14i2cif9nf7rsifazg305l7cl040gb7xbi3szlc621y"; + 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; + broken = true; + }) {}; + "sparsebit" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -215619,8 +216250,8 @@ self: { }: mkDerivation { pname = "spdx"; - version = "1"; - sha256 = "1vw6pqj86slgzgbrd6kmsn5xlbxln0cys9qxxa47ypfy4spxmfkd"; + version = "1.0.0.1"; + sha256 = "00j0dqx9hrlpqy1jml85nykg0xl108q45ljan385bzb5nnap36l6"; libraryHaskellDepends = [ base Cabal containers transformers ]; testHaskellDepends = [ base base-compat Cabal tasty tasty-quickcheck @@ -217400,6 +218031,19 @@ self: { broken = true; }) {}; + "stack-fix" = callPackage + ({ mkDerivation, base, options, text, turtle }: + mkDerivation { + pname = "stack-fix"; + version = "0.1.0.0"; + sha256 = "13x4pd1h2f2akpja5mxnqx0pw1ax57r2q76gsb3fs1f6kxykypwl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base options text turtle ]; + description = "Console program used to fix Stack build errors automatically"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "stack-hpc-coveralls" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib @@ -225629,6 +226273,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tar_0_5_1_1" = callPackage + ({ mkDerivation, array, base, bytestring, bytestring-handle + , containers, criterion, deepseq, directory, filepath, QuickCheck + , tasty, tasty-quickcheck, time + }: + mkDerivation { + pname = "tar"; + version = "0.5.1.1"; + sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath time + ]; + testHaskellDepends = [ + array base bytestring bytestring-handle containers deepseq + directory filepath QuickCheck tasty tasty-quickcheck time + ]; + benchmarkHaskellDepends = [ + array base bytestring containers criterion deepseq directory + filepath time + ]; + description = "Reading, writing and manipulating \".tar\" archive files."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tar-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, containers, criterion, deepseq, directory @@ -229842,6 +230511,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-desugar_1_10" = callPackage + ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit + , mtl, ordered-containers, semigroups, syb, template-haskell + , th-abstraction, th-expand-syns, th-lift, th-orphans + , transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.10"; + sha256 = "1g3v427qlpxl1m4klsbqzg2xas5sj4059j5pdx0vpbshpq9v3x8v"; + libraryHaskellDepends = [ + base containers fail ghc-prim mtl ordered-containers semigroups syb + template-haskell th-abstraction th-lift th-orphans + transformers-compat + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-expand-syns + th-lift th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-dict-discovery" = callPackage ({ mkDerivation, base, constraints, template-haskell }: mkDerivation { @@ -231091,8 +231784,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.4.0"; - sha256 = "0zh1d5apjsayqjwl019qcd4b7v2f2w14amq3rysdwqx8cz7z5045"; + version = "1.4.3"; + sha256 = "1nj5pgzan7q070c8qhcq51mnrwpkxi51ixmmp7b4n4fxfc80v68g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -237963,13 +238656,13 @@ self: { }: mkDerivation { pname = "typography-geometry"; - version = "1.0.0.1"; - sha256 = "1mrack0n940idy5rv7mm0gfif8xri6z59npxwkq1kgi606vazbpd"; + version = "1.0.1.0"; + sha256 = "0vi2ggpvvarqimrga985cks5wq67dqyrr5nh3a0ghy0mbdrb72ps"; libraryHaskellDepends = [ base containers parallel polynomials-bernstein vector ]; description = "Drawings for printed text documents"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -253019,8 +253712,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.1.0"; - sha256 = "1kd64j2ka246n8c0z30rckq75998ajaja6ylmpdc74pzn23iydq9"; + version = "0.11.1.1"; + sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -253039,7 +253732,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yaml_0_11_1_1" = callPackage + "yaml_0_11_1_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -253048,8 +253741,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.1.1"; - sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp"; + version = "0.11.1.2"; + sha256 = "028pz77n92l6kjgjv263h4b6yhw1iibdbf3a3dkn5qnz537xpzhc"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -257347,8 +258040,8 @@ self: { }: mkDerivation { pname = "zeromq4-simple"; - version = "0.0.0"; - sha256 = "04i8ksdyf19yywjb0gfkbc0mx90vzvrld5ba7lbnlxvx6iwmah66"; + version = "0.0.0.1"; + sha256 = "0h16chz3x0ipdbw935fvfhpdljbknczk1ivf87519dkrl3c1ypjv"; libraryHaskellDepends = [ aeson base bytestring constraints hashable uuid zeromq4-haskell ]; @@ -257788,6 +258481,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; + "zlib_0_6_2_1" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, zlib + }: + mkDerivation { + pname = "zlib"; + version = "0.6.2.1"; + sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ zlib ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Compression and decompression in the gzip and zlib formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) zlib;}; + "zlib-bindings" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: mkDerivation { From 83bc9776ca3bd2ce00ecb17f6201db61ddffc12f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:18:55 +0000 Subject: [PATCH 099/283] cabal-install: version 3.x is out officially --- .../haskell-modules/configuration-common.nix | 3 -- .../configuration-ghc-8.8.x.nix | 4 -- .../haskell-modules/non-hackage-packages.nix | 39 ------------------- 3 files changed, 46 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c37667af558..9fcc18ab2b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -32,9 +32,6 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # Use the latest version of the Cabal library. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_1_0; }); - # The test suite depends on old versions of tasty and QuickCheck. hackage-security = dontCheck super.hackage-security; 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 417fc0b3a44..9dcc76fc26c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,10 +41,6 @@ self: super: { unix = null; xhtml = null; - # Use the cabal-install 3.0.0.0 beta release. - cabal-install = self.cabal-install-3; - Cabal_3_0_0_0 = null; # Our compiler has this already. - # Ignore overly restrictive upper version bounds. async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 1793299bf6c..8b667a1e669 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -13,43 +13,4 @@ self: super: { # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; - cabal-install-3 = (self.callPackage - ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, containers, cryptohash-sha256, deepseq - , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, mtl, network, network-uri, parsec, pretty - , process, random, resolv, stdenv, stm, tar, text, time, unix, zlib - , fetchFromGitHub - }: - mkDerivation { - pname = "cabal-install"; - version = "3.0.0.0"; - src = fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "b0e52fa173573705e861b129d9675e59de891e46"; - sha256 = "1fbph6crsn9ji8ps1k8dsxvgqn38rp4ffvv6nia1y7rbrdv90ass"; - }; - postUnpack = "sourceRoot+=/cabal-install"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal filepath process ]; - executableHaskellDepends = [ - array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 deepseq directory echo edit-distance - filepath hackage-security hashable HTTP mtl network network-uri - parsec pretty process random resolv stm tar text time unix zlib - ]; - doCheck = false; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; - }) {}).overrideScope (self: super: { - Cabal = self.Cabal_3_0_0_0; - }); - } From 9d4300b4b2def7a1e3fc5ffe009c03f649089e85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:19:35 +0000 Subject: [PATCH 100/283] haskell-resolv: drop obsolete patches for ghc 8.8.x --- .../haskell-modules/configuration-ghc-8.8.x.nix | 12 ------------ 1 file changed, 12 deletions(-) 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 9dcc76fc26c..35b7c004637 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -81,18 +81,6 @@ self: super: { sed -i -e 's/time < 1.9/time < 2/' tar.cabal ''; }); - resolv = overrideCabal (overrideSrc super.resolv { - version = "20180411-git"; - src = pkgs.fetchFromGitHub { - owner = "haskell-hvr"; - repo = "resolv"; - rev = "a22f9dd900cb276b3dd70f4781fb436d617e2186"; - sha256 = "1j2jyywmxjhyk46kxff625yvg5y37knv7q6y0qkwiqdwdsppccdk"; - }; - }) (drv: { - buildTools = with pkgs; [autoconf]; - preConfigure = "autoreconf --install"; - }); dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch"; sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc"; From e2dfa9f721be4aabdb5719aff46ecd8acaffb9b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:20:33 +0000 Subject: [PATCH 101/283] haskell-QuickCheck: drop obsolete patches for ghc 8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ---- 1 file changed, 4 deletions(-) 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 35b7c004637..f6e26aafa34 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -93,10 +93,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch"; sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j"; }); - QuickCheck = appendPatch super.QuickCheck (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch"; - sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl"; - }); regex-base = appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; From 7304dc14799ae2f9b1e07347cb141c7ca5168dc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:21:17 +0000 Subject: [PATCH 102/283] haskell-regex-base: jailbreak build for ghc 8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f6e26aafa34..07e23d4782b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -93,9 +93,11 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch"; sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j"; }); - regex-base = appendPatch super.regex-base (pkgs.fetchpatch { + regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; + })) (drv: { + preConfigure = "sed -i -e 's/base >=4 && < 4.13,/base,/' regex-base.cabal"; }); regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; From 5137dc389ac893d459f152399698266f84e31639 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:24:56 +0000 Subject: [PATCH 103/283] haskell-HTTP: drop obsolete patches for ghc 8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ---- 1 file changed, 4 deletions(-) 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 07e23d4782b..2413c592660 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -119,10 +119,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch"; sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y"; }); - HTTP = appendPatch (doJailbreak super.HTTP) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/HTTP-4000.3.13.patch"; - sha256 = "1fadi529x7dnmbfmls5969qfn9d4z954nc4lbqxmrwgirphkpmn4"; - }); hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; From a9dd9c7c2f1900db1808debe3b465bf15b63652c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:38:36 +0000 Subject: [PATCH 104/283] haskell-resolv: add overrides for older compilers --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++ 3 files changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9fcc18ab2b0..f0e53b97266 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1005,6 +1005,7 @@ self: super: { # https://github.com/haskell-hvr/resolv/issues/1 resolv = dontCheck super.resolv; + resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2; # spdx 0.2.2.0 needs older tasty # was fixed in spdx master (4288df6e4b7840eb94d825dcd446b42fef25ef56) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index e8c138e594c..eba62c95be9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -76,4 +76,7 @@ self: super: { aeson = addBuildDepend super.aeson self.contravariant; base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; + # Newer versions don't compile. + resolv = self.resolv_0_1_1_2; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 8d0582a8d06..4e70648b71a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -88,4 +88,7 @@ self: super: { version = "0.8.6.0-pre-release"; }; + # Newer versions don't compile. + resolv = self.resolv_0_1_1_2; + } From 374a39e598815c27d470f4ff57496eccb521f3de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:25:53 +0000 Subject: [PATCH 105/283] cabal-install: jailbreak build for ghc 8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 + 1 file changed, 1 insertion(+) 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 2413c592660..0ba27168ce4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -43,6 +43,7 @@ self: super: { # Ignore overly restrictive upper version bounds. async = doJailbreak super.async; + cabal-install = doJailbreak super.cabal-install; ChasingBottoms = doJailbreak super.ChasingBottoms; cryptohash-sha256 = doJailbreak super.cryptohash-sha256; Diff = dontCheck super.Diff; From 2e08ac73ca0098bf6dead801631c909d3a6b8e85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:45:06 +0000 Subject: [PATCH 106/283] cabal-install: override native Cabal version on older compilers --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index eba62c95be9..0919292d44a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -40,6 +40,9 @@ self: super: { unix = null; xhtml = null; + # Needs Cabal 3.0.x. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + # Restricts aeson to <1.4 # https://github.com/purescript/purescript/pull/3537 purescript = doJailbreak super.purescript; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 4e70648b71a..4addc834040 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -41,6 +41,9 @@ self: super: { unix = null; xhtml = null; + # Needs Cabal 3.0.x. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; From 995d0782f523bab0ed4e83fed84c74fedcddbe0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:25:27 +0000 Subject: [PATCH 107/283] configuration-ghc-8.8.x.nix: cosmetic --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0ba27168ce4..2209f570732 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -50,6 +50,7 @@ self: super: { doctest = doJailbreak super.doctest; hashable = doJailbreak super.hashable; hashable-time = doJailbreak super.hashable-time; + hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3 integer-logarithms = doJailbreak super.integer-logarithms; lucid = doJailbreak super.lucid; parallel = doJailbreak super.parallel; @@ -59,7 +60,6 @@ self: super: { tasty-expected-failure = doJailbreak super.tasty-expected-failure; test-framework = doJailbreak super.test-framework; th-lift = self.th-lift_0_8_0_1; - hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3 # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { From 38a581902eb795da6bd5b2b49faac32f75e8882b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2019 15:52:04 +0000 Subject: [PATCH 108/283] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/222d2ffb871617615c537b4f6fefcefc3d338e7a. --- .../development/haskell-modules/hackage-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a6fd9209005..eaa0f799f92 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1511,8 +1511,8 @@ self: { }: mkDerivation { pname = "BiobaseBlast"; - version = "0.3.0.0"; - sha256 = "1p6ammx4fw5a9bvw503g46smmw5rx4rrpvlf8lmw7c73aczm9ga1"; + version = "0.3.1.0"; + sha256 = "153bxf221jga58ibxgd660465klbqj49qr3rk6ni77v7sb4qgrg0"; libraryHaskellDepends = [ aeson attoparsec base binary BiobaseENA BiobaseTypes BiobaseXNA bytestring cereal containers deepseq directory file-embed lens @@ -41675,6 +41675,8 @@ self: { ]; description = "Factory for quickly building a microservice"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boots-web" = callPackage @@ -41695,6 +41697,8 @@ self: { ]; description = "Factory for quickly building a web application"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bootstrap-types" = callPackage @@ -89328,8 +89332,8 @@ self: { ({ mkDerivation, base, HUnit, template-haskell, th-abstraction }: mkDerivation { pname = "generic-constraints"; - version = "1.1.0"; - sha256 = "1f7d1z8l68f89p1kfiylwv3qb6n2x7njni4rhlxk9vvyllxgnqcb"; + version = "1.1.1"; + sha256 = "0ifia4yw495ikkvjn70c386z3w40vyl2wracmcij025yc9bz4w9q"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base HUnit ]; description = "Constraints via Generic"; From 46ff96c05b24fe5f7b82ff0f188d367bb84bc40c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 28 Aug 2019 17:57:57 +0200 Subject: [PATCH 109/283] dovecot-pigeonhole: 0.5.7.1 -> 0.5.7.2 (CVE-2019-11500) This is a followup on #67623 --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 3d0f921409c..dce0b917409 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.5.7.1"; + version = "0.5.7.2"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "0a10mam68pmdh3fw8fnv5jff6xj1k770hvadym2c39vm3x6b4w1j"; + sha256 = "1c0ijjmdskxydmvfk8ixxgg8ndnxx1smvycbp7jjd895a9f0r7fm"; }; buildInputs = [ dovecot openssl ]; From fb68a01449eec0f1764ed8c3f46020886161ff57 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 29 Aug 2019 00:33:33 +0800 Subject: [PATCH 110/283] eksctl: 0.4.2 -> 0.4.3 --- pkgs/tools/admin/eksctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index aaf59d72f98..4a4d738f04d 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0vyz02yli2lnzzzzy8dv9y5g69ljr671p1lgx84z8ys2ihwj3yc3"; + sha256 = "1h7fyxlwa9f9r08rpl05r62ap7h7viaqchldbnv7j3vs2j23k127"; }; modSha256 = "17bb1k18x1xfq9bi9qbm8pln6h6pkhaqzy07qdvnhinmspll1695"; From 06073ae7df9f0202c864a7d91ed9ac40b388fd4a Mon Sep 17 00:00:00 2001 From: Vika Date: Mon, 26 Aug 2019 13:40:21 +0300 Subject: [PATCH 111/283] libargon2: fixed cross-compilation Makefile had a hardcoded unprefixed ar. I wrote a patch (sending it upstream) and added an optional make flag to override it in case we're cross-compiling. Unfortunately, this causes a rebuild of native packages. This commit also fixes the pkg-config file to be generated correctly, patch was provided by @worldofpeace. --- .../libraries/libargon2/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index c0dd406dd31..9bf05a679cc 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "libargon2"; @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; - installPhase = '' - runHook preInstall - mkdir -p $out/lib/pkgconfig - substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \ - --replace @UPSTREAM_VER@ "${version}" \ - --replace @HOST_MULTIARCH@ "" \ - --replace 'prefix=/usr' "prefix=$out" + patches = [ + # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released + (fetchpatch { + url = "https://github.com/P-H-C/phc-winner-argon2/commit/cd1c1d8d204e4ec4557e358013567c097cb70562.patch"; + sha256 = "0whqv8b6q9602n7vxpzbd8bk8wz22r1jz9x5lrm9z7ib3wz81c8a"; + }) + ]; - make install PREFIX=$out LIBRARY_REL=lib - ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0 - runHook postInstall - ''; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" # Fix cross-compilation + "PREFIX=${placeholder "out"}" + "ARGON2_VERSION=${version}" + "LIBRARY_REL=lib" + "PKGCONFIG_REL=lib" + ]; meta = with stdenv.lib; { description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; From 4b99f9ba0bac82b2d3391ad115d4941b483986f5 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 28 Aug 2019 18:42:18 +0200 Subject: [PATCH 112/283] vault: add raft backend to vault service --- nixos/modules/services/security/vault.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 8176c168ca9..d5962ba9af9 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -70,7 +70,7 @@ in }; storageBackend = mkOption { - type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" ]; + type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" "raft" ]; default = "inmem"; description = "The name of the type of storage backend"; }; From cd7142b2886356c49765352bb43a1ab81dc0d767 Mon Sep 17 00:00:00 2001 From: Vika Date: Wed, 28 Aug 2019 20:17:34 +0300 Subject: [PATCH 113/283] lr: add myself (@kisik21) as maintainer As an answer to #67638, I'm adopting this package, adding myself as a maintainer. --- maintainers/maintainer-list.nix | 10 ++++++++++ pkgs/tools/system/lr/default.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aca54c9f102..7db37f7f1f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6640,6 +6640,16 @@ githubId = 5837359; name = "Adrian Pistol"; }; + vika_nezrimaya = { + email = "vika@fireburn.ru"; + github = "kisik21"; + githubId = 7953163; + name = "Vika Shleina"; + keys = [{ + longkeyid = "rsa4096/0x5402B9B5497BACDB"; + fingerprint = "A03C D09C 36CF D9F6 1ADF AF11 5402 B9B5 497B ACDB"; + }]; + }; vinymeuh = { email = "vinymeuh@gmail.com"; github = "vinymeuh"; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 38fe1e6347f..39cd429e1f9 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "List files recursively"; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ vika_nezrimaya ]; }; } From 0c4cb4c10267cdf74d6d51e285a74914cf300b4e Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 28 Aug 2019 16:38:15 +0200 Subject: [PATCH 114/283] prometheus-cups-exporter: init at unstable-2019-03-17 --- .../monitoring/prometheus/cups-exporter.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/cups-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/pkgs/servers/monitoring/prometheus/cups-exporter.nix new file mode 100644 index 00000000000..9ba73b3d210 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/cups-exporter.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "prometheus-cups-exporter-unstable"; + version = "2019-03-17"; + + format = "other"; + + src = fetchFromGitHub { + owner = "ThoreKr"; + repo = "cups_exporter"; + rev = "8fd1c2517e9878b7b7c73a450e5e546f437954a9"; + sha256 = "1cwk2gbw2svqjlzgwv5wqzhq7fxwrwsrr0kkbnqn4mfb0kq6pa8m"; + }; + + propagatedBuildInputs = with python3Packages; [ prometheus_client pycups ]; + + installPhase = '' + mkdir -p $out/share/ + cp cups_exporter.py $out/share/ + ''; + + fixupPhase = '' + makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-cups-exporter" \ + --set PYTHONPATH "$PYTHONPATH" \ + --add-flags "$out/share/cups_exporter.py" + ''; + + meta = with lib; { + description = "A simple prometheus exporter for cups implemented in python"; + homepage = "https://github.com/ThoreKr/cups_exporter"; + license = licenses.unfree; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b345fc29746..d4721b8d3ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15011,6 +15011,7 @@ in prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; + prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; From 7863697575813b68a90ce25599a6349d6c179d5c Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 28 Aug 2019 14:30:18 -0400 Subject: [PATCH 115/283] fly: 5.3.0 -> 5.4.1 (#67633) --- .../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 47af70b3702..3f394472c40 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 = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "06ns98k47nafhkkj7gkmxp7msn4ssypyss6ll0fm6380vq2cavnj"; + sha256 = "15lkhdvxqcryn5k7qflkby666ddj66gpqzga13yxjgjjp7zx2mi3"; }; - modSha256 = "11rnlmn5hp9nsgkmd716dsjmkr273035j9gzfhjxjsfpiax60i0a"; + modSha256 = "0wz0v7w2di23cvqpg35zzqs2hvsbjgcrl7pr90ymmpsspq97fkf7"; subPackages = [ "fly" ]; From 88723457e6ed9afd92c1d37d88e097e3b6a83708 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Wed, 28 Aug 2019 15:22:12 -0400 Subject: [PATCH 116/283] rclone: 1.49.0 -> 1.49.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 ce676566577..52527f79303 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.49.0"; + version = "1.49.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "13xzz6nl4863dyn9w1qczap77bbiwzp4znbifa9hg91qys0nj5ga"; + sha256 = "0mjwp1j70dqa8k3zxhcnw85ddhagkpr7c59mv8kradv6mqqzmq9c"; }; modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; From a4ca80771e302361e271def6f95453184f76636c Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 28 Aug 2019 19:29:17 +0000 Subject: [PATCH 117/283] =?UTF-8?q?one=5Fgadget:=201.6.2=20=E2=86=92=201.7?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/misc/one_gadget/Gemfile.lock | 6 +++--- pkgs/development/tools/misc/one_gadget/gemset.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock index 3e02f085ae6..ea31cc3704f 100644 --- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -2,10 +2,10 @@ GEM remote: https://rubygems.org/ specs: bindata (2.4.4) - elftools (1.0.2) + elftools (1.1.0) bindata (~> 2) - one_gadget (1.6.2) - elftools (~> 1.0.2) + one_gadget (1.7.2) + elftools (>= 1.0.2, < 1.2.0) PLATFORMS ruby diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/pkgs/development/tools/misc/one_gadget/gemset.nix index 485ddf940fd..26507a26e91 100644 --- a/pkgs/development/tools/misc/one_gadget/gemset.nix +++ b/pkgs/development/tools/misc/one_gadget/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajymn59fr9117dkwf5xl8vmr737h6xmrcf1033zjlj2l5qkxn4a"; + sha256 = "0kdf0ck4rzxpd006y09rfwppdrqb3sxww4gzfpv2053yq4mkimbn"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; one_gadget = { dependencies = ["elftools"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wacvysd7ddnbx2jl1vhzbkb28y974riyns7bpx889518zaa09z0"; + sha256 = "07s2nigjw1yik895gliz3a7ps0m9j5nccq82zwdd30sv740jmf5b"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.2"; }; } \ No newline at end of file From 02ed974bbad4bf8dfca02f4d1251df217a89e2b1 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 28 Aug 2019 22:27:28 +0200 Subject: [PATCH 118/283] nixos/gitlab-runner: add missing HOME to environment (#67450) Gitlab runner fails to start if HOME is not set. --- .../services/continuous-integration/gitlab-runner.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 3ceaa6f5ff3..3d307b1abcf 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -111,7 +111,10 @@ in config = mkIf cfg.enable { systemd.services.gitlab-runner = { path = cfg.packages; - environment = config.networking.proxy.envVars; + environment = config.networking.proxy.envVars // { + # Gitlab runner will not start if the HOME variable is not set + HOME = cfg.workDir; + }; description = "Gitlab Runner"; after = [ "network.target" ] ++ optional hasDocker "docker.service"; From 33b67761be99c21b151b9a3b8c5c8bd6398671a9 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Wed, 28 Aug 2019 16:28:46 -0400 Subject: [PATCH 119/283] zerotierone: 1.4.2 -> 1.4.4 (#67648) --- pkgs/tools/networking/zerotierone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 59bab468c53..367c518ad82 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "1b78jr33xawdkn8dcs884g6klj0zg4dazwhr1qhrj7x54bs7gizr"; + sha256 = "1b9qm01ximz2j6yimp7bs86h4kaz8jsjxxb6c2js43dzp98k0m94"; }; preConfigure = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; - license = licenses.gpl3; + license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; platforms = platforms.x86_64 ++ platforms.aarch64; }; From 819696bb0cee6085e5f4393aa437184db1026280 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 29 Aug 2019 01:51:25 +0200 Subject: [PATCH 120/283] evcxr: 0.4.3 -> 0.4.4 https://github.com/google/evcxr/releases/tag/v0.4.4 --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 84ebc49a221..54ee243cb33 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "08zsdl6pkg6dx7k0ns8cd070v7ydsxkscd2ms8wh9r68c08vwzcp"; + sha256 = "1j2vsqgljqw7415rgjlnc1w3nmr9ghizx2mncbm1yipwj8xbrmf6"; }; - cargoSha256 = "1hqlagwl94xcybfqq5h2mrz9296mjns2l598d6jclls7ac5wsdfc"; + cargoSha256 = "0ckxpmi547y7q4w287znimpxgaj3mjkgmkcs2n9cp4m8cw143hly"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ zeromq ] ++ stdenv.lib.optional stdenv.isDarwin Security; From 7f6a9eef2602a9ddb369ec3318ee99e98054989b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 29 Aug 2019 03:31:14 +0200 Subject: [PATCH 121/283] crystal: Fix runtime by switching to openssl_1_0_2 This makes `crystal play` work --- pkgs/development/compilers/crystal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index c7a74880e44..2bc3d396da6 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper -, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml +, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib , callPackage }: @@ -20,7 +20,7 @@ let arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ]; genericBinary = { version, sha256s, rel ? 1 }: stdenv.mkDerivation rec { @@ -73,7 +73,7 @@ let buildInputs = [ boehmgc libatomic_ops pcre libevent libyaml - llvm zlib openssl + llvm zlib openssl_1_0_2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; From 8d3c2c8538e812d8ca11aa27852e8f1cc68091cd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 28 Aug 2019 15:48:04 +0800 Subject: [PATCH 122/283] gcompris: use Qt mkDerivation --- pkgs/games/gcompris/default.nix | 56 ++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 8d41070a61e..23d12602759 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -1,37 +1,55 @@ -{stdenv, cmake, qtbase, fetchurl, qtdeclarative, qtmultimedia, qttools, qtsensors, qmlbox2d, gettext, qtquickcontrols, qtgraphicaleffects, qtxmlpatterns, makeWrapper, - gst_all_1, ninja +{ mkDerivation +, cmake +, fetchurl +, gettext +, gst_all_1 +, lib +, ninja +, qmlbox2d +, qtbase +, qtdeclarative +, qtgraphicaleffects +, qtmultimedia +, qtquickcontrols +, qtsensors +, qttools +, qtxmlpatterns }: -stdenv.mkDerivation rec { + +mkDerivation rec { + pname = "gcompris"; version = "0.96"; - name = "gcompris-${version}"; src = fetchurl { url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; sha256 = "06483il59l46ny2w771sg45dgzjwv1ph7vidzzbj0wb8wbk2rg52"; }; - cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"; + cmakeFlags = [ + "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0" + ]; - nativeBuildInputs = [ cmake ninja makeWrapper ]; - buildInputs = [ qtbase qtdeclarative qttools qtsensors qmlbox2d gettext qtquickcontrols qtmultimedia qtgraphicaleffects qtxmlpatterns] ++ soundPlugins; - soundPlugins = with gst_all_1; [gst-plugins-good gstreamer gst-plugins-base gst-plugins-bad]; + nativeBuildInputs = [ cmake gettext ninja qttools ]; + + buildInputs = [ + qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns + ] ++ (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + ]); postInstall = '' - # install .desktop and icon file - mkdir -p $out/share/applications/ - mkdir -p $out/share/icons/hicolor/256x256/apps/ - cp ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop - cp -r ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png + install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop + install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png + install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo - wrapProgram "$out/bin/gcompris-qt" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10"; homepage = "https://gcompris.net/"; - maintainers = [ maintainers.guibou ]; - platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl3Plus; + maintainers = with maintainers; [ guibou ]; + platforms = platforms.linux; }; } From 392763aea636fa9a59889b2d0162d959b11de0da Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Wed, 28 Aug 2019 10:08:28 +1000 Subject: [PATCH 123/283] qtpass: fix missing app icon and name when running under Wayland Patch has been upstreamed and should be safe to remove in versions > 1.3.0 --- pkgs/applications/misc/qtpass/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 462114ed272..cbe24f7183a 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,6 @@ -{ stdenv, mkDerivation, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch +, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper +}: mkDerivation rec { pname = "qtpass"; @@ -15,6 +17,15 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper qmake ]; + # Fix missing app icon on Wayland. Has been upstreamed and should be safe to + # remove in versions > 1.3.0 + patches = [ + (fetchpatch { + url = "https://github.com/IJHack/QtPass/commit/aba8c4180f0ab3d66c44f88b21f137b19d17bde8.patch"; + sha256 = "009bcq0d75khmaligzd7736xdzy6a8s1m9dgqybn70h801h92fcr"; + }) + ]; + enableParallelBuilding = true; qtWrapperArgs = [ From 8de860b60d0deb6aa0a13f0e16723bbce70f1a67 Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Thu, 29 Aug 2019 08:25:52 +1000 Subject: [PATCH 124/283] qtpass: 1.2.3 -> 1.3.0 --- pkgs/applications/misc/qtpass/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index cbe24f7183a..1fccada4200 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,21 +1,21 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch -, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper +{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch +, git, gnupg, pass, qtbase, qtsvg, qttools, qmake }: mkDerivation rec { pname = "qtpass"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky"; + sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv"; }; buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; - nativeBuildInputs = [ makeWrapper qmake ]; + nativeBuildInputs = [ qmake ]; # Fix missing app icon on Wayland. Has been upstreamed and should be safe to # remove in versions > 1.3.0 @@ -29,9 +29,7 @@ mkDerivation rec { enableParallelBuilding = true; qtWrapperArgs = [ - "--suffix PATH : ${git}/bin" - "--suffix PATH : ${gnupg}/bin" - "--suffix PATH : ${pass}/bin" + "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}" ]; postInstall = '' From 7ba8b728dc1100b4a114d92974a17587a02f0c21 Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Wed, 28 Aug 2019 22:31:57 -0700 Subject: [PATCH 125/283] include-what-you-use: 0.10 -> 0.12 Release notes: https://github.com/include-what-you-use/include-what-you-use/releases/tag/clang_8.0 IWYU version 0.12 is based on LLVM/Clang version 8.0. --- .../tools/analysis/include-what-you-use/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 4222f72248a..019a449ebcd 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.10"; + version = "0.12"; src = fetchurl { - sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s"; + sha256 = "09b0h704fh7r4f5h92p5997cj3zk1v04bqp4jk1j1f6cmfq2z2d5"; url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ - --replace "['include-what-you-use']" "['$out/bin/include-what-you-use']" + --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06dd2829570..493aa3bead8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9352,7 +9352,7 @@ in }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_8; }; indent = callPackage ../development/tools/misc/indent { }; From 3f632253094adbf884e7e33a82f7289555bcb734 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Aug 2019 19:53:02 +0000 Subject: [PATCH 126/283] ocamlPackages.batteries: 2.9.0 -> 2.10.0 Ensures compatibility with OCaml 4.08. --- pkgs/development/ocaml-modules/batteries/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 473c30b4345..3b511c7f1cc 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "2.9.0"; in +let version = "2.10.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; - src = fetchzip { - url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "1wianim29kkkf4c31k7injjp3ji69ki5krrp6csq8ycswg791dby"; + src = fetchurl { + url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; + sha256 = "08ghw87d56h1a6y1nnh3x2wy9xj25jqfk5sp6ma9nsyd37babb0h"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; propagatedBuildInputs = [ num ]; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07" && !stdenv.isAarch64; + doCheck = stdenv.lib.versions.majorMinor ocaml.version != "4.07" && !stdenv.isAarch64; checkTarget = "test test"; createFindlibDestdir = true; From 7f88d0feb7a049de8eaf701f1d39e920c47306b1 Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Thu, 29 Aug 2019 09:49:25 +0300 Subject: [PATCH 127/283] hubstaff: 1.4.9 -> 1.4.10 --- pkgs/applications/misc/hubstaff/revision.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 513e5bef442..3170a63379c 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.9-86828309/Hubstaff-1.4.9-86828309.sh", - "version": "1.4.9-86828309", - "sha256": "0p9b7s2damzxmbrm8m97bj06g0faslbjw51dmxq8icz6ldbqsspx" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh", + "version": "1.4.10-848554d6", + "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z" } From f24c729196a36aa16d87d14e6203c57abe946252 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Aug 2019 03:00:00 -0500 Subject: [PATCH 128/283] postgresqlPackages.plv8: narrow platforms to x86_64-linux plv8 uses a custom version v8 version, which is reported to only build on x86_64-linux. The next major version plv8 should drop the custom v8. --- pkgs/development/libraries/v8/plv8_6_x.nix | 6 ++++-- pkgs/servers/sql/postgresql/ext/plv8.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index 8d2276def70..e0ca0e14b66 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -1,6 +1,8 @@ # NOTE: this expression is NOT exported from the top-level of all-packages.nix, -# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a -# very exact version. +# it is exclusively used by the 'plv8' PostgreSQL extension. +# Since plv8 2.3.2, plv8 no longer requires this specific version, but as of +# 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which +# is a bit outdated. plv8 3.x is planned to support v8 7.x { stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig , doCheck ? false diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index b4f4c357d42..9f88f9de045 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; license = licenses.postgresql; }; } From 2af98a46c14f8a9dc24e5c4bfe6671b2ef1b33e9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Aug 2019 03:00:00 -0500 Subject: [PATCH 129/283] 1password: 0.5.7 -> 0.6.1 --- pkgs/applications/misc/1password/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 79c3a6d7302..edcd08f2499 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.5.7"; + version = "0.6.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 = "1193lq6cvqkv2cy07l6wzb25gb5vb3s3pxm534q3izhzrrz6lisz"; + sha256 = "1yr78yawscp9fgvdw0dimc68k3bblk3g67g3jrqpa7hnl6pr24yl"; 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 = "0hlw1jasxzg31293d2n3ydzj62q7ji7nig7aaighcvzi3c9j7v51"; + sha256 = "03m0vxhghzf4zq7k2f1afkc5ixf0qwiiypqjfjgpqpfng7g9ang7"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "05z5k63fza6v0vhydyiq4sh9xhxnd9rcfxyym7jihv6b3fv3fnx3"; + sha256 = "1hypmls1fq4rjx9icgr0pkx3s3fhhma2q5rds314sv7f9ijl458f"; stripRoot = false; } else throw "Architecture not supported"; From 964974bbb7ec6b153afff0ec46f78984b4af0e96 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Aug 2019 03:01:00 -0500 Subject: [PATCH 130/283] postgresqlPackages.plv8: add marsam as maintainer --- pkgs/servers/sql/postgresql/ext/plv8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index 9f88f9de045..75a2853e2c0 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ volth marsam ]; platforms = [ "x86_64-linux" ]; license = licenses.postgresql; }; From e6e3270bd44ddc7d94df6b054a1e4e543055ca05 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 29 Aug 2019 10:34:36 +0200 Subject: [PATCH 131/283] kea: 1.5.0 -> 1.5.0-P1 (security) Fixes: * CVE-2019-6472 affects the Kea DHCPv6 server, which can exit with an assertion failure if the DHCPv6 server process receives a request containing DUID value which is too large. (https://kb.isc.org/docs/cve-2019-6474) * CVE-2019-6473 affects the Kea DHCPv4 server, which can exit with an assertion failure if it receives a packed containing a malformed option. (https://kb.isc.org/docs/cve-2019-6473) * CVE-2019-6474 can cause a condition where the server cannot be restarted without manual operator intervention to correct a problem that can be deliberately introduced into the stored leases. CVE-2019-6474 can only affect servers which are using memfile for lease storage. (https://kb.isc.org/docs/cve-2019-6474) Annoucement: https://www.openwall.com/lists/oss-security/2019/08/29/1 --- pkgs/tools/networking/kea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index a1c156475fb..0d1bd462d3b 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.5.0"; + version = "1.5.0-P1"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "1v5a3prgrplw6dp9124f9gpy0kz0jrjwhnvzrw3zcynad2mlzkpd"; + sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz"; }; patches = [ ./dont-create-var.patch ]; From 298439f4fae2d96afbbd72100219c1c80e4bea4a Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 29 Aug 2019 11:08:10 +0200 Subject: [PATCH 132/283] kinetic-cpp-client: use openssl_1_0_2 --- 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 d290cb592e1..5d6a747f0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11461,7 +11461,9 @@ in automake = automake111x; }; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; + kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { + openssl = openssl_1_0_2; + }; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; From 48c153d57f7076a27d477649c645d6f4b47855e3 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Thu, 29 Aug 2019 11:13:41 +0200 Subject: [PATCH 133/283] atlassian-confluence: 6.15.6 -> 6.15.8 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 2f7a7c80cb6..46160fee24b 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.15.6"; + version = "6.15.8"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; - sha256 = "0bb404d5i8jdry1jw8qdrcpgp9lvdkyxry58331pwpw16mlh0r2m"; + sha256 = "17pcgjv6rj2jxzmwx82941zhrrmprkchjhnnadnxq4709zsyb4q3"; }; buildPhase = '' From e2eef8d28dc460cd2779a74357a3a3df66961bf5 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Thu, 29 Aug 2019 12:20:01 +0300 Subject: [PATCH 134/283] escrotum: 2017-01-28 -> 2019-06-10 --- pkgs/tools/graphics/escrotum/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 2a4f3c9cbff..16f33251dd6 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -4,17 +4,24 @@ }: buildPythonApplication { - name = "escrotum-2017-01-28"; + name = "escrotum-2019-06-10"; src = fetchFromGitHub { owner = "Roger"; repo = "escrotum"; - rev = "a51e330f976c1c9e1ac6932c04c41381722d2171"; - sha256 = "0vbpyihqgm0fyh22ashy4lhsrk67n31nw3bs14d1wr7ky0l3rdnj"; + rev = "f6c300315cb4402e37f16b56aad2d206e24c5281"; + sha256 = "0x7za74lkwn3v6j9j04ifgdwdlx9akh1izkw7vkkzj9ag9qjrzb0"; }; propagatedBuildInputs = [ pygtk numpy ]; + outputs = [ "out" "man" ]; + + postInstall = '' + mkdir -p $man/share/man/man1 + cp man/escrotum.1 $man/share/man/man1/ + ''; + meta = with lib; { homepage = https://github.com/Roger/escrotum; description = "Linux screen capture using pygtk, inspired by scrot"; From b5977ddd8e04ef6102020f96292abdac24d97595 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 29 Aug 2019 18:03:52 +0800 Subject: [PATCH 135/283] cargo-web: 0.6.25 -> 0.6.26 --- pkgs/development/tools/cargo-web/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index fa45ba689df..7ed75d3f6e6 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-web"; - version = "0.6.25"; + version = "0.6.26"; src = fetchFromGitHub { owner = "koute"; repo = pname; rev = version; - sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf"; + sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; - cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn"; + cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5"; nativeBuildInputs = [ openssl perl pkgconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for the client-side Web"; homepage = https://github.com/koute/cargo-web; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ maintainers.kevincox ]; + maintainers = with maintainers; [ kevincox ]; platforms = platforms.all; }; } From 7dfe735465b715cf409dfffefb45253d4b516bae Mon Sep 17 00:00:00 2001 From: Valerio Besozzi Date: Thu, 29 Aug 2019 12:13:36 +0200 Subject: [PATCH 136/283] waybar: 0.7.2 -> 0.8.0 --- pkgs/applications/misc/waybar/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index d6cbb442b89..002bdef7333 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja -, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,17 +9,17 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "15biyr422s5f2csw395fz9cikir9wffdwqq8y0i6ayzpymzsqbzs"; + sha256 = "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z"; }; nativeBuildInputs = [ - meson ninja pkgconfig + meson ninja pkgconfig scdoc ]; buildInputs = with stdenv.lib; From 38aa8faa3061d0e515dc181225cc39c250416313 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 29 Aug 2019 13:30:59 +0200 Subject: [PATCH 137/283] maintainers: update rnhmjoj information --- maintainers/maintainer-list.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 397e15c3f06..ed2ce773983 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5340,10 +5340,16 @@ name = "Richard Lupton"; }; rnhmjoj = { - email = "micheleguerinirocco@me.com"; + email = "rnhmjoj@inventati.org"; github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; + keys = + [ + { longkeyid = "ed25519/0xBFBAF4C975F76450"; + fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; + } + ]; }; rob = { email = "rob.vermaas@gmail.com"; From dc18715e76031a99510ba8bb0dd0dd32363b3392 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 29 Aug 2019 13:31:23 +0200 Subject: [PATCH 138/283] rxvt_unicode: add rnhmjoj as maintainer --- pkgs/applications/misc/rxvt_unicode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 053eaf6e54c..17cea90ac27 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (rec { inherit description; homepage = http://software.schmorp.de/pkg/rxvt-unicode.html; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = [ ]; + maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; license = licenses.gpl3; }; From 72682e46546d6d024a29e2fde009372e03b45b9f Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 28 Aug 2019 10:37:52 -0700 Subject: [PATCH 139/283] tree: rename altcoins to blockchains Signed-off-by: William Casarin --- .../aeon/default.nix | 0 .../{altcoins => blockchains}/bitcoin-abc.nix | 0 .../bitcoin-classic.nix | 0 .../bitcoin-unlimited.nix | 0 .../{altcoins => blockchains}/bitcoin.nix | 0 .../{altcoins => blockchains}/btc1.nix | 0 .../{altcoins => blockchains}/clightning.nix | 0 .../cryptop/default.nix | 0 .../{altcoins => blockchains}/dashpay.nix | 0 .../{altcoins => blockchains}/dcrd.nix | 0 .../{altcoins => blockchains}/dcrwallet.nix | 0 .../{altcoins => blockchains}/default.nix | 0 .../{altcoins => blockchains}/dero.nix | 0 .../{altcoins => blockchains}/dogecoin.nix | 0 .../{altcoins => blockchains}/ethabi.nix | 0 .../exodus/default.nix | 0 .../fix-bitcoin-qt-build.patch | 0 .../{altcoins => blockchains}/freicoin.nix | 0 .../go-ethereum-classic/default.nix | 0 .../go-ethereum-classic/deps.nix | 0 .../{altcoins => blockchains}/go-ethereum.nix | 0 .../jormungandr/default.nix | 0 .../ledger-live-desktop/default.nix | 0 .../{altcoins => blockchains}/litecoin.nix | 0 .../{altcoins => blockchains}/lnd.nix | 0 .../{altcoins => blockchains}/masari.nix | 0 .../{altcoins => blockchains}/mist.nix | 0 .../monero-gui/default.nix | 0 .../monero-gui/move-log-file.patch | 0 .../monero/default.nix | 0 .../{altcoins => blockchains}/namecoin.nix | 0 .../nano-wallet/CMakeLists.txt.patch | 0 .../nano-wallet/default.nix | 0 .../parity-ui/default.nix | 0 .../parity-ui/env.nix | 0 .../{altcoins => blockchains}/parity/beta.nix | 0 .../parity/default.nix | 0 .../parity/parity.nix | 0 .../particl/particl-core.nix | 0 .../{altcoins => blockchains}/pivx.nix | 0 .../polkadot/default.nix | 0 .../stellar-core-dirty-version.patch | 0 .../stellar-core.nix | 0 .../{altcoins => blockchains}/sumokoin.nix | 0 .../wasabiwallet/default.nix | 0 .../{altcoins => blockchains}/wownero.nix | 0 .../zcash/default.nix | 0 .../zcash/librustzcash/default.nix | 0 pkgs/top-level/all-packages.nix | 35 ++++--------------- 49 files changed, 7 insertions(+), 28 deletions(-) rename pkgs/applications/{altcoins => blockchains}/aeon/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin-abc.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin-classic.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin-unlimited.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/btc1.nix (100%) rename pkgs/applications/{altcoins => blockchains}/clightning.nix (100%) rename pkgs/applications/{altcoins => blockchains}/cryptop/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dashpay.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dcrd.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dcrwallet.nix (100%) rename pkgs/applications/{altcoins => blockchains}/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dero.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dogecoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/ethabi.nix (100%) rename pkgs/applications/{altcoins => blockchains}/exodus/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/fix-bitcoin-qt-build.patch (100%) rename pkgs/applications/{altcoins => blockchains}/freicoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/go-ethereum-classic/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/go-ethereum-classic/deps.nix (100%) rename pkgs/applications/{altcoins => blockchains}/go-ethereum.nix (100%) rename pkgs/applications/{altcoins => blockchains}/jormungandr/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/ledger-live-desktop/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/litecoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/lnd.nix (100%) rename pkgs/applications/{altcoins => blockchains}/masari.nix (100%) rename pkgs/applications/{altcoins => blockchains}/mist.nix (100%) rename pkgs/applications/{altcoins => blockchains}/monero-gui/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/monero-gui/move-log-file.patch (100%) rename pkgs/applications/{altcoins => blockchains}/monero/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/namecoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/nano-wallet/CMakeLists.txt.patch (100%) rename pkgs/applications/{altcoins => blockchains}/nano-wallet/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity-ui/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity-ui/env.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity/beta.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity/parity.nix (100%) rename pkgs/applications/{altcoins => blockchains}/particl/particl-core.nix (100%) rename pkgs/applications/{altcoins => blockchains}/pivx.nix (100%) rename pkgs/applications/{altcoins => blockchains}/polkadot/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/stellar-core-dirty-version.patch (100%) rename pkgs/applications/{altcoins => blockchains}/stellar-core.nix (100%) rename pkgs/applications/{altcoins => blockchains}/sumokoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/wasabiwallet/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/wownero.nix (100%) rename pkgs/applications/{altcoins => blockchains}/zcash/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/zcash/librustzcash/default.nix (100%) diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix similarity index 100% rename from pkgs/applications/altcoins/aeon/default.nix rename to pkgs/applications/blockchains/aeon/default.nix diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin-abc.nix rename to pkgs/applications/blockchains/bitcoin-abc.nix diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin-classic.nix rename to pkgs/applications/blockchains/bitcoin-classic.nix diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin-unlimited.nix rename to pkgs/applications/blockchains/bitcoin-unlimited.nix diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin.nix rename to pkgs/applications/blockchains/bitcoin.nix diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/blockchains/btc1.nix similarity index 100% rename from pkgs/applications/altcoins/btc1.nix rename to pkgs/applications/blockchains/btc1.nix diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/blockchains/clightning.nix similarity index 100% rename from pkgs/applications/altcoins/clightning.nix rename to pkgs/applications/blockchains/clightning.nix diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix similarity index 100% rename from pkgs/applications/altcoins/cryptop/default.nix rename to pkgs/applications/blockchains/cryptop/default.nix diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix similarity index 100% rename from pkgs/applications/altcoins/dashpay.nix rename to pkgs/applications/blockchains/dashpay.nix diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix similarity index 100% rename from pkgs/applications/altcoins/dcrd.nix rename to pkgs/applications/blockchains/dcrd.nix diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix similarity index 100% rename from pkgs/applications/altcoins/dcrwallet.nix rename to pkgs/applications/blockchains/dcrwallet.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/blockchains/default.nix similarity index 100% rename from pkgs/applications/altcoins/default.nix rename to pkgs/applications/blockchains/default.nix diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/blockchains/dero.nix similarity index 100% rename from pkgs/applications/altcoins/dero.nix rename to pkgs/applications/blockchains/dero.nix diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix similarity index 100% rename from pkgs/applications/altcoins/dogecoin.nix rename to pkgs/applications/blockchains/dogecoin.nix diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix similarity index 100% rename from pkgs/applications/altcoins/ethabi.nix rename to pkgs/applications/blockchains/ethabi.nix diff --git a/pkgs/applications/altcoins/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix similarity index 100% rename from pkgs/applications/altcoins/exodus/default.nix rename to pkgs/applications/blockchains/exodus/default.nix diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch similarity index 100% rename from pkgs/applications/altcoins/fix-bitcoin-qt-build.patch rename to pkgs/applications/blockchains/fix-bitcoin-qt-build.patch diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix similarity index 100% rename from pkgs/applications/altcoins/freicoin.nix rename to pkgs/applications/blockchains/freicoin.nix diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/blockchains/go-ethereum-classic/default.nix similarity index 100% rename from pkgs/applications/altcoins/go-ethereum-classic/default.nix rename to pkgs/applications/blockchains/go-ethereum-classic/default.nix diff --git a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/pkgs/applications/blockchains/go-ethereum-classic/deps.nix similarity index 100% rename from pkgs/applications/altcoins/go-ethereum-classic/deps.nix rename to pkgs/applications/blockchains/go-ethereum-classic/deps.nix diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix similarity index 100% rename from pkgs/applications/altcoins/go-ethereum.nix rename to pkgs/applications/blockchains/go-ethereum.nix diff --git a/pkgs/applications/altcoins/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix similarity index 100% rename from pkgs/applications/altcoins/jormungandr/default.nix rename to pkgs/applications/blockchains/jormungandr/default.nix diff --git a/pkgs/applications/altcoins/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix similarity index 100% rename from pkgs/applications/altcoins/ledger-live-desktop/default.nix rename to pkgs/applications/blockchains/ledger-live-desktop/default.nix diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix similarity index 100% rename from pkgs/applications/altcoins/litecoin.nix rename to pkgs/applications/blockchains/litecoin.nix diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/blockchains/lnd.nix similarity index 100% rename from pkgs/applications/altcoins/lnd.nix rename to pkgs/applications/blockchains/lnd.nix diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/blockchains/masari.nix similarity index 100% rename from pkgs/applications/altcoins/masari.nix rename to pkgs/applications/blockchains/masari.nix diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/blockchains/mist.nix similarity index 100% rename from pkgs/applications/altcoins/mist.nix rename to pkgs/applications/blockchains/mist.nix diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix similarity index 100% rename from pkgs/applications/altcoins/monero-gui/default.nix rename to pkgs/applications/blockchains/monero-gui/default.nix diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/blockchains/monero-gui/move-log-file.patch similarity index 100% rename from pkgs/applications/altcoins/monero-gui/move-log-file.patch rename to pkgs/applications/blockchains/monero-gui/move-log-file.patch diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix similarity index 100% rename from pkgs/applications/altcoins/monero/default.nix rename to pkgs/applications/blockchains/monero/default.nix diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix similarity index 100% rename from pkgs/applications/altcoins/namecoin.nix rename to pkgs/applications/blockchains/namecoin.nix diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch similarity index 100% rename from pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch rename to pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix similarity index 100% rename from pkgs/applications/altcoins/nano-wallet/default.nix rename to pkgs/applications/blockchains/nano-wallet/default.nix diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix similarity index 100% rename from pkgs/applications/altcoins/parity-ui/default.nix rename to pkgs/applications/blockchains/parity-ui/default.nix diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/blockchains/parity-ui/env.nix similarity index 100% rename from pkgs/applications/altcoins/parity-ui/env.nix rename to pkgs/applications/blockchains/parity-ui/env.nix diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix similarity index 100% rename from pkgs/applications/altcoins/parity/beta.nix rename to pkgs/applications/blockchains/parity/beta.nix diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix similarity index 100% rename from pkgs/applications/altcoins/parity/default.nix rename to pkgs/applications/blockchains/parity/default.nix diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix similarity index 100% rename from pkgs/applications/altcoins/parity/parity.nix rename to pkgs/applications/blockchains/parity/parity.nix diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix similarity index 100% rename from pkgs/applications/altcoins/particl/particl-core.nix rename to pkgs/applications/blockchains/particl/particl-core.nix diff --git a/pkgs/applications/altcoins/pivx.nix b/pkgs/applications/blockchains/pivx.nix similarity index 100% rename from pkgs/applications/altcoins/pivx.nix rename to pkgs/applications/blockchains/pivx.nix diff --git a/pkgs/applications/altcoins/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix similarity index 100% rename from pkgs/applications/altcoins/polkadot/default.nix rename to pkgs/applications/blockchains/polkadot/default.nix diff --git a/pkgs/applications/altcoins/stellar-core-dirty-version.patch b/pkgs/applications/blockchains/stellar-core-dirty-version.patch similarity index 100% rename from pkgs/applications/altcoins/stellar-core-dirty-version.patch rename to pkgs/applications/blockchains/stellar-core-dirty-version.patch diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix similarity index 100% rename from pkgs/applications/altcoins/stellar-core.nix rename to pkgs/applications/blockchains/stellar-core.nix diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix similarity index 100% rename from pkgs/applications/altcoins/sumokoin.nix rename to pkgs/applications/blockchains/sumokoin.nix diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix similarity index 100% rename from pkgs/applications/altcoins/wasabiwallet/default.nix rename to pkgs/applications/blockchains/wasabiwallet/default.nix diff --git a/pkgs/applications/altcoins/wownero.nix b/pkgs/applications/blockchains/wownero.nix similarity index 100% rename from pkgs/applications/altcoins/wownero.nix rename to pkgs/applications/blockchains/wownero.nix diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix similarity index 100% rename from pkgs/applications/altcoins/zcash/default.nix rename to pkgs/applications/blockchains/zcash/default.nix diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix similarity index 100% rename from pkgs/applications/altcoins/zcash/librustzcash/default.nix rename to pkgs/applications/blockchains/zcash/librustzcash/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c35347800..43fd7a32d4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2975,7 +2975,7 @@ in exiftool = perlPackages.ImageExifTool; - exodus = callPackage ../applications/altcoins/exodus { }; + exodus = callPackage ../applications/blockchains/exodus { }; ext4magic = callPackage ../tools/filesystems/ext4magic { }; @@ -4480,7 +4480,7 @@ in leatherman = callPackage ../development/libraries/leatherman { }; - ledger-live-desktop = callPackage ../applications/altcoins/ledger-live-desktop { }; + ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; ledmon = callPackage ../tools/system/ledmon { }; @@ -4906,7 +4906,7 @@ in namazu = callPackage ../tools/text/namazu { }; - nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { }; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; nasty = callPackage ../tools/security/nasty { }; @@ -6808,7 +6808,7 @@ in wal_e = callPackage ../tools/backup/wal-e { }; - wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; + wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -17355,14 +17355,6 @@ in schismtracker = callPackage ../applications/audio/schismtracker { }; - altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); - - bitcoin = altcoins.bitcoin; - clightning = altcoins.clightning; - lnd = altcoins.lnd; - - cryptop = altcoins.cryptop; - jnetmap = callPackage ../applications/networking/jnetmap {}; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { @@ -17375,19 +17367,6 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = res.altcoins.go-ethereum; - ethabi = res.altcoins.ethabi; - - parity = res.altcoins.parity; - parity-beta = res.altcoins.parity-beta; - parity-ui = res.altcoins.parity-ui; - - polkadot = res.altcoins.polkadot; - - stellar-core = res.altcoins.stellar-core; - - particl-core = res.altcoins.particl-core; - aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -19109,7 +19088,7 @@ in josm = callPackage ../applications/misc/josm { }; - jormungandr = callPackage ../applications/altcoins/jormungandr { }; + jormungandr = callPackage ../applications/blockchains/jormungandr { }; jbrout = callPackage ../applications/graphics/jbrout { }; @@ -19557,11 +19536,11 @@ in mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/altcoins/monero { + monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; }; - monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost16x; }; From 8d6cb26e41287f986ea86a95d487f2c0546d27df Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 28 Aug 2019 10:48:13 -0700 Subject: [PATCH 140/283] all-packages: add blockchains section Signed-off-by: William Casarin --- pkgs/top-level/all-packages.nix | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43fd7a32d4b..2b4eaa2c7fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21792,6 +21792,94 @@ in zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS + + aeon = callPackage ../applications/blockchains/aeon { }; + + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; + + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; + bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = false; }; + + bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = true; + }; + bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = false; + }; + + bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; + + btc1 = callPackage ../applications/blockchains/btc1.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + boost = boost165; + }; + btc1d = btc1.override { withGui = false; }; + + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + + dashpay = callPackage ../applications/blockchains/dashpay.nix { }; + + dcrd = callPackage ../applications/blockchains/dcrd.nix { }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { }; + + dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; + + dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; + dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + + + freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; + go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic { + buildGoPackage = buildGo110Package; + }; + + litecoin = callPackage ../applications/blockchains/litecoin.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + litecoind = litecoin.override { withGui = false; }; + + lnd = callPackage ../applications/blockchains/lnd.nix { }; + + masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; + + mist = callPackage ../applications/blockchains/mist.nix { }; + + namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; + namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; + + pivx = libsForQt59.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + + ethabi = callPackage ../applications/blockchains/ethabi.nix { }; + + stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; + + sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + + wownero = callPackage ../applications/blockchains/wownero.nix {}; + + zcash = callPackage ../applications/blockchains/zcash { + withGui = false; + }; + + parity = callPackage ../applications/blockchains/parity { }; + parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; + parity-ui = callPackage ../applications/blockchains/parity-ui { }; + + polkadot = callPackage ../applications/blockchains/polkadot { }; + + particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; From 04ef817479dfcef0a3a1453dc8ed0fe648d4e9d5 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 28 Aug 2019 10:49:04 -0700 Subject: [PATCH 141/283] blockchains: remove default.nix This is no longer needed Signed-off-by: William Casarin --- pkgs/applications/blockchains/default.nix | 90 ----------------------- 1 file changed, 90 deletions(-) delete mode 100644 pkgs/applications/blockchains/default.nix diff --git a/pkgs/applications/blockchains/default.nix b/pkgs/applications/blockchains/default.nix deleted file mode 100644 index 5b5bfb897cf..00000000000 --- a/pkgs/applications/blockchains/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ callPackage, boost155, boost165, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: - -rec { - - aeon = callPackage ./aeon { }; - - bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; - clightning = callPackage ./clightning.nix { }; - - bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; - bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; - - bitcoin-unlimited = libsForQt5.callPackage ./bitcoin-unlimited.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = true; - }; - bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = false; - }; - - bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - - btc1 = callPackage ./btc1.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - boost = boost165; - }; - btc1d = btc1.override { withGui = false; }; - - cryptop = python3.pkgs.callPackage ./cryptop { }; - - dashpay = callPackage ./dashpay.nix { }; - - dcrd = callPackage ./dcrd.nix { }; - dcrwallet = callPackage ./dcrwallet.nix { }; - - dero = callPackage ./dero.nix { boost = boost165; }; - - dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; }; - dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; }; - - - freicoin = callPackage ./freicoin.nix { boost = boost155; }; - go-ethereum = callPackage ./go-ethereum.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - go-ethereum-classic = callPackage ./go-ethereum-classic { - buildGoPackage = buildGo110Package; - }; - - litecoin = callPackage ./litecoin.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - litecoind = litecoin.override { withGui = false; }; - - lnd = callPackage ./lnd.nix { }; - - masari = callPackage ./masari.nix { boost = boost165; }; - - mist = callPackage ./mist.nix { }; - - namecoin = callPackage ./namecoin.nix { withGui = true; }; - namecoind = callPackage ./namecoin.nix { withGui = false; }; - - pivx = libsForQt59.callPackage ./pivx.nix { withGui = true; }; - pivxd = callPackage ./pivx.nix { withGui = false; }; - - ethabi = callPackage ./ethabi.nix { }; - - stellar-core = callPackage ./stellar-core.nix { }; - - sumokoin = callPackage ./sumokoin.nix { boost = boost165; }; - - wownero = callPackage ./wownero.nix {}; - - zcash = callPackage ./zcash { - withGui = false; - }; - - parity = callPackage ./parity { }; - parity-beta = callPackage ./parity/beta.nix { }; - parity-ui = callPackage ./parity-ui { }; - - polkadot = callPackage ./polkadot { }; - - particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; }; -} From 8f4216bd97a415df932ea74a9361dd991e635101 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Thu, 29 Aug 2019 05:05:24 -0700 Subject: [PATCH 142/283] move wallet software into the blockchains section --- pkgs/top-level/all-packages.nix | 35 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b4eaa2c7fb..215f72c7a20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2975,8 +2975,6 @@ in exiftool = perlPackages.ImageExifTool; - exodus = callPackage ../applications/blockchains/exodus { }; - ext4magic = callPackage ../tools/filesystems/ext4magic { }; extract_url = callPackage ../applications/misc/extract_url { }; @@ -4480,8 +4478,6 @@ in leatherman = callPackage ../development/libraries/leatherman { }; - ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - ledmon = callPackage ../tools/system/ledmon { }; leela = callPackage ../tools/graphics/leela { }; @@ -4906,8 +4902,6 @@ in namazu = callPackage ../tools/text/namazu { }; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; - nasty = callPackage ../tools/security/nasty { }; nat-traverse = callPackage ../tools/networking/nat-traverse { }; @@ -6808,8 +6802,6 @@ in wal_e = callPackage ../tools/backup/wal-e { }; - wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; - watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -19088,8 +19080,6 @@ in josm = callPackage ../applications/misc/josm { }; - jormungandr = callPackage ../applications/blockchains/jormungandr { }; - jbrout = callPackage ../applications/graphics/jbrout { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -19536,14 +19526,6 @@ in mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/blockchains/monero { - inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - }; - - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost16x; - }; - xmr-stak = callPackage ../applications/misc/xmr-stak { stdenvGcc6 = gcc6Stdenv; }; @@ -21833,6 +21815,7 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + exodus = callPackage ../applications/blockchains/exodus { }; freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { @@ -21843,6 +21826,10 @@ in buildGoPackage = buildGo110Package; }; + jormungandr = callPackage ../applications/blockchains/jormungandr { }; + + ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; + litecoin = callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -21850,10 +21837,20 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { }; + monero = callPackage ../applications/blockchains/monero { + inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + }; + + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { + boost = boost16x; + }; + masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; mist = callPackage ../applications/blockchains/mist.nix { }; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; + namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; @@ -21866,6 +21863,8 @@ in sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; + wownero = callPackage ../applications/blockchains/wownero.nix {}; zcash = callPackage ../applications/blockchains/zcash { From 17e833d8e5c766b2398dfd7c09a880d84a8bfa5c Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 29 Aug 2019 20:08:20 +0800 Subject: [PATCH 143/283] cargo-bloat: 0.8.2 -> 0.8.3 --- pkgs/development/tools/rust/cargo-bloat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index e7c8e869c87..b5c6f19ddc3 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "1r8d3mqzaiasvhxmry8va55ggq817y82x8yb3vzih84lxq134y8n"; + sha256 = "088px2kdcfjdb8zfmk7g409h7ij9dngywz336hj2ny82lrdjzazc"; }; - cargoSha256 = "1ys3wd1k39vkll25c56sfv767rcd53yb46adwgzdkkyl2pjphf1r"; + cargoSha256 = "11q8j8y7m59gc8047qhz6pp2825qjcpg9xwgj09l8a5aijf25avb"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; From 066bd13613b1ce70b439608c4ee1c91150bfa2f6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 20 Aug 2019 20:49:10 +0300 Subject: [PATCH 144/283] libvirt-glib: remove unused packages --- .../libraries/libvirt-glib/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 9dd89133f4b..1803ce1dc20 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,12 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl -, libapparmor, vala -, xenSupport ? false, xen ? null +{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala +, libcap_ng, libvirt, libxml2 }: -let - inherit (pythonPackages) python pygobject2; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libvirt-glib-2.0.0"; outputs = [ "out" "dev" ]; @@ -16,15 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l"; }; - nativeBuildInputs = [ pkgconfig vala ]; - buildInputs = [ - libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobject-introspection libcap_ng numactl libapparmor - ] ++ stdenv.lib.optionals xenSupport [ - xen - ]; + nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; enableParallelBuilding = true; + strictDeps = true; meta = with stdenv.lib; { description = "Library for working with virtual machines"; @@ -36,7 +28,7 @@ in stdenv.mkDerivation rec { - libvirt-gconfig - GObjects for manipulating libvirt XML documents - libvirt-gobject - GObjects for managing libvirt objects ''; - homepage = http://libvirt.org/; + homepage = https://libvirt.org/; license = licenses.lgpl2Plus; platforms = platforms.linux; }; From 4471efd9e0881273f01d9d96ca30bc9e316994e5 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 20 Aug 2019 21:48:38 +0300 Subject: [PATCH 145/283] virt-viewer: remove unused packages --- .../virtualization/virt-viewer/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index eb5d53c2b89..3d058903200 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,10 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl -, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl -, libapparmor, gst_all_1 +{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook +, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null -, xenSupport ? false, xen ? null }: assert spiceSupport -> @@ -22,13 +19,9 @@ stdenv.mkDerivation rec { sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; buildInputs = [ - glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info - libvirt yajl gsettings-desktop-schemas libvirt-glib - libcap_ng numactl libapparmor - ] ++ optionals xenSupport [ - xen + glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm ]; @@ -36,6 +29,9 @@ stdenv.mkDerivation rec { # Required for USB redirection PolicyKit rules file propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + strictDeps = true; + enableParallelBuilding = true; + meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; From 4b5fc2cfae20913472aceb0a08bda11c93d63578 Mon Sep 17 00:00:00 2001 From: Vika Date: Thu, 29 Aug 2019 17:12:06 +0300 Subject: [PATCH 146/283] redis: Try to fix cross-compilation **Note**: This makes redis use libc malloc when cross-compiling to ARM. This may or may not degrade performance. The reason for this is vendored jemalloc with Redis' patches. The makefile for deps has hardcoded configure flags for jemalloc, and as a result, it is unable to cross-compile it. --- pkgs/servers/nosql/redis/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 20a6321e0a8..118edb60156 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lua }: +{ stdenv, fetchurl, lua, jemalloc }: stdenv.mkDerivation rec { version = "5.0.5"; @@ -9,8 +9,21 @@ stdenv.mkDerivation rec { sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91"; }; + # Cross-compiling fixes + configurePhase = '' + ${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + # This fixes hiredis, which has the AR awkwardly coded. + # Probably a good candidate for a patch upstream. + makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)') + ''} + ''; + buildInputs = [ lua ]; - makeFlags = "PREFIX=$(out)"; + # More cross-compiling fixes. + # Note: this enables libc malloc as a temporary fix for cross-compiling. + # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. + # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! + makeFlags = "PREFIX=$(out)" + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " AR=${stdenv.cc.targetPrefix}ar RANLIB=${stdenv.cc.targetPrefix}ranlib MALLOC=libc"; enableParallelBuilding = true; From abd1172a6fba7669de9487003e2de6d88b12b016 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 29 Aug 2019 10:19:55 -0400 Subject: [PATCH 147/283] emacs: 26.2 -> 26.3; emacs-mac: 26.2-7.6 -> 26.3-7.7 --- pkgs/applications/editors/emacs/default.nix | 4 ++-- pkgs/applications/editors/emacs/macport.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4c95681c43d..29a6a8773ef 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "26.2"; + version = "26.3"; versionModifier = ""; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; + sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index d51391595f4..649997171e9 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,19 +4,19 @@ }: stdenv.mkDerivation rec { - emacsVersion = "26.2"; + emacsVersion = "26.3"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "7.6"; + macportVersion = "7.7"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; + sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61"; + sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j"; }; hiresSrc = fetchurl { From 604b7c139f4d44d9fb0e84d812efdfcf5dda3448 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Thu, 29 Aug 2019 16:32:59 +0200 Subject: [PATCH 148/283] Fix letsencrypt (#60219) * nixos/acme: Fix ordering of cert requests When subsequent certificates would be added, they would not wake up nginx correctly due to target units only being triggered once. We now added more fine-grained systemd dependencies to make sure nginx always is aware of new certificates and doesn't restart too early resulting in a crash. Furthermore, the acme module has been refactored. Mostly to get rid of the deprecated PermissionStartOnly systemd options which were deprecated. Below is a summary of changes made. * Use SERVICE_RESULT to determine status This was added in systemd v232. we don't have to keep track of the EXITCODE ourselves anymore. * Add regression test for requesting mutliple domains * Deprecate 'directory' option We now use systemd's StateDirectory option to manage create and permissions of the acme state directory. * The webroot is created using a systemd.tmpfiles.rules rule instead of the preStart script. * Depend on certs directly By getting rid of the target units, we make sure ordering is correct in the case that you add new certs after already having deployed some. Reason it broke before: acme-certificates.target would be in active state, and if you then add a new cert, it would still be active and hence nginx would restart without even requesting a new cert. Not good! We make the dependencies more fine-grained now. this should fix that * Remove activationDelay option It complicated the code a lot, and is rather arbitrary. What if your activation script takes more than activationDelay seconds? Instead, one should use systemd dependencies to make sure some action happens before setting the certificate live. e.g. If you want to wait until your cert is published in DNS DANE / TLSA, you could create a unit that blocks until it appears in DNS: ``` RequiredBy=acme-${cert}.service After=acme-${cert}.service ExecStart=publish-wait-for-dns-script ``` --- nixos/doc/manual/release-notes/rl-1909.xml | 23 ++- nixos/modules/rename.nix | 5 + nixos/modules/security/acme.nix | 152 ++++-------------- nixos/modules/security/acme.xml | 4 +- .../services/web-servers/nginx/default.nix | 21 +-- nixos/tests/acme.nix | 98 +++++++++-- 6 files changed, 161 insertions(+), 142 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 36bea28530b..60f756b78c6 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -318,7 +318,28 @@ services.strongswan-swanctl services.httpd - + + + + The option has been replaced by a read-only option for each certificate you define. This will be + a subdirectory of /var/lib/acme. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example, + the option will use this directory option to find the certs for the virtual host. + + + and options have been removed. To execute a service before certificates + are provisioned or renewed add a RequiredBy=acme-${cert}.service to any service. + + + Furthermore, the acme module will not automatically add a dependency on lighttpd.service anymore. If you are using certficates provided by letsencrypt + for lighttpd, then you should depend on the certificate service acme-${cert}.service> manually. + + + For nginx, the dependencies are still automatically managed when is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, + instead of depending on the catch-all acme-certificates.target. This target unit was also removed from the codebase. + This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal + ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at + NixOS/nixpkgs#60180. + diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 348ad094e5a..1048c2af2ea 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -256,6 +256,11 @@ with lib; # binfmt (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ]) + + # ACME + (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") + (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") # KSM (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ]) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 092704c6fc3..feb54affbf8 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -80,25 +80,11 @@ let ''; }; - activationDelay = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Systemd time span expression to delay copying new certificates to main - state directory. See systemd.time - 7. - ''; - }; - - preDelay = mkOption { - type = types.lines; - default = ""; - description = '' - Commands to run after certificates are re-issued but before they are - activated. Typically the new certificate is published to DNS. - - Executed in the same directory with the new certificate. - ''; + directory = mkOption { + type = types.str; + readOnly = true; + default = "/var/lib/acme/${name}"; + description = "Directory where certificate and other state is stored."; }; extraDomains = mkOption { @@ -126,13 +112,6 @@ in options = { security.acme = { - directory = mkOption { - default = "/var/lib/acme"; - type = types.str; - description = '' - Directory where certs and other state will be stored by default. - ''; - }; validMin = mkOption { type = types.int; @@ -181,7 +160,11 @@ in default = { }; type = with types; attrsOf (submodule certOpts); description = '' - Attribute set of certificates to get signed and renewed. + Attribute set of certificates to get signed and renewed. Creates + acme-''${cert}.{service,timer} systemd units for + each certificate defined here. Other services can add dependencies + to those units if they rely on the certificates being present, + or trigger restarts of the service if certificates get renewed. ''; example = literalExample '' { @@ -209,8 +192,7 @@ in servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let - cpath = lpath + optionalString (data.activationDelay != null) ".staging"; - lpath = "${cfg.directory}/${cert}"; + lpath = "acme/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] @@ -224,79 +206,27 @@ in serviceConfig = { Type = "oneshot"; SuccessExitStatus = [ "0" "1" ]; - PermissionsStartOnly = true; User = data.user; Group = data.group; PrivateTmp = true; + StateDirectory = lpath; + StateDirectoryMode = rights; + WorkingDirectory = "/var/lib/${lpath}"; + ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}"; + ExecStopPost = + let + script = pkgs.writeScript "acme-post-stop" '' + #!${pkgs.runtimeShell} -e + ${data.postRun} + ''; + in + "+${script}"; }; - path = with pkgs; [ simp_le systemd ]; - preStart = '' - mkdir -p '${cfg.directory}' - chown 'root:root' '${cfg.directory}' - chmod 755 '${cfg.directory}' - if [ ! -d '${cpath}' ]; then - mkdir '${cpath}' - fi - chmod ${rights} '${cpath}' - chown -R '${data.user}:${data.group}' '${cpath}' - mkdir -p '${data.webroot}/.well-known/acme-challenge' - chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge' - ''; - script = '' - cd '${cpath}' - set +e - simp_le ${escapeShellArgs cmdline} - EXITCODE=$? - set -e - echo "$EXITCODE" > /tmp/lastExitCode - exit "$EXITCODE" - ''; - postStop = '' - cd '${cpath}' - if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then - ${if data.activationDelay != null then '' - - ${data.preDelay} - - if [ -d '${lpath}' ]; then - systemd-run --no-block --on-active='${data.activationDelay}' --unit acme-setlive-${cert}.service - else - systemctl --wait start acme-setlive-${cert}.service - fi - '' else data.postRun} - - # noop ensuring that the "if" block is non-empty even if - # activationDelay == null and postRun == "" - true - fi - ''; - - before = [ "acme-certificates.target" ]; - wantedBy = [ "acme-certificates.target" ]; - }; - delayService = { - description = "Set certificate for ${cert} live"; - path = with pkgs; [ rsync ]; - serviceConfig = { - Type = "oneshot"; - }; - script = '' - rsync -a --delete-after '${cpath}/' '${lpath}' - ''; - postStop = data.postRun; }; selfsignedService = { description = "Create preliminary self-signed certificate for ${cert}"; path = [ pkgs.openssl ]; - preStart = '' - if [ ! -d '${cpath}' ] - then - mkdir -p '${cpath}' - chmod ${rights} '${cpath}' - chown '${data.user}:${data.group}' '${cpath}' - fi - ''; script = '' workdir="$(mktemp -d)" @@ -318,50 +248,41 @@ in -out $workdir/server.crt # Copy key to destination - cp $workdir/server.key ${cpath}/key.pem + cp $workdir/server.key /var/lib/${lpath}/key.pem # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates) - cat $workdir/{server.crt,ca.crt} > "${cpath}/fullchain.pem" + cat $workdir/{server.crt,ca.crt} > "/var/lib/${lpath}/fullchain.pem" # Create full.pem for e.g. lighttpd - cat $workdir/{server.key,server.crt,ca.crt} > "${cpath}/full.pem" + cat $workdir/{server.key,server.crt,ca.crt} > "/var/lib/${lpath}/full.pem" # Give key acme permissions - chown '${data.user}:${data.group}' "${cpath}/"{key,fullchain,full}.pem - chmod ${rights} "${cpath}/"{key,fullchain,full}.pem + chown '${data.user}:${data.group}' "/var/lib/${lpath}/"{key,fullchain,full}.pem + chmod ${rights} "/var/lib/${lpath}/"{key,fullchain,full}.pem ''; serviceConfig = { Type = "oneshot"; - PermissionsStartOnly = true; PrivateTmp = true; + StateDirectory = lpath; User = data.user; Group = data.group; }; unitConfig = { # Do not create self-signed key when key already exists - ConditionPathExists = "!${cpath}/key.pem"; + ConditionPathExists = "!/var/lib/${lpath}/key.pem"; }; - before = [ - "acme-selfsigned-certificates.target" - ]; - wantedBy = [ - "acme-selfsigned-certificates.target" - ]; }; in ( [ { name = "acme-${cert}"; value = acmeService; } ] ++ optional cfg.preliminarySelfsigned { name = "acme-selfsigned-${cert}"; value = selfsignedService; } - ++ optional (data.activationDelay != null) { name = "acme-setlive-${cert}"; value = delayService; } ); servicesAttr = listToAttrs services; - injectServiceDep = { - after = [ "acme-selfsigned-certificates.target" ]; - wants = [ "acme-selfsigned-certificates.target" "acme-certificates.target" ]; - }; in - servicesAttr // - (if config.services.nginx.enable then { nginx = injectServiceDep; } else {}) // - (if config.services.lighttpd.enable then { lighttpd = injectServiceDep; } else {}); + servicesAttr; + + systemd.tmpfiles.rules = + flip mapAttrsToList cfg.certs + (cert: data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}"); systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair ("acme-${cert}") @@ -377,9 +298,6 @@ in }; }) ); - - systemd.targets."acme-selfsigned-certificates" = mkIf cfg.preliminarySelfsigned {}; - systemd.targets."acme-certificates" = {}; }) ]; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index ef71fe53d0c..9d0a1995e0f 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -59,10 +59,8 @@ http { The private key key.pem and certificate fullchain.pem will be put into - /var/lib/acme/foo.example.com. The target directory can - be configured with the option . + /var/lib/acme/foo.example.com. - Refer to for all available configuration options for the security.acme diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c1a51fbf8b4..5c65a2388d6 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -4,23 +4,25 @@ with lib; let cfg = config.services.nginx; + certs = config.security.acme.certs; + vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; + acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs; virtualHosts = mapAttrs (vhostName: vhostConfig: let serverName = if vhostConfig.serverName != null then vhostConfig.serverName else vhostName; - acmeDirectory = config.security.acme.directory; in vhostConfig // { inherit serverName; } // (optionalAttrs vhostConfig.enableACME { - sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem"; - sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem"; - sslTrustedCertificate = "${acmeDirectory}/${serverName}/fullchain.pem"; + sslCertificate = "${certs.${serverName}.directory}/fullchain.pem"; + sslCertificateKey = "${certs.${serverName}.directory}/key.pem"; + sslTrustedCertificate = "${certs.${serverName}.directory}/full.pem"; }) // (optionalAttrs (vhostConfig.useACMEHost != null) { - sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem"; - sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem"; - sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem"; + sslCertificate = "${certs.${vhostConfig.useACMEHost}.directory}/fullchain.pem"; + sslCertificateKey = "${certs.${vhostConfig.useACMEHost}.directory}/key.pem"; + sslTrustedCertificate = "${certs.${vhostConfig.useACMEHost}.directory}/fullchain.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; @@ -646,8 +648,9 @@ in systemd.services.nginx = { description = "Nginx Web Server"; - after = [ "network.target" ]; 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; stopIfChanged = false; preStart = '' @@ -680,8 +683,6 @@ in security.acme.certs = filterAttrs (n: v: v != {}) ( let - vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; - acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs; acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = { user = cfg.user; group = lib.mkDefault cfg.group; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 4669a092433..8cfdea4a16e 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -3,19 +3,49 @@ let in import ./make-test.nix { name = "acme"; - nodes = { + nodes = rec { letsencrypt = ./common/letsencrypt; + acmeStandalone = { config, pkgs, ... }: { + imports = [ commonConfig ]; + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.extraHosts = '' + ${config.networking.primaryIPAddress} standalone.com + ''; + security.acme.certs."standalone.com" = { + webroot = "/var/lib/acme/acme-challenges"; + }; + systemd.targets."acme-finished-standalone.com" = {}; + systemd.services."acme-standalone.com" = { + wants = [ "acme-finished-standalone.com.target" ]; + before = [ "acme-finished-standalone.com.target" ]; + }; + services.nginx.enable = true; + services.nginx.virtualHosts."standalone.com" = { + locations."/.well-known/acme-challenge".root = "/var/lib/acme/acme-challenges"; + }; + }; + webserver = { config, pkgs, ... }: { imports = [ commonConfig ]; networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.extraHosts = '' - ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} a.example.com + ${config.networking.primaryIPAddress} b.example.com ''; + # 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.com" = {}; + systemd.services."acme-a.example.com" = { + wants = [ "acme-finished-a.example.com.target" ]; + before = [ "acme-finished-a.example.com.target" ]; + }; + services.nginx.enable = true; - services.nginx.virtualHosts."example.com" = { + + services.nginx.virtualHosts."a.example.com" = { enableACME = true; forceSSL = true; locations."/".root = pkgs.runCommand "docroot" {} '' @@ -23,17 +53,63 @@ in import ./make-test.nix { echo hello world > "$out/index.html" ''; }; + + nesting.clone = [ + ({pkgs, ...}: { + + networking.extraHosts = '' + ${config.networking.primaryIPAddress} b.example.com + ''; + systemd.targets."acme-finished-b.example.com" = {}; + systemd.services."acme-b.example.com" = { + wants = [ "acme-finished-b.example.com.target" ]; + before = [ "acme-finished-b.example.com.target" ]; + }; + services.nginx.virtualHosts."b.example.com" = { + enableACME = true; + forceSSL = true; + locations."/".root = pkgs.runCommand "docroot" {} '' + mkdir -p "$out" + echo hello world > "$out/index.html" + ''; + }; + }) + ]; }; client = commonConfig; }; - testScript = '' - $letsencrypt->waitForUnit("default.target"); - $letsencrypt->waitForUnit("boulder.service"); - $webserver->waitForUnit("default.target"); - $webserver->waitForUnit("acme-certificates.target"); - $client->waitForUnit("default.target"); - $client->succeed('curl https://example.com/ | grep -qF "hello world"'); - ''; + testScript = {nodes, ...}: + let + newServerSystem = nodes.webserver2.config.system.build.toplevel; + switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; + in + # Note, waitForUnit does not work for oneshot services that do not have RemainAfterExit=true, + # this is because a oneshot goes from inactive => activating => inactive, and never + # reaches the active state. To work around this, we create some mock target units which + # get pulled in by the oneshot units. The target units linger after activation, and hence we + # can use them to probe that a oneshot fired. It is a bit ugly, but it is the best we can do + '' + $client->waitForUnit("default.target"); + $letsencrypt->waitForUnit("default.target"); + $letsencrypt->waitForUnit("boulder.service"); + + subtest "can request certificate with HTTPS-01 challenge", sub { + $acmeStandalone->waitForUnit("default.target"); + $acmeStandalone->succeed("systemctl start acme-standalone.com.service"); + $acmeStandalone->waitForUnit("acme-finished-standalone.com.target"); + }; + + subtest "Can request certificate for nginx service", sub { + $webserver->waitForUnit("acme-finished-a.example.com.target"); + $client->succeed('curl https://a.example.com/ | grep -qF "hello world"'); + }; + + subtest "Can add another certificate for nginx service", sub { + $webserver->succeed("/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"); + $webserver->waitForUnit("acme-finished-b.example.com.target"); + $client->succeed('curl https://b.example.com/ | grep -qF "hello world"'); + }; + ''; } From ccc1613a11ee84cd33b8097c90266e2425200377 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 29 Aug 2019 17:05:46 +0200 Subject: [PATCH 149/283] documize-community: 3.1.1 -> 3.2.0 https://github.com/documize/community/releases/tag/v3.2.0 https://github.com/documize/community/releases/tag/v3.1.2 --- pkgs/servers/documize-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index f6ac1924518..317783e4f8f 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1w57akmc3kb8rzgrjv5d4rjfr6vvam1wjs8792265ggnx6xhpgg9"; + sha256 = "13r0x1mbprhk19a1cikq8cl553xdrxin9arw90am69iv6rcps3w3"; }; goPackagePath = "github.com/documize/community"; From c323b0ea59f98edc80e247112ef5c770fe404048 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 29 Aug 2019 17:16:47 +0200 Subject: [PATCH 150/283] grafana: 6.3.3 -> 6.3.4, update url for static source --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 19807c3c2bd..910c8915779 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.3.3"; + version = "6.3.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "006j39n42l91krd1p87dpan1s7dvjjhpidccpxkic189lwg7fbxs"; + sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2"; }; srcStatic = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0n4fkzj3bnq3x08vw18a8lqxjggqsy5l2rgk494i87yaf1pa4gpf"; + url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; + sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8"; }; postPatch = '' From dd7ec2ea97cc6fff5c425f205ed9374c4fca2af6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 29 Aug 2019 17:23:10 +0200 Subject: [PATCH 151/283] =?UTF-8?q?python2Packages.nototools:=202017-09-25?= =?UTF-8?q?=20=E2=86=92=202019-03-20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/noto-fonts/tools.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index a9d45128c5b..376a47434e1 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, pythonPackages, lib }: pythonPackages.buildPythonPackage rec { - version = "2017-09-25"; + version = "unstable-2019-03-20"; name = "nototools-${version}"; src = fetchFromGitHub { - owner = "googlei18n"; + owner = "googlefonts"; repo = "nototools"; - rev = "v2017-09-25-tooling-for-phase3-update"; - sha256 = "03nzvcvwmrhfrcjhg218q2f3hfrm3vlivp4rk19sc397kh3hisiz"; + rev = "9c4375f07c9adc00c700c5d252df6a25d7425870"; + sha256 = "0z9i23vl6xar4kvbqbc8nznq3s690mqc5zfv280l1c02l5n41smc"; }; propagatedBuildInputs = with pythonPackages; [ fonttools numpy ]; @@ -26,6 +26,6 @@ pythonPackages.buildPythonPackage rec { meta = { description = "Noto fonts support tools and scripts plus web site generation"; license = lib.licenses.asl20; - homepage = https://github.com/googlei18n/nototools; + homepage = https://github.com/googlefonts/nototools; }; } From af9e10155eabf436095c6b7db18145fa3ce3ec74 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Aug 2019 12:23:42 -0400 Subject: [PATCH 152/283] linux: 4.14.140 -> 4.14.141 --- 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 38078ea6728..a3b77ee8d96 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.140"; + version = "4.14.141"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1wmx7xgm21dk1hvrq14sxh3c4304284sgxr4vngg4pki2ljyspkr"; + sha256 = "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b"; }; } // (args.argsOverride or {})) From da9405adb85190a63b5a8951aedf03ce2a34590d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Aug 2019 12:24:09 -0400 Subject: [PATCH 153/283] linux: 4.19.68 -> 4.19.69 --- 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 1e3d14c140d..fb25fbb7ddc 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.68"; + version = "4.19.69"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "0ax04sivi1lsx01m3abi16w6d0jd3qvwzzq2zbn8q2lca505k1wi"; + sha256 = "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0"; }; } // (args.argsOverride or {})) From aa4a0623823fac83179d2126cbfa0b771dca591f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Aug 2019 12:24:23 -0400 Subject: [PATCH 154/283] linux: 5.2.10 -> 5.2.11 --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 6f6de115ad0..bf28ac53df0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.10"; + version = "5.2.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "0jgw7gj71i9kf4prbdi9h791ngxf24nr90302glnsa9aghwc95k0"; + sha256 = "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc"; }; } // (args.argsOverride or {})) From 8116f653ff96ceb6bb2bc30fe765517fef752881 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Aug 2019 12:35:15 -0400 Subject: [PATCH 155/283] zoom-us: 3.0.285090.0826 -> 3.0.287250.0828 --- .../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 5ce59adb2ae..f6231766659 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.0.285090.0826"; + version = "3.0.287250.0828"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0brpb5i1lc1hwal0c5n2zh27wxrm4gfbqc6bm2dgwnck04y8i4c5"; + sha256 = "0k4h43wydbcyx7b7gwxkmvbph8qc6kjpcypd7vwz8rph1l7kl1y1"; }; }; From 3e30f3e1f95667185972bcb4efd8d217cd200e98 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 29 Aug 2019 12:40:21 -0400 Subject: [PATCH 156/283] jenkins: 2.176.2 -> 2.176.3 --- .../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 04352660a76..a381d65b357 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 { name = "jenkins-${version}"; - version = "2.176.2"; + version = "2.176.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "19chl7dq25hjn73qgx5cd4azs68kg16r30zx563rrppq3hbc79ik"; + sha256 = "18wsggb4fhlacpxpxkd04zwj56gqjccrbkhs35vkyixwwazcf1ll"; }; buildCommand = '' From 5f74970e286facf32042c10f1d387eafa135ce5f Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Thu, 29 Aug 2019 12:55:26 -0400 Subject: [PATCH 157/283] Update my email address in maintainers-list.nix --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ce6ff26a819..9e67e8657d0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -478,7 +478,7 @@ name = "Stanislas Lange"; }; ankhers = { - email = "justin.k.wood@gmail.com"; + email = "me@ankhers.dev"; github = "ankhers"; githubId = 750786; name = "Justin Wood"; From e3492eff4675585a44c7034e6e7eda3a94a49fad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Aug 2019 18:37:20 +0200 Subject: [PATCH 158/283] mailman: build full paths to postmap and lynx into the package No more need to rely on $PATH. --- ...ols-via-PATH-rather-than-hard-coding.patch | 51 ------------------- pkgs/servers/mail/mailman/core.nix | 11 ++-- 2 files changed, 8 insertions(+), 54 deletions(-) delete mode 100644 pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch diff --git a/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch deleted file mode 100644 index b8a5476c055..00000000000 --- a/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 47469af384a6d4a0877c76d3c52013b40ab61f04 Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Mon, 26 Aug 2019 16:10:04 +0200 -Subject: [PATCH] Find external tools via $PATH rather than hard-coding - /usr/bin. - ---- - src/mailman/config/mhonarc.cfg | 2 +- - src/mailman/config/postfix.cfg | 2 +- - src/mailman/config/schema.cfg | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mailman/config/mhonarc.cfg b/src/mailman/config/mhonarc.cfg -index b00f93aea..096e9521b 100644 ---- a/src/mailman/config/mhonarc.cfg -+++ b/src/mailman/config/mhonarc.cfg -@@ -24,4 +24,4 @@ base_url: http://$hostname/archives/$fqdn_listname - - # If the archiver works by calling a command on the local machine, this is the - # command to call. --command: /usr/bin/mhonarc -outdir /path/to/archive/$listname -add -+command: mhonarc -outdir /path/to/archive/$listname -add -diff --git a/src/mailman/config/postfix.cfg b/src/mailman/config/postfix.cfg -index cddda220a..934c9a977 100644 ---- a/src/mailman/config/postfix.cfg -+++ b/src/mailman/config/postfix.cfg -@@ -5,7 +5,7 @@ - # db file, from the associated plain text files. The file being updated will - # be appended to this string (with a separating space), so it must be - # appropriate for os.system(). --postmap_command: /usr/sbin/postmap -+postmap_command: postmap - - # This variable describes the type of transport maps that will be generated by - # mailman to be used with postfix for LMTP transport. By default, it is set to -diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg -index fa06ccced..406999e13 100644 ---- a/src/mailman/config/schema.cfg -+++ b/src/mailman/config/schema.cfg -@@ -65,7 +65,7 @@ filtered_messages_are_preservable: no - # where the substitution variable $filename is filled in by Mailman, and - # contains the path to the temporary file that the command should read from. - # The command should print the converted text to stdout. --html_to_plain_text_command: /usr/bin/lynx -dump $filename -+html_to_plain_text_command: lynx -dump $filename - - # Specify what characters are allowed in list names. Characters outside of - # the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed, --- -2.22.0 - diff --git a/pkgs/servers/mail/mailman/core.nix b/pkgs/servers/mail/mailman/core.nix index fcd594270db..1ba220039ea 100644 --- a/pkgs/servers/mail/mailman/core.nix +++ b/pkgs/servers/mail/mailman/core.nix @@ -1,15 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources -, zope_component +, zope_component, lynx, postfix }: buildPythonPackage rec { pname = "mailman"; version = "3.2.2"; - patches = [ ./0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch ]; - src = fetchPypi { inherit pname version; sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6"; @@ -21,6 +19,13 @@ buildPythonPackage rec { zope_component ]; + patchPhase = '' + substituteInPlace src/mailman/config/postfix.cfg \ + --replace /usr/sbin/postmap ${postfix}/bin/postmap + substituteInPlace src/mailman/config/schema.cfg \ + --replace /usr/bin/lynx ${lynx}/bin/lynx + ''; + # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping # them in shell code breaks this assumption. The proper way to use mailman is # to create a specialized python interpreter: From 8ca970d6a7f290982d0bcf6c5dbb9d1e2ae649f7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 28 Aug 2019 22:46:51 +0200 Subject: [PATCH 159/283] cage: init at 0.1.1 --- .../window-managers/cage/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/window-managers/cage/default.nix diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix new file mode 100644 index 00000000000..be45d68dc5d --- /dev/null +++ b/pkgs/applications/window-managers/cage/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkgconfig, makeWrapper +, wlroots, wayland, wayland-protocols, pixman, libxkbcommon +, systemd, mesa, libX11 +, xwayland ? null +}: + +stdenv.mkDerivation rec { + pname = "cage"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Hjdskes"; + repo = pname; + rev = "v${version}"; + sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ]; + + buildInputs = [ + wlroots wayland wayland-protocols pixman libxkbcommon + # TODO: Not specified but required: + systemd mesa libX11 + ]; + + enableParallelBuilding = true; + + mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ]; + + postFixup = stdenv.lib.optionalString (xwayland != null) '' + wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" + ''; + + meta = with stdenv.lib; { + description = "A Wayland kiosk"; + homepage = https://www.hjdskes.nl/projects/cage/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69734fb117f..503c89144a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17535,6 +17535,8 @@ in bviplus = callPackage ../applications/editors/bviplus { }; + cage = callPackage ../applications/window-managers/cage { }; + calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; stdenv = gcc5Stdenv; From 56d001a5ca6736f1409900260a10aa888459c67e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 29 Aug 2019 13:32:29 -0400 Subject: [PATCH 160/283] starship: 0.12.0 -> 0.13.1 --- 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 e0bd36b2195..487858e6187 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "0zq99ll0vyafr2piffazprhvbs3sxb6863cp2qw596ilqg7ffi04"; + sha256 = "0y6ixl3i1brak226hh02da1zzlcv41f0kb648dqii6dzyhrwhrld"; }; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "0qlgng5j6l1r9j5vn3wnq25qr6f4nh10x90awiqyzz8jypb0ng2c"; + cargoSha256 = "1xk4ngxhgww921fk40d4ziprnzgp927lhdwwzcifcb0hdyl0854p"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { From 87f818d9b21b16b067048a6ee0178b782886f0f0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 29 Aug 2019 20:24:17 +0200 Subject: [PATCH 161/283] citrix_workspace: add 1908 (`citrix_workspace_19_8_0`) New release: https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html (unfortunately there's no version-specific link for the latest version). Also added `preferLocalBuild = true;` to the derivation, due to `requireFile` you have to build it yourself anyway, however I use distributed builds by default and figured that this shouldn't be needed since the longest part of the build would be the upload of the source archive in that case. --- .../remote/citrix-workspace/default.nix | 15 ++++++++++++++- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index cf89666a379..33f1f06e0b3 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -23,7 +23,7 @@ , gtk_engines , alsaLib , zlib -, version ? "19.6.0" +, version ? "19.8.0" }: let @@ -50,6 +50,17 @@ let x86suffix = "60"; homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; }; + + "19.8.0" = { + major = "19"; + minor = "8"; + patch = "0"; + x64hash = "0f8djw8lp5wihb23y09yac1mh09w1qp422h72r6zfx9k1lqfsdbw"; + x86hash = "0afcqirb4q349r3izy88vqkszg6y2wg14iwypk6nrmvwgvcl6jdn"; + x64suffix = "20"; + x86suffix = "20"; + homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; + }; }; # Copied this file largely from the citrix-receiver package @@ -75,6 +86,8 @@ let prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; + preferLocalBuild = true; + src = requireFile rec { name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; sha256 = if stdenv.is64bit then x64hash else x86hash; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d290cb592e1..ed31149ebbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2229,12 +2229,16 @@ in }; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped; }; + citrix_workspace_19_8_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_8_0; + }; citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped_19_6_0; }; From 19a1e15501e9f47eb48a6bc39cd2e3085c319e86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Aug 2019 20:27:39 +0200 Subject: [PATCH 162/283] rl-1909.xml: fix XML syntax error that broke the NixOS manual --- nixos/doc/manual/release-notes/rl-1909.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 60f756b78c6..166be1f1c28 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -318,7 +318,8 @@ services.strongswan-swanctl services.httpd - + + The option has been replaced by a read-only option for each certificate you define. This will be From c1c1ce72213da207cf9e64ea707079993757b08e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Aug 2019 16:55:24 +0200 Subject: [PATCH 163/283] mailman: add NixOS module to install and deploy the mailing list server --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/mailman.nix | 120 ++++++++++++++++++++++++ nixos/modules/services/mail/postfix.nix | 11 ++- 3 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 nixos/modules/services/mail/mailman.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 75df6c8d453..22fd5d7609d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -376,6 +376,7 @@ ./services/mail/mail.nix ./services/mail/mailcatcher.nix ./services/mail/mailhog.nix + ./services/mail/mailman.nix ./services/mail/mlmmj.nix ./services/mail/offlineimap.nix ./services/mail/opendkim.nix diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix new file mode 100644 index 00000000000..df654c74cc8 --- /dev/null +++ b/nixos/modules/services/mail/mailman.nix @@ -0,0 +1,120 @@ +{ config, pkgs, lib, ... }: # mailman.nix + +with lib; + +let + + cfg = config.services.mailman; + + pythonEnv = pkgs.python3.withPackages (ps: [ps.mailman]); + + mailmanExe = with pkgs; stdenv.mkDerivation { + name = "mailman-" + python3Packages.mailman.version; + unpackPhase = ":"; + installPhase = '' + mkdir -p $out/bin + sed >"$out/bin/mailman" <"${pythonEnv}/bin/mailman" \ + -e "2 iexport MAILMAN_CONFIG_FILE=/etc/mailman.cfg" + chmod +x $out/bin/mailman + ''; + }; + + 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 + log_dir: $var_dir/log + lock_dir: $var_dir/lock + etc_dir: /etc + ext_dir: $etc_dir/mailman.d + pid_file: /run/mailman/master.pid + ''; + +in { + + ###### interface + + options = { + + services.mailman = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Enable Mailman on this host. Requires an active Postfix installation."; + }; + + siteOwner = mkOption { + type = types.str; + default = "postmaster"; + description = '' + Certain messages that must be delivered to a human, but which can't + be delivered to a list owner (e.g. a bounce from a list owner), will + be sent to this address. It should point to a human. + ''; + }; + + + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.enable -> config.services.postfix.enable; + message = "Mailman requires Postfix"; + } + { assertion = config.services.postfix.recipientDelimiter == "+"; + message = "Postfix's recipientDelimiter must be set to '+'."; + } + ]; + + users.users = singleton { + name = "mailman"; + group = "mailman"; + uid = config.ids.uids.mailman; + }; + + users.groups = singleton { + name = "mailman"; + gid = config.ids.gids.mailman; + }; + + environment = { + systemPackages = [ mailmanExe ]; + etc."mailman.cfg".text = mailmanCfg; + }; + + services.postfix.config = { + # Mailman uses recipient delimiters, so we don't need special handling. + owner_request_special = "no"; + }; + + systemd.services.mailman = { + description = "GNU Mailman Master Process"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${mailmanExe}/bin/mailman start"; + ExecStop = "${mailmanExe}/bin/mailman stop"; + User = "mailman"; + Group = "mailman"; + Type = "forking"; + StateDirectory = "mailman"; + StateDirectoryMode = "0750"; + RuntimeDirectory = "mailman"; + PIDFile = "/run/mailman/master.pid"; + }; + + }; + + }; + +} diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 2b08ab1e6aa..bcf90778346 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -11,9 +11,10 @@ let haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != ""; - haveTransport = cfg.transport != ""; + haveTransport = cfg.transport != "" || config.services.mailman.enable; haveVirtual = cfg.virtual != ""; - haveLocalRecipients = cfg.localRecipients != null; + haveLocalRecipients = cfg.localRecipients != null || config.services.mailman.enable; + haveRelayDomains = cfg.relayDomains != null || config.services.mailman.enable; clientAccess = optional (cfg.dnsBlacklistOverrides != "") @@ -752,12 +753,12 @@ in // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; } // optionalAttrs (cfg.origin != "") { myorigin = cfg.origin; } // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; } - // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; } + // optionalAttrs haveRelayDomains { relay_domains = optionals (cfg.relayDomains != null) cfg.relayDomains ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_domains"; } // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; } // optionalAttrs haveAliases { alias_maps = [ "${cfg.aliasMapType}:/etc/postfix/aliases" ]; } - // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ]; } + // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ] ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; } // optionalAttrs haveVirtual { virtual_alias_maps = [ "${cfg.virtualMapType}:/etc/postfix/virtual" ]; } - // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps"; } + // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps" ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; } // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } // optionalAttrs cfg.useSrs { sender_canonical_maps = [ "tcp:127.0.0.1:10001" ]; From 40cb97d944fa7328091c023e64b34d7279a98cc9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Aug 2019 20:38:27 +0200 Subject: [PATCH 164/283] simplescreenrecorder: fix Qt runtime error | 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. --- pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b456d8ee9a6..c3ef5eae676 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras +{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras , libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "simplescreenrecorder-${version}"; version = "0.3.11"; From af1c07b6792aeefd83e657a147a9080b2a618e9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Aug 2019 17:22:24 +0200 Subject: [PATCH 165/283] nixos/fwupd: add package option --- nixos/modules/services/hardware/fwupd.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index cad9fa20de0..223adfee96e 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -8,8 +8,8 @@ let cfg = config.services.fwupd; originalEtc = let - mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; - in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc); + mkEtcFile = n: nameValuePair n { source = "${cfg.package}/etc/${n}"; }; + in listToAttrs (map mkEtcFile cfg.package.filesInstalledToEtc); extraTrustedKeys = let mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; @@ -24,7 +24,7 @@ let "fwupd/remotes.d/fwupd-tests.conf" = { source = pkgs.runCommand "fwupd-tests-enabled.conf" {} '' sed "s,^Enabled=false,Enabled=true," \ - "${pkgs.fwupd.installedTests}/etc/fwupd/remotes.d/fwupd-tests.conf" > "$out" + "${cfg.package.installedTests}/etc/fwupd/remotes.d/fwupd-tests.conf" > "$out" ''; }; } else {}; @@ -77,13 +77,21 @@ in { installed tests. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.fwupd; + description = '' + Which fwupd package to use. + ''; + }; }; }; ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.fwupd ]; + environment.systemPackages = [ cfg.package ]; environment.etc = { "fwupd/daemon.conf" = { @@ -102,11 +110,11 @@ in { } // originalEtc // extraTrustedKeys // testRemote; - services.dbus.packages = [ pkgs.fwupd ]; + services.dbus.packages = [ cfg.package ]; - services.udev.packages = [ pkgs.fwupd ]; + services.udev.packages = [ cfg.package ]; - systemd.packages = [ pkgs.fwupd ]; + systemd.packages = [ cfg.package ]; systemd.tmpfiles.rules = [ "d /var/lib/fwupd 0755 root root -" From a39b76308017b475615a2b55d40d90dada6e359c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 29 Aug 2019 09:33:37 +0200 Subject: [PATCH 166/283] falkon: use qt5's mkDerivation See #65399 --- pkgs/applications/networking/browsers/falkon/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index c721a61591a..6e21456a9a9 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,12 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +{ stdenv, mkDerivation, lib, fetchFromGitHub +, cmake, extra-cmake-modules, pkgconfig, qmake , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland , kwallet }: -stdenv.mkDerivation rec { - name = "falkon-${version}"; +mkDerivation rec { + pname = "falkon"; version = "3.1.0"; src = fetchFromGitHub { From b5fc76e753e15a4e278fc531ba7b5e0b0416efee Mon Sep 17 00:00:00 2001 From: Valerio Besozzi Date: Thu, 29 Aug 2019 21:21:27 +0200 Subject: [PATCH 167/283] rsclock: 0.1.0 -> 0.1.4 --- pkgs/applications/misc/rsclock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 81c001509f3..c427eda8c77 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rsClock"; - version = "0.1.0"; + version = "0.1.4"; src = fetchFromGitHub { owner = "valebes"; repo = pname; rev = "v${version}"; - sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh"; + sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n"; + cargoSha256 = "0zg5q2p9snpfyxl0gx87ix1f46afrfm5jq0m6c7s8qw2x9hpvxzr"; meta = with stdenv.lib; { description = "A simple terminal clock written in Rust"; From 3162cc132063bfefd403eb7bcb7a482ec90be837 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Thu, 29 Aug 2019 21:22:51 +0200 Subject: [PATCH 168/283] plex-media-player: 2.36.0.988 -> 2.40.0.1007 --- .../video/plex-media-player/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 4bd4d5fdaad..d55c3882f30 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -9,41 +9,41 @@ let # plex-media-player is updated, the versions for these files are changed, # so the build IDs (and SHAs) below will need to be updated! depSrcs = rec { - webClientBuildId = "129-669a5eed7ae231"; - webClientDesktopBuildId = "3.100.1-d7ae231"; - webClientTvBuildId = "3.105.0-669a5ee"; + webClientBuildId = "141-4af71961b12c68"; + webClientDesktopBuildId = "3.104.2-1b12c68"; + webClientTvBuildId = "4.3.0-4af7196"; webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk"; + sha256 = "0fpkd1s49dbiqqlijxbillqd71a78p8y2sc23mwp0lvcmxrg265p"; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg"; + sha256 = "0sb0j44lwqz9zbm98nba4x6c1jxdzvs36ynwfg527avkxxna0f8f"; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa"; + sha256 = "0dxa0ka0igfsryzda4r5clwdl47ah78nmlmgj9d5pgsvyvzjp87z"; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd"; + sha256 = "086w1bavk2aqsyhv9zi5fynk31zf61sl91r6gjrdrz656wfk5bxa"; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk"; + sha256 = "12vbgsfnj0j2y5jd73dpi08hqsr9888sma41nvd4ydsd7qblm455"; }; }; in mkDerivation rec { name = "plex-media-player-${version}"; - version = "2.36.0.988"; - vsnHash = "0150ae52"; + version = "2.40.0.1007"; + vsnHash = "5482132c"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0"; + sha256 = "0ibdh5g8x32iy74q97jfsmxd08wnyrzs3gfiwjfgc10vaa1qdhli"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; From 4e4d67b79f0b898d7eb806664b8cab308a911508 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 29 Aug 2019 17:23:47 +0200 Subject: [PATCH 169/283] twitter-color-emoji: init at 12.1.2 --- .../fonts/twitter-color-emoji/default.nix | 122 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 124 insertions(+) create mode 100644 pkgs/data/fonts/twitter-color-emoji/default.nix diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix new file mode 100644 index 00000000000..5c01283d3e9 --- /dev/null +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -0,0 +1,122 @@ +# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9 +# The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) + +{ stdenv +, fetchFromGitHub +, cairo +, imagemagick +, pkg-config +, pngquant +, python2 +, which +, zopfli +}: + +let + version = "12.1.2"; + + # Cannot use noto-fonts-emoji.src since it is too old + # and still tries to use vendored pngquant. + notoSrc = fetchFromGitHub { + name = "noto"; + owner = "googlefonts"; + repo = "noto-emoji"; + rev = "833a43d03246a9325e748a2d783006454d76ff66"; + sha256 = "1g6ikzk8banm3ihqm9g27ggjq2mn1b1hq3zhpl13lxid6mp60s4a"; + }; + + twemojiSrc = fetchFromGitHub { + name = "twemoji"; + owner = "twitter"; + repo = "twemoji"; + rev = "v${version}"; + sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; + }; + + python = python2.withPackages (pp: with pp; [ + nototools + ]); +in +stdenv.mkDerivation rec { + pname = "twitter-color-emoji"; + inherit version; + + srcs = [ + notoSrc + twemojiSrc + ]; + + sourceRoot = notoSrc.name; + + postUnpack = '' + chmod -R +w ${twemojiSrc.name} + mv ${twemojiSrc.name} ${notoSrc.name} + ''; + + nativeBuildInputs = [ + cairo + imagemagick + pkg-config + pngquant + python + which + zopfli + ]; + + postPatch = let + templateSubstitutions = stdenv.lib.concatStringsSep "; " [ + ''s#Noto Color Emoji#Twitter Color Emoji#'' + ''s#NotoColorEmoji#TwitterColorEmoji#'' + ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#'' + ''s# Version .*# ${version}#'' + ''s#.*is a trademark.*##'' + ''s#Google, Inc\.#Twitter, Inc and other contributors#'' + ''s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#'' + ''s#.*is licensed under.*# Creative Commons Attribution 4.0 International#'' + ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' + ]; + in '' + patchShebangs ./flag_glyph_name.py + + sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl + pushd ${twemojiSrc.name}/assets/72x72/ + for png in *.png; do + mv $png emoji_u''${png//-/_} + done + popd + ''; + + makeFlags = [ + "EMOJI=TwitterColorEmoji" + "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72" + "BODY_DIMENSIONS=76x72" + ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm644 TwitterColorEmoji.ttf $out/share/fonts/truetype/TwitterColorEmoji.ttf + ''; + + meta = with stdenv.lib; { + description = "Color emoji font with a flat visual style, designed and used by Twitter"; + longDescription = '' + A bitmap color emoji font built from the Twitter Emoji for + Everyone artwork with support for ZWJ, skin tone diversity and country + flags. + + This font uses Google’s CBDT format making it work on Android and Linux graphical stack. + ''; + homepage = "https://twemoji.twitter.com/"; + # In noto-emoji-fonts source + ## noto-emoji code is in ASL 2.0 license + ## Emoji fonts are under OFL license + ### third_party color-emoji code is in ASL 2.0 license + ### third_party region-flags code is in Public Domain license + # In twemoji source + ## Artwork is Creative Commons Attribution 4.0 International + ## Non-artwork is MIT + license = with licenses; [ asl20 ofl cc-by-40 mit ]; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25a2e16cf46..6a01d06ba3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17137,6 +17137,8 @@ in inherit (nodePackages) svgo; }; + twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; + tzdata = callPackage ../data/misc/tzdata { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; From 875edee495786c9d7225db62f00d58e24cfc7de0 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 29 Aug 2019 21:46:42 +0200 Subject: [PATCH 170/283] plex: 1.16.5.1488 -> 1.16.5.1554 --- 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 16007c3e8fc..36b4bd96fbd 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.5.1488-deeb86e7f"; + version = "1.16.5.1554-1e5ff713d"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0kgcbq3jfvmigza8a9ak215q2cpi18vh96gx01hppk51m9ibkrwi"; + sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n"; }; outputs = [ "out" "basedb" ]; From 360b2314b8651e9ea2ba75ed6ec9677ef6ad1007 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 29 Aug 2019 22:00:18 +0200 Subject: [PATCH 171/283] irssi: 1.2.1 -> 1.2.2 (CVE-2019-15717) https://irssi.org/security/irssi_sa_2019_08.txt --- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 5aca2c49d14..0994fa049dd 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx"; + sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; nativeBuildInputs = [ pkgconfig ]; From 844200a06f2b5d27955c39c05163711e9263bb99 Mon Sep 17 00:00:00 2001 From: Vika Date: Fri, 30 Aug 2019 00:28:57 +0300 Subject: [PATCH 172/283] nixos/bash: Improve Emacs detection for PS1 That's one of my itches - when I'm sshing from Emacs' term to a NixOS machine, it doesn't detect that I'm running emacs and showing a title escape sequence. This commit fixes it, checking against $TERM to prevent this from ever bothering anyone again. --- nixos/modules/programs/bash/bash.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index a7e57b8608d..99daec5ff5b 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -98,7 +98,7 @@ in if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then PROMPT_COLOR="1;31m" let $UID && PROMPT_COLOR="1;32m" - if [ -n "$INSIDE_EMACS" ]; then + if [ -n "$INSIDE_EMACS" -o "$TERM" == "eterm" -o "$TERM" == "eterm-color" ]; then # Emacs term mode doesn't support xterm title escape sequence (\e]0;) PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " else From 8d084f6f45250060513b5fa10ca1ae17e342dd74 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 29 Aug 2019 15:09:36 -0700 Subject: [PATCH 173/283] ffsend: v0.2.50 -> v0.2.51 --- pkgs/tools/misc/ffsend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 73734ee5ea0..90092c9b0c0 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.50"; + version = "0.2.51"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh"; + sha256 = "1ckzgzbv2fh5y7c5r0b9n6y2migmsrnlwdg7dybr0c82s39swr7f"; }; - cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1"; + cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] From 3155fbff0adcd8abf762a5689de4af1c7b93b974 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 29 Aug 2019 18:22:00 -0400 Subject: [PATCH 174/283] emacs-irony: shrink closure Goes from 1.6G -> 154M --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 9574ec43a61..1a647466abd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -131,6 +131,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac irony = super.irony.overrideAttrs (old: { cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; + NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server ''; @@ -144,6 +145,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac make check cd ../.. ''; + preFixup = '' + rm -rf $out/share/emacs/site-lisp/elpa/*/server + ''; dontUseCmakeBuildDir = true; doCheck = true; packageRequires = [ self.emacs ]; From b98adbc2d5c590c8c327ea9eb3052c33523872f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 29 Aug 2019 21:14:06 -0300 Subject: [PATCH 175/283] cmst: use pname --- pkgs/tools/networking/cmst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index cc88153bab9..2e7570ea649 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, qmake, qtbase }: stdenv.mkDerivation rec { - name = "cmst-${version}"; + pname = "cmst"; version = "2019.01.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; - rev = name; + rev = "cmst-${version}"; sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh"; }; From a92f096bb6d005196b252983894877a77680ee60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 29 Aug 2019 21:15:23 -0300 Subject: [PATCH 176/283] cmst: use Qt mkDerivation --- pkgs/tools/networking/cmst/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 2e7570ea649..ee561840da8 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "cmst"; version = "2019.01.13"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "QT GUI for Connman with system tray icon"; homepage = https://github.com/andrew-bibb/cmst; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.matejc ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } From d2512c134ad9020ca29275aa06ff8bd631e19419 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 30 Aug 2019 10:29:18 +1000 Subject: [PATCH 177/283] libhandy: 0.0.10. -> 0.0.11 --- pkgs/development/libraries/libhandy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 9c3d9faf1f4..4883b39b7cf 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.10"; + version = "0.0.11"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs"; + sha256 = "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0"; }; nativeBuildInputs = [ From 1e8e8d1867afed7ffd175721c4021a5111226103 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Fri, 30 Aug 2019 03:44:33 +0200 Subject: [PATCH 178/283] pithos: 1.1.2 -> 1.4.1 --- pkgs/applications/audio/pithos/default.nix | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index f2c798d1e6e..5d86e37dec8 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,33 +1,29 @@ -{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobject-introspection, libnotify -, gst_all_1, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib +, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection +, libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { pname = "pithos"; - version = "1.1.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp"; + sha256 = "0vaw0rfcdh4bsp9b8la9bs36kw0iwia54y5x060byxhff9av6nj4"; }; - # No tests in repo - doCheck = false; + format = "other"; postPatch = '' - substituteInPlace setup.py --replace "/usr/share" "$out/share" + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; - postInstall = '' - mkdir -p $out/share/applications - cp -v data/pithos.desktop $out/share/applications - ''; - - buildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify ] ++ + [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); From 366db822680ba9e0533916b605ed230ae2b1cbdc Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Fri, 30 Aug 2019 04:17:02 +0200 Subject: [PATCH 179/283] nfs-utils: 2.3.4 -> 2.4.1 --- pkgs/os-specific/linux/nfs-utils/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 7984e357c82..12fdbabcc0b 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "nfs-utils-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; - sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq"; + sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5"; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -47,14 +47,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; - patches = [ - # Fixes build on i686. - (fetchpatch { - name = "sqlite.c-Use-PRIx64-macro-to-print-64-bit-integers.patch"; - url = "http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff_plain;h=a8133e1fd174267536cd459e19cfe0a1cbbe037c;hp=a709f25c1da4a2fb44a1f3fd060298fbbd88aa3c"; - sha256 = "03azkw13xhp8f49777p08xziy0d7crz65qrisjbkzjnx1wczdqy5"; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid"; From 9a2f83feb953f5b2f4cfe1d3d696ed500de2745d Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Fri, 30 Aug 2019 04:36:35 +0200 Subject: [PATCH 180/283] gradle: 5.3.1 -> 5.6.1 --- .../tools/build-managers/gradle/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 0ec57cc8b82..902c74a08b4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_5_3; + gradle_latest = gradle_5_6; - gradle_5_3 = gradleGen rec { - name = "gradle-5.3.1"; - nativeVersion = "0.17"; + gradle_5_6 = gradleGen rec { + name = "gradle-5.6.1"; + nativeVersion = "0.18"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0dkl6f17zl9pc6y2xm8xqz23x53fck4p2648vpq8572f0mxa2n8w"; + sha256 = "04pccfcry5c59xwm6rr4r3baanwbfr5yrwhxv4r5v8z4414291h9"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c3af89bc8d..d04329080ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9605,7 +9605,7 @@ in gradle_2 = gradle_2_14; gradle_3 = gradle_3_5; gradle_4 = gradle_4_10; - gradle_5 = res.gradleGen.gradle_5_3; + gradle_5 = res.gradleGen.gradle_5_6; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. From c56e7a20b1c657049b2a6e3cd5669a2212fd4c16 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Fri, 30 Aug 2019 05:24:41 +0200 Subject: [PATCH 181/283] robo3t: 1.1.1 -> 1.3.1 --- pkgs/applications/misc/robo3t/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index be365cb94e4..cfafd239b60 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { name = "robo3t-${version}"; - version = "1.1.1"; + version = "1.3.1"; + rev = "7419c406"; src = fetchurl { - url = "https://download.robomongo.org/1.1.1/linux/robo3t-${version}-linux-x86_64-c93c6b0.tar.gz"; - sha256 = "140cn80vg7c8vpdjasqi4b3kyqj4n033lcm3ikz5674x3jr7r5zs"; + url = "https://download-test.robomongo.org/linux/robo3t-${version}-linux-x86_64-${rev}.tar.gz"; + sha256 = "1mp5i8iahd4qkwgi5ix98hlg17ivw5da27n0drnr0wk458wn99hi"; }; icon = fetchurl { From 5fe68fd14238ea9b01b1293466864926513e09ef Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 28 Aug 2019 17:53:43 -0700 Subject: [PATCH 182/283] pythonPackage.nixpart0: disable for python3 --- pkgs/tools/filesystems/nixpart/0.4/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 6a1c12e3e72..129283e83eb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -54,11 +54,12 @@ let }; in buildPythonApplication rec { - name = "nixpart-${version}"; + pname = "nixpart"; version = "0.4.1"; + disabled = python.isPy3k; src = fetchurl { - url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; + url = "https://github.com/NixOS/nixpart/archive/v${version}.tar.gz"; sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; @@ -66,10 +67,11 @@ in buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "NixOS storage manager/partitioner"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/NixOS/nixpart"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.aszlig ]; + platforms = platforms.linux; }; } From a7a6528c611351fc38bb3e42a25550ce4943b106 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Thu, 29 Aug 2019 00:17:25 +0200 Subject: [PATCH 183/283] lsof: 4.91 -> 4.93.2 --- .../tools/misc/lsof/darwin-dfile.patch | 12 ------- pkgs/development/tools/misc/lsof/default.nix | 34 ++++++------------- 2 files changed, 11 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/tools/misc/lsof/darwin-dfile.patch diff --git a/pkgs/development/tools/misc/lsof/darwin-dfile.patch b/pkgs/development/tools/misc/lsof/darwin-dfile.patch deleted file mode 100644 index 9952228e613..00000000000 --- a/pkgs/development/tools/misc/lsof/darwin-dfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c ---- a/dialects/darwin/libproc/dfile.c 2018-02-14 09:28:06.000000000 -0500 -+++ b/dialects/darwin/libproc/dfile.c 2018-04-16 18:52:40.828715293 -0400 -@@ -43,7 +43,7 @@ - #include "lsof.h" - - #if defined(PROC_FP_GUARDED) --#extern struct pff_tab Pgf_tab[]; -+extern struct pff_tab Pgf_tab[]; - #endif /* defined(PROC_FP_GUARDED) */ - - diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 63003f338eb..98acccb252a 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,34 +1,22 @@ -{ stdenv, fetchurl, buildPackages, ncurses }: +{ stdenv, fetchFromGitHub, buildPackages, ncurses }: let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { - name = "lsof-${version}"; - version = "4.91"; + pname = "lsof"; + version = "4.93.2"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; - src = fetchurl { - urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down... - ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] - ++ map ( - # the tarball is moved after new version is released - isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/" - + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ] - ++ map ( - # the tarball is moved after new version is released - isOld: "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/" - + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ] - ; - sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9"; + src = fetchFromGitHub { + owner = "lsof-org"; + repo = "lsof"; + rev = "${version}"; + sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv"; }; - unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - - patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + patches = [ ./no-build-info.patch ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 @@ -47,12 +35,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/man/man8 - cp lsof.8 $out/man/man8/ + cp Lsof.8 $out/man/man8/lsof.8 cp lsof $out/bin ''; meta = with stdenv.lib; { - homepage = https://people.freebsd.org/~abe/; + homepage = "https://github.com/lsof-org/lsof"; description = "A tool to list open files"; longDescription = '' List open files. Can show what process has opened some file, From 984acf8004dadf8b7d9b3d18b3d6425f62140301 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Fri, 23 Aug 2019 12:26:08 +0200 Subject: [PATCH 184/283] yq-go: init at 2.4.0 --- pkgs/development/tools/yq-go/default.nix | 31 +++++++++++++ pkgs/development/tools/yq-go/deps.nix | 57 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 90 insertions(+) create mode 100644 pkgs/development/tools/yq-go/default.nix create mode 100644 pkgs/development/tools/yq-go/deps.nix diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix new file mode 100644 index 00000000000..3180131c6f7 --- /dev/null +++ b/pkgs/development/tools/yq-go/default.nix @@ -0,0 +1,31 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# buildGoModule is not supported by the project +# See https://github.com/mikefarah/yq/issues/227 +buildGoPackage rec { + pname = "yq-go"; + version = "2.4.0"; + + goPackagePath = "gopkg.in/mikefarah/yq.v2"; + + src = fetchFromGitHub { + owner = "mikefarah"; + rev = version; + repo = "yq"; + sha256 = "0nizg08mdpb8g6hj887kk5chljba6x9v0f5ysqf28py511yp0dym"; + }; + + goDeps = ./deps.nix; + + postInstall = '' + mv $bin/bin/yq.v2 $bin/bin/yq + ''; + + meta = with stdenv.lib; { + description = "Portable command-line YAML processor"; + homepage = http://mikefarah.github.io/yq/; + license = [ licenses.mit ]; + maintainers = [ maintainers.lewo ]; + }; +} diff --git a/pkgs/development/tools/yq-go/deps.nix b/pkgs/development/tools/yq-go/deps.nix new file mode 100644 index 00000000000..ec2057964ec --- /dev/null +++ b/pkgs/development/tools/yq-go/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "972238283c0625cf3e881de7699ba8f2524c340a"; + sha256 = "194h0lq3s27wcxcgahjl350x46v116x81zgkgh98q9v5iydig28l"; + }; + } + { + goPackagePath = "gopkg.in/imdario/mergo.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/imdario/mergo.v0"; + rev = "7c29201646fa3de8506f701213473dd407f19646"; + sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; + }; + } + { + goPackagePath = "gopkg.in/mikefarah/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mikefarah/yaml.v2"; + rev = "1a71b09ff830e9b158685a8657c85f6462559726"; + sha256 = "0rvix49in3bm3i90v1dp1s49b14m1pyyqm3fv27mgg0spvcqy7vr"; + }; + } + { + goPackagePath = "gopkg.in/op/go-logging.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/op/go-logging.v1"; + rev = "b2cb9fa56473e98db8caba80237377e83fe44db5"; + sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn"; + }; + } + { + goPackagePath = "gopkg.in/spf13/cobra.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/spf13/cobra.v0"; + rev = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"; + sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4498ce8b13..8f77b5722cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10118,6 +10118,8 @@ in inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict; }; + yq-go = callPackage ../development/tools/yq-go { }; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; From a278d1d0c3db1b6dc9e8d0e84322c8efce5d0e6c Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 30 Aug 2019 20:11:21 +0900 Subject: [PATCH 185/283] firefox-bin: add maintainer --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 2f79f6900cd..dea752874dd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -205,6 +205,6 @@ stdenv.mkDerivation { url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; platforms = builtins.attrNames mozillaPlatforms; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ taku0 ]; }; } From 359a5ca5eb13071814378da026f2567cc1eb9ddb Mon Sep 17 00:00:00 2001 From: Quentin Vaucher Date: Fri, 30 Aug 2019 13:39:59 +0200 Subject: [PATCH 186/283] ephemeral: 5.2.1 -> 5.3.0 --- pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 6226cb338d9..369689520d8 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "01mj5gksz2qcwhp28zyk8qswmrw93db1g7mw3mg4klz99vzcry74"; + sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39"; }; nativeBuildInputs = [ From 131910992beecf518df8d2420750978d343d2e9c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Aug 2019 14:23:02 +0200 Subject: [PATCH 187/283] python-HyperKitty: initial version 1.2.2 Package the mail archiver for GNU Mailman. I liberally borrowed code from @globin's repository [1]. [1] https://github.com/mayflower/nixexprs/tree/master/pkgs/python --- .../python-modules/cssmin/default.nix | 20 ++++++++++ .../django-paintstore/default.nix | 20 ++++++++++ .../python-modules/django-q/default.nix | 24 ++++++++++++ .../robot-detection/default.nix | 22 +++++++++++ pkgs/servers/mail/mailman/hyperkitty.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +++++ 6 files changed, 134 insertions(+) create mode 100644 pkgs/development/python-modules/cssmin/default.nix create mode 100644 pkgs/development/python-modules/django-paintstore/default.nix create mode 100644 pkgs/development/python-modules/django-q/default.nix create mode 100644 pkgs/development/python-modules/robot-detection/default.nix create mode 100644 pkgs/servers/mail/mailman/hyperkitty.nix diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix new file mode 100644 index 00000000000..7cb01001fac --- /dev/null +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cssmin"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dk723nfm2yf8cp4pj785giqlwv42l0kj8rk40kczvq1hk6g04p0"; + }; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python port of the YUI CSS compression algorithm"; + homepage = http://github.com/zacharyvoase/cssmin; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix new file mode 100644 index 00000000000..096215a70ab --- /dev/null +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib +, django, python3-openid }: + +buildPythonPackage rec { + pname = "django-paintstore"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "12wxgwv1qbkfq7w5i7bm7aidv655c2sxp0ym73qf8606dxbjcwwg"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Django app that integrates jQuery ColorPicker with the Django admin"; + homepage = https://github.com/gsiegman/django-paintstore; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix new file mode 100644 index 00000000000..f671674ffe2 --- /dev/null +++ b/pkgs/development/python-modules/django-q/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow +, blessed, django, future }: + +buildPythonPackage rec { + pname = "django-q"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17mqxiacsp2yszak6j48fm7vx0w44pcg86flc63r9y5yhx490n5r"; + }; + + propagatedBuildInputs = [ + django-picklefield arrow blessed django future + ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A multiprocessing distributed task queue for Django"; + homepage = https://django-q.readthedocs.org; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix new file mode 100644 index 00000000000..81428b44ad9 --- /dev/null +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "robot-detection"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xd2jm3yn31bnk1kqzggils2rxj26ylxsfz3ap7bhr3ilhnbg3rx"; + }; + + propagatedBuildInputs = [ six ]; + + # no tests in archive + doCheck = false; + + meta = with stdenv.lib; { + description = "Library for detecting if a HTTP User Agent header is likely to be a bot"; + homepage = https://github.com/rory/robot-detection; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix new file mode 100644 index 00000000000..8f060da3446 --- /dev/null +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, mock +, robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 +, django-haystack, lockfile, networkx, dateutil, defusedxml +, django-paintstore, djangorestframework, django, django-q +, django_compressor, beautifulsoup4, six, psycopg2, whoosh +}: + +buildPythonPackage rec { + pname = "HyperKitty"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z2zswlml6nppxhzw9a4nrj7i5wsxd29s3q78ka1rwr5m5n7s1rz"; + }; + + buildInputs = [ coverage mock ]; + propagatedBuildInputs = [ + robot-detection django_extensions rjsmin cssmin django-mailman3 + django-haystack lockfile networkx dateutil defusedxml + django-paintstore djangorestframework django django-q + django_compressor beautifulsoup4 six psycopg2 whoosh + ]; + + checkPhase = '' + cd $NIX_BUILD_TOP/$sourceRoot + PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test \ + --settings=hyperkitty.tests.settings_test hyperkitty + ''; + + meta = { + homepage = "http://www.gnu.org/software/mailman/"; + description = "Archiver for GNU Mailman v3"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ peti globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8dca7c924b..bdaae932f68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2720,6 +2720,16 @@ in { sunpy = callPackage ../development/python-modules/sunpy { }; + hyperkitty = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/hyperkitty.nix { }); + + robot-detection = callPackage ../development/python-modules/robot-detection {}; + + cssmin = callPackage ../development/python-modules/cssmin {}; + + django-paintstore = callPackage ../development/python-modules/django-paintstore {}; + + django-q = callPackage ../development/python-modules/django-q {}; + hyperlink = callPackage ../development/python-modules/hyperlink {}; zope_copy = callPackage ../development/python-modules/zope_copy {}; From ad530918a543f54ad6ac94ee0d2675bfac0a743c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 29 Aug 2019 15:13:16 -0400 Subject: [PATCH 188/283] nixUnstable: 2.3pre6779_324a5dc9 -> 2.3pre6895_84de821 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aa212d655f8..a5501e88ed9 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -181,12 +181,12 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre6779_324a5dc9"; + suffix = "pre6895_84de821"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "324a5dc92f8e50e6b637c5e67dea48c80be10837"; - sha256 = "1g8gbam585q4kx8ilbx23ip64jw0r829i374qy0l8kvr8mhvj55r"; + rev = "84de8210040580ce7189332b43038d52c56a9689"; + sha256 = "062pdly0m2hk8ly8li5psvpbj1mi7m1a15k8wyzf79q7294l5li3"; }; fromGit = true; From 786804a1048b87d0b17ec4833af127652f16425a Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 30 Aug 2019 08:29:34 -0400 Subject: [PATCH 189/283] nixFlakes: pre20190712_aa82f8b -> pre20190829_ebc4dae --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a5501e88ed9..58662f4c045 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -195,12 +195,12 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre20190712_aa82f8b"; + suffix = "pre20190829_ebc4dae"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108"; - hash = "sha256-MRY2CCjnTPSWIv0/aguZcg5U+DA+ODLKl9vjB/qXFpU="; + rev = "ebc4dae51761cb54c1db28cf4d328d3f2f55b758"; + hash = "sha256-yfp56L7lu0DIhskzxooF/26T9d4ufl5/k5LlXMI0PSM="; }; fromGit = true; From 8c7c18992f6bb20bd7ec61cdbfcd683c881baf49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Aug 2019 14:46:20 +0200 Subject: [PATCH 190/283] CODEOWNERS: add myself as a reviewer for mail/dns related NixOS modules --- .github/CODEOWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 51cca15632d..1b3acbf6f7a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -139,3 +139,9 @@ # Bazel /pkgs/development/tools/build-managers/bazel @mboes @Profpatsch + +# NixOS modules for e-mail and dns services +/nixos/modules/services/mail/mailman.nix @peti +/nixos/modules/services/mail/postfix.nix @peti +/nixos/modules/services/networking/bind.nix @peti +/nixos/modules/services/mail/rspamd.nix @peti From 00ab4f8c8069131c6e585d0f8fa68c0d26a14e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Fri, 30 Aug 2019 14:50:52 +0200 Subject: [PATCH 191/283] mirage: fix build failure --- pkgs/applications/graphics/mirage/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index 515b834b41e..c06a7972709 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec { doCheck = false; + nativeBuildInputs = [ gettext ]; + buildInputs = [ stdenv libX11 gettext ]; patchPhase = '' From 5a81797119c98758908f4c4b99f5f756481d3f39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Aug 2019 15:38:43 +0200 Subject: [PATCH 192/283] nixos/mailman: cosmetic --- nixos/modules/services/mail/mailman.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index df654c74cc8..cae59cb52cc 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -112,7 +112,6 @@ in { RuntimeDirectory = "mailman"; PIDFile = "/run/mailman/master.pid"; }; - }; }; From 28dee92fffaa0745d9dce8a70623fa3f04885d08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Aug 2019 15:39:50 +0200 Subject: [PATCH 193/283] nixos/redis: move 'redis_init.service' into the preStart hook of 'redis.service' --- nixos/modules/services/databases/redis.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index c04cc1283b2..3f2857100f5 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -224,26 +224,17 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.redis_init = - { description = "Redis Server Initialisation"; - - wantedBy = [ "redis.service" ]; - before = [ "redis.service" ]; - - serviceConfig.Type = "oneshot"; - - script = '' - install -d -m0700 -o ${cfg.user} ${cfg.dbpath} - chown -R ${cfg.user} ${cfg.dbpath} - ''; - }; - systemd.services.redis = { description = "Redis Server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + preStart = '' + install -d -m0700 -o ${cfg.user} ${cfg.dbpath} + chown -R ${cfg.user} ${cfg.dbpath} + ''; + serviceConfig = { ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}"; User = cfg.user; From c205c66fb5be2e02cf6a1f2958d7c6f093bd66d9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2019 15:57:10 +0100 Subject: [PATCH 194/283] firefox-devedition-bin: 69.0b10 -> 70.0b2 --- .../firefox-bin/devedition_sources.nix | 746 +++++++++--------- 1 file changed, 373 insertions(+), 373 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 5d4ee39a4b2..a9ca0a5fe06 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0b10"; + version = "70.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ach/firefox-70.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "9d036f8217a95ea3d601e10050ee15f75f6d3eea5f38f5a1ce0a773d92cca7418a863385555ec9112751016e4008672f8de79c17b7156775d7ba3eee2a4c19d9"; + sha512 = "cf64b9cd170d5a1bf1765ed07df197a3d0c7411b5281c89a0d2adfb3d9c404ed9fd2c8c021fe93971b846d7ebfdcfdf08f3a5703e156d6dbab61619f53d6d415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/af/firefox-70.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "def33babd8a97fb1b9f9059a019d5c823e965f404baadc1daf3325a3f7437f0152585dd6ba13f67542eb7b1e7cb2f265986c7813c35e65cb79febba5636a6c5d"; + sha512 = "e2815831dc99e0373541a56a38fa936a97d93a07a2dd7f789f5e4cc45860ce3c1b70bbbe709d35534364586af5b0dc626a4ba36dc8881244f98665a80ba57764"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/an/firefox-70.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b51086111c0a2a989c6123729028b41a834f25bff19836b486bfd935d52055a8c23bdb0e79eb8718d86a4b4781ed6fdd02b946d2dc5e0b86de9fc2166393f1e4"; + sha512 = "d7cc4b7a1d7fabe186ae10a9bbd5d746415178dc3d17255e2278c1b5a9a7170403cdd153668b94220ea68be387b0c7b3365c8d460bfe53f7b381e7f3da12948e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ar/firefox-70.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d3cc62cfa029a7112aa8b27257e2b1b7c3adb99d56d3d749b19009be92ada130353f6d5bd8383b78ddd179417779d2425ecfa2d778a4752f7a876f3fbef84c34"; + sha512 = "8fb79f3636682c83dcf42b143892148fddb06eefca4c5eb72f5ed703b821dc2bfab7a167a58992d83202866dc07bfa09eee876cc567586791440afea676efbbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ast/firefox-70.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "75ec692ad8b8d56e13b6b34a980c9f37034b188a675dd0c975e598277fa919587a90a3be11867bd63db1c83a12876d10e2eeb83e5666f10c256adad5b9f369f7"; + sha512 = "468bcff942edfc8ba843f6f5a4b42aeb2b606186701d6a371565c4803664591037fe44bd026fca790ff8b8bb036619862ec51f04af63acfbf393fe8ac677907f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/az/firefox-70.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9f44dd00187942430c69898298e677dbfe8385a9e43d312681c7d487ae3353b0dd668a87945d41183bbdffd8bfe7331d1d752a594fa515372139385935134417"; + sha512 = "983f8d78364c1479a252806f912d015e791e8073bc7848c0bebb28c7a39d6ab08bac2bd9e4a7f1c1cb68b8d2894eaa927541a78836717066491b450c0b34671c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/be/firefox-70.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "faf91758f3cf17f8dbc570195adacbd93a57f46f0750eabceb6e66df16dbf459670254712b63146b89be67442ba828d5506a703cd51bf3d7c42708ba30bba3e4"; + sha512 = "dd31f1d7d3f6fe10f9dba54475512016be4b26bf59ca0ce55932b23cbc29954bd80e95fb1e29f2ec695e8f16d0b0145ed0d160f1964fe40ffe079a3833ee8090"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bg/firefox-70.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b712fdfa9643d00cf44129ec7d0f718ebb46e48fb568d70989b5c094f1a7c231247672620955f397b94e7de0aaa74893780155901cc1c4e26ba4ab9646b566e7"; + sha512 = "d08edb6750464805ef379b18008d5f3a76a649ee4d6528b4ebd255ab89205756e2c9978bd9a27f56a607117186d434fa2df49ef4494bf5bd4f1f8e2eed10b30a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bn/firefox-70.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "9a41d3c3647f3c7c0f5d329edf70693f63835a5dfaf67df08d7937a2efdc89b4cae263e4447ea09e05453be4a3ca658a965f3aafe432cad86ce9ce754c4e5813"; + sha512 = "a3c200e13d6b20a7fcdba2524501d936a183213f590213727facd9271867ca3d5ac0c59831b88e92a424b3b154bb9cfc66dfd8908ee28fe6a4ed15146944eb7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/br/firefox-70.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "8c3ee20552f7c85723cb8489cea7f64821619a09deaffba94f42c1b29c55894e40720cb3997791c10baf27c99ea11976741c30286e417b207ec620a3dee4c771"; + sha512 = "235ca44c123dc8034541637b8cf5b7d7d3e361300639033dcae361bfcedd41360a5761486c990e7328e479b3073b5f68f01bd38228170c352f993c0bee4757c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bs/firefox-70.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "348c1e68f57f2a09c134452aa110b39cd638d97bb0b8adaef7f57210c9d95e3a8a6732e72a437219e517799835c4d1d6332af54706239bc604f57e166d859898"; + sha512 = "2b2202f8397edd25f871d0e9b7e2535be98559bcd84080b8418460f7f1e558cb779f1588e94d87e8e713639cb3bde3efa8de7baf2e2f36bf387d965bffb9552d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ca/firefox-70.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4630f3edb4f435dd169335c67477ceb6e42f2d8161dd9559ff58525fc117f7cbf45da534de6e160bf824b3b4b41ded3d3dcac2782f2a208ab7d0e014b4ba40ed"; + sha512 = "23b7af96430ff5202529e5bbfc5d359d8cb9419b54a8e7dff6b1c828ccd1cd3ca686ed062a29f7e8ee8201ae1a2bbce7032a0f3f0cfc63168fbf0b49c52a9391"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cak/firefox-70.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2cae224ee70259a60c0868b83ba933eb43867ca0345bc0fea9693dc3ddcd9130d7325ba953d729778e7ed0eae334b200abd11dc1e903183514c11475e0a61269"; + sha512 = "beda7fd930fbcf0985711917ea4b78a94042072a8cdd325079f3568bfcf2456efa0666efa4f869430cbfde34091b9d7d101edb94fde0a0c6942f61ee9c8a4fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cs/firefox-70.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "434ef8593e4771c00b772ef3be672fa82d1084431882a6b95011cdaaa04035d08bb1927ec0eafe51d44e7028e2038f798073c5287335300989866ee7f7347ed6"; + sha512 = "1b47c85b7b5125ba416e18345c7247b85f29e4136d56333da14d8f2c3ebb7b9f81bd0332f6031b36e68e21d851f9390e171f75305bfbe0f46dd0b7c995e0b2aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cy/firefox-70.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e26e3a3e571efa96d03169f17bb7e0920b2ba160830440ed924b6b60c244d31297bfc72d810292e07b9abeee9cb4843f0c2369192b827362fd65bb3f9da4c577"; + sha512 = "071d30f74d13311693dbf3b4c1a111d12e53aaeb8d6207f8628f7a45acfcf797a722a5196086fc7b6c12545a8a177868a5669542f0535a4223df155867ec6b30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/da/firefox-70.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4cac02fcb2efbe5736e52232b2cc6225572f9fa2518129d501b7d86d782177b4581d9d0ccd5d90131a1e2d676dc43ce9d0841f036701cbc543d379a24ac11fbd"; + sha512 = "3640a0a07c512e60e4119a683ac44cc596dc2a187d7f04a4b087540ca5deaba1c220403e398edf4c36247e92eef73de252d597ec082a7bc6e6c77e7ea799fef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/de/firefox-70.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b8279a32bd29f70e9470707c9d8843a39c9c7e95c1b732944bdcdcb1fc383d33881ab40f2d00ea36bf01ab7501a77e754dbd2230187fbb2eb0b324cc155a4412"; + sha512 = "58538f8a9a0d6e97d49c005f45dc1b1842c07a6923a556d98aa13b4c979502a329adaf7b1782522e02a770945ef3809dc68138e73736593fa5ed5d07a1c9e265"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/dsb/firefox-70.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "761e8e0c9414a8a72fac258d52729ad4dab8376e249218ec49ceb47311bd798346b57902671ec394f1ef2c15b641c47f9741e67c76f54684fe4639b609e1700f"; + sha512 = "8a0ca47fdc85672c18bf883929eef9fa56b2b3b79e584c415c76f3005a55cca944700d27ca23b2ac2051c7c130b42b3551dcd1c05ec7a347ce6463ceecbb0748"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/el/firefox-70.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ed8d934d5c7c3bbc1126f04de045cd5f0ed9a529a8d4f207ff115c2e8dd4e152c801e5a4aa0b37fc10dd8fd1f1e363b78f21b4930d49e25649264b751c1260ea"; + sha512 = "c29d7b350fcfc7b6b76b02ef8677a21800d786e709b5e1b886532f74c8c11696da0fbf2adf6b22fd8c5edb6ab312516a2535ce3185ca5334cff9d79974a4f5ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-CA/firefox-70.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "60689489f53a863d55cfbef67499220efb00aee32ee6ea7054f41f14df43c1b787a04ea374e0ab950dba2110b2728b980fdc46f97136614ef8b97eee210eb58c"; + sha512 = "d04571c4f4b4bfec7f8a0eb2ee2ed9e9f91c415609106a97ddde7122bddb8f8a25685e4bc6c2eed5ccbad2111bc3e9db6e3ee27c422cc1813a8bb1941cd04af1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-GB/firefox-70.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c3e10c0f0922e4bab3558cbb6be106278fa782b50a0fa5e38db6adf7ff60e88717af15437e48ea23b15762424d89a94361663dda8e02d6fdf9d6c19a5afc90a9"; + sha512 = "c1f39142888d46884a51b892f232f6cb78309d65a6ba342a45d4bc6f3448ae90bbfd77d44f0e1611948a66a63bcb6d0f0e76f2c6f5fc3083d58b12b6df7cd2ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-US/firefox-70.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "135e4b561e311d6132164808272bd689b486b840d652ae0ea4ce9a7096472836fe798309d0feafc1ab8cfb32b2c72b396a63734b4795e591863a5c89bd49802c"; + sha512 = "1b0eb7dd1995822cf30aa85749741c1bdea6cc98b4eaeb1d11fd94b56d2138a177428734169355257a165350cf21b72141386d6fcbca606e9d3bc11f292563de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eo/firefox-70.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "8991bccfb8cf10e0df6a2288968b334edd0b71a4030c0e008daf124b6e5256d73dbf5b5b376570852a0fa338570a9d286f24ef63dcf039842cd0fb1eb5901695"; + sha512 = "e03f025948a463007708099a6e19abbd5a3e272eb03e053c6dc7ef156b1e4e83d68ae02bcce8f19fca1409e96e07f88a36537e08dcd73f1f289cd64a57b3aafa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-AR/firefox-70.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "57a8275cf23e29a9a425ce23ef3bc787596df0dda95d5dbb2673bd658ad0bdcae3fa554cf51899d5a2719ebc218b70bda176c3467a01a7a4da7a60678f668101"; + sha512 = "f48d98ebd744d4915ffb6f0cfaec981b8177b0f74297224555bfbfa7390dbec29eae93f4dd3ba51bd84dbeb71a4c60519414f2a4c3d75b7c96b59610e30e5f9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-CL/firefox-70.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "2528855037d5a843895c639cb0d2b353784e59dc2103c4175e085f216d490ea037bf440bf4bbf926301143079a2885040c294c77b10f032135fe070b20e99371"; + sha512 = "f593020ba37d0ce81a194772d1acc2f528ed826b009e034e17d3119e482b0df9e8dd518dd597687e566d30e2a736d89850e3cd2487d7c723e242a12f69962b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-ES/firefox-70.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "4c5c6cbd1fa3680489bf6324e975bcea43429f7b55be853d2523daa45adf1f22772d0427f9df005c7e3c22543830473df82d4da818aff2ff72c96902d0b72e5d"; + sha512 = "081641bedfa1f4831641aa0029f8ec34db6f4965f9aff2c5344b779387dd887c2cb371908778d6cef6ccaa0448c98513b300244dab30f36f68776506f840b43c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-MX/firefox-70.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e2400bb17d7df8b0541de8c391b28d2b5e7ee9523dc73d90e9d10ec578b3acb58051c6bb510b18c076b7dad8a4b4a7ddb605db3af318022c369ea78cccf3c441"; + sha512 = "fe58f3745c1b0009e065979cb6ca451f377d837b0a41062e0ab04d435cc935d931d6e8200521850ce3161aed6f9583a67df14d0cab5853e491b1a433909947d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/et/firefox-70.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "ebb2bcc463312c187d2c5119c4e0e5580a78477be61b76a028a28791398311e0fde3ddcda039397c9d63f8658ceb7490b62fb6e69eeed34c204e60b6867b216d"; + sha512 = "2d1bfa94424af6f6ae08e11c99e83749408e9be1ac7face25d392c0475df978666706fd694b76558d824d226a50fa5f1eb8da52fd4ff3a1bb615bc83986ecba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eu/firefox-70.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "8c3796a5189f40324b2227750ea72b09397df750a154e1056a8bf9b7933a8ad6935a64be569641bd391fdaeb9d10cdd330c0ad031ea012e9a64848d8a034c650"; + sha512 = "7a192de6d021fdbca6764906284b4490653705147c56b9709e83c7fc087916197c954ac1cc19cff3da78220d572492800ea5773d3e03cfac6ee75d5e6d8ae85b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fa/firefox-70.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "239371297c2524142842dd18b9de92c8b93b7fff82c045599d19effad81344703c65cf77e1db4c665de2b565cfe5ae7ec8a7589b68ab25b5ff0e6ea90b7c4cad"; + sha512 = "427af8a45ae42e31ced616daf2d5e418e745bf43f87dd4858c983746dda1d52e1b909db542e9822c39019b13d1b47196c7041040f8c56e9f0712d7fbfba8b935"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ff/firefox-70.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "064babe379e9753394acfda8e1a9ccebbf1b980ceca6d0898e897b5ce91d06c74fe525c5c2ac34d9527c55acffac5f70a88ee5742ab363e3f0855d5d851bf56e"; + sha512 = "8a0627bff20eec56a7fbf6be6131bc004c12fd3033ceebe365a1367dccaf773c7c4f8592ee9a313a01943ec962ec010932d3f0fea7a94576372bb8fb735c90bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fi/firefox-70.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "411501345e1f1f9bff9d03f2e97e756d750cce3fc753be5572016de12bf18c1b6be716f39b0db87ebaeed6bc300264eef9d1624d82fd289767ac32c2765cc44c"; + sha512 = "b86da9c7cfb2edab970d91b098c5ae3da60f83a9b772033d8a8a0a4db27afe62f5db600a17a883561733f1939bb95342273b4c5c7e004870c4eabb08648b822c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fr/firefox-70.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9bd4161f31256e12ece7d5cc28eb78dc0bf2249a6643d6d962524582b10a520ce3dbb578fbee803f9f2fc301bd57adebb7fd6f9d3f83fa7c7fbb30b7e16960f5"; + sha512 = "54ad1fe9eaff331246817e2033adf54d5267e991ee016f96edc21b5c322a46103f72a5662df06da313a840aedd04f677340573e57b55a9a1fa611af3ead97e0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fy-NL/firefox-70.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d14d82ba14694de463c45aa32ab5782643233c12591a1c48732067a4366f22467e4c31d231164750722f2b6f6b61b2a8a2378e866b55de706ba83052cefeb24d"; + sha512 = "c13363513a633def5c2fdfcdd0327b201f5d6d04d0dcd698f614799ac88424d19612eacfc6325b11808617a3cdc3f92e5903d84cdd56fa68212cb1b2babb9a03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ga-IE/firefox-70.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1fc14f670747b47d6b784e7a4f1875c90cf566009f084e5923af853f4c46686cdd0d66eebf410a4d9f024b260af57151d281014303ce93226b95c20bf41d1944"; + sha512 = "23644670ee388362801cc4ca62fc6bf370d479821e0811ab493405ff3c8fce538ece89184c9d4f020c8a5089d3f7addd1d4fe298b55199dfe12f73408a988314"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gd/firefox-70.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "60bbe1d315958353d50dac327a358a3c1b52f5f93ea93262d640d91cf85207f47fc34fbf689c9efb60ff63b8cb8d7e991cd7edc8effe2277c8b70bf026d36608"; + sha512 = "967d24fee05d35aaf27be6ebbd3d31112126ee04bb750d3f17a2bd6a1abeab5ec7ee43235a26de5f19e5979c6d295e74ffec9f1bbf6fa32564f50986487b0455"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gl/firefox-70.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "dc13fa5d442188edc445c0a32e0dfe96d6320cddf6369c6a70af52f77ea375d98b596655cea8df02c81c7db4a8fec9ea9e48cef7579665e7c4ef89eef9022dd5"; + sha512 = "9976dfcfbf3d93df9c06a4328bc73ed5e1a3b922a8a616cd3c298d5955964ffda4e4fb96e85a23cb9c950602959e11d86f3d58840d475e5c6f5232992da13184"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gn/firefox-70.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "23c145e14f86300430479ab5253c854921672341b3ab0c5748bbfb1d7f4553a22f7e7c76ab3d48eb8110c9a69caa337cfb0c4cb66b53b3a267cb077375449897"; + sha512 = "155eee867cf421717c5c6720c2926318dfd7e3900bd42bbadf6947d291c3afa7b6d81610d53052700f32338e9fd4dd66ffc240ceabd5e6c6b6a3d5a18462b923"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gu-IN/firefox-70.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8738fe7c58893724e6a2a5b46dd888823fa0e1621639341b36b120913f28626f9ecc71e7ae54d16704a411f9c58908ff4ac7f77c8c4622f4278969ac7fe665af"; + sha512 = "82c58161e908a2dcbd10f8192aa9c89e220a5ef250d5b5037f483a415105946fad0527b0bb6ef3ea78b6b6a785064f116e17bcac7b2f45a1f0676e689f030677"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/he/firefox-70.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "09fc26d62b294e76662e005980cf54bdef3f5d0b38ac83da3fad4b85bcc0bd614651249caa4a37bf681a7f1ff03470e79980216f24d396833fcefc808ceac4bc"; + sha512 = "c6f8f8c144d6acdbf65a733627a7b977ae0b1aea7020356ad8e8e3d1cecc568c015d5e3a523df00bc94262b1ba7460f22de6d06421119407914c3e3856b91736"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hi-IN/firefox-70.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a51273d8cd8f4ecc4d7e5140daec8d834dbfc76567a62d92ac5a469da733a6231fc6c91e5182bafade141366936080499c51f6fdf6d61f023292c0fdda186507"; + sha512 = "3ab7baf8b0609aa76cc3e72daa5bb0aab1feb6e4957ab032cb0011b575ac4f5f41689466a6ea10717c14065c463c6469967848a22a76bf9e03e53e9b3aaef6b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hr/firefox-70.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "19947b47816f7172ce94fc1a91516520fad41fc09fb8d5c25828ceabadd8506a2d5dcc6f1e1f32c43c7afff48066bf5729ff9c831dd5f3dfe1e509a3874c4965"; + sha512 = "50be7cb19abc57bb3d3810bed8786c1ba8f4aa3f4c2d4d6ec6347b1cd263c724c6f138d2f95e579010c3dd893b432dfac169f964e78585601211de2b4144c02d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hsb/firefox-70.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1eea8f2b9904f4dfebb08c718df271adf3bbc9b7eda5d0109e3cc5e34aae7688e1e81769b9bae51c8252b3d69aa52a9b740e242137675015973fe2310dd4b92a"; + sha512 = "cdbf552caa9d85ca5cd2501a98c7270eefbc4ad31db3cfc8399dc5e2d7dd7344feb71b1fd7bc6023e74dd10963668f004c4c7a74f518cc849539d9f780081c52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hu/firefox-70.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "098bdd04332e0cf675e3cfacaace38a40920fa58660098e27483555ed5f55b06f9dc8e64b38a6bc6729d7e2ba39faff02a7f90cb0286470bbae26ea523ec5fe9"; + sha512 = "731cbc3fa44e815fb9e437f863eb218accd37a009e136a653947a5571440dd839f025b724c160ef3076f87285f51503a1a9020f470076a71dd246caed8f66237"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hy-AM/firefox-70.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3228e47d2e168b9b93bb96631345a41a0130eba87ff03f8b57c0a71377f011b208037df5f03936e9d8543d994872bca26a78ed19f12a52c723063775f76d306b"; + sha512 = "0be8245de7830aec18132d8a36d9eb48528070b09d87cfcd8dff78b0d26d79dbd2cecd94bf5088158253849c2690201e38766cf85719126d232932384c7dbff0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ia/firefox-70.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "7fc1f0b3d8a4957d04080de201430af03db69a56082b8dfc07ff6992b10e0c357693aef3e6f1231eb3d3bf135218f6e77e79e000f329da7c8cf9b144108c1248"; + sha512 = "09fea9073150d0b6464d0769317c94d397eefcbd1577b73bee9601fe3babe12b7533730383a56629c2470e39628f11f0d0fef36a41f3212865b2643ca2f00add"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/id/firefox-70.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "740baef5685aec6ce47740e925f0f764dfaac1a736a634c119bf012bec24e7872238cd128d19f2f1d59e8452f54e95a9c10816748b4ddd8b7e469f8bf1568082"; + sha512 = "94b0340e3cd930ba39520ad28198a108bff9ffe40e8e1de77bc783bcd211d7cb5017b2c894d212a7a024ceb69c681f76bf513a38a3cd40aa6f846afcff32b3a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/is/firefox-70.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "10566dd3e42d4499dd82900e160933f0d66773576341ff7d39ab6d1bcef2188a291856d9f3854f87f2086df77b914f9c30893446f4ae0f580d07613ce6ec31cb"; + sha512 = "68fb812f36082a9bcc41416a0ddc704c69ecd0e5d958d16c1171c7be27097342a57980692b1000fd13c1de893404fab0d150ce675e0bc4efa96e06748d392754"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/it/firefox-70.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "67e67041f213108d6fc2fa6fc5144fa20c8de19237669949a0be8786885c054710a5971bb826127c75facf65fb5a5175a349d60e4fa7d0f3e016eb48f434068f"; + sha512 = "e02f944ca83b869785b92a40a5e13f088275cffe26084f85f5d866ce5f9b0d0234e7a9fb5907e4f97663fb00091005ca73142d14f99465c3a8b1888aaa5784de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ja/firefox-70.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "24da0b3cb0f81b593563dc3eda3bf3559357d2f3f1b9019772850bc49f410ef4a12800e0a54edfc888c810083f43d74757359c82438498fe20853435bb7cc066"; + sha512 = "83611da83e6cf95dbbb3dea3586ac3fc5ab9e770a75a55e3868543c9f43fe481f5e6775dd45eb1cbeda06bb60619fe7867af64c7c8c2efc862e7f23fdd0d0ac1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ka/firefox-70.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9212744cec092fcf7440258f2d6c07f680b6b89bb73e804cca0323d4d86b4d1c7ad6bf2c24ae6cade056d9fd742fea5220847bd17203d319ef87d1d015af9179"; + sha512 = "94683999f9bf4ccb13dcce3f993291e5568a3a4f107bccae6f8b95a2d05c8e68a62e9d24ba9c60264c17a027f1848e82cce6fd143994e69e2000688bc61df543"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kab/firefox-70.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "dc48121c91f66d5c33c7afeec4218861cd8dc0aef232a4940048724541269a22ecf21645f032a51289cb5f362dda8b8073084de152337cefe21c3e4c97d0744f"; + sha512 = "fd1bdb8ff2df2e8c18ab7d13b1e07b128291b410607571426dce5054e8e6b221eadedce560c5e16d65ca2917910df02f74d6573323f7a26375f1ffcba080f22e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kk/firefox-70.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c64ae21572eddf9b97b0fd3c97d0927229c54f42af3fb65bb3a8e579064937b76f4e3ac32ce3debe24537dfc5d6aaf3615f1aec7289e62a043b1aac7b2df653b"; + sha512 = "3c53e12ccf2698778d579c09a26a522a038c4510d7af8fc9accbdbcb2c9013e12e243b88c03e7075ea76258abf2d234fe0ff7a06538f6d8e0f363ca3887617ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/km/firefox-70.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "8348b595287e8b22ffaa78d50bda5550ae027659f91c83317f2307e180d8aca29b8e58ac0b39787e7abdbd66ca88cf44fd937a6eea2064fa8df9173ac9978898"; + sha512 = "2d3bab56eed0ef36ee41b11071dc2ee0407c675421fb23fe095ac81ecc492813bac115d03b3e832c33b03fb2df89b37a6153a388b44e540d48af93234cd41888"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kn/firefox-70.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f7a2d48278c9c2da883f889c89ab83778b2d9a43a32ce6186d7b7c5428a62138689cdc3182fd851da4b992b51902352f0e28c3cf7c9bd9c014712206f4c21c11"; + sha512 = "b4dbb60f0aeaa203483a8c7c79afa9a9e8214b032507c0754b4320eabc40a39fc0a242709779faa38affc2e570dbfd70e1843d712c361ed9a3c52dca17b72eb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ko/firefox-70.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ef00c8295bb7598e0fd9a9023c4c404759e41436685c23ef0ae9c756bdd12e1cf34ae6cec4d5327807797128a3f54f105804445b11b03317ffa0e2495e262442"; + sha512 = "9c3e9876dc6363282cb302a65c3cf82bb14fb022e3f125fdad2e554d70501ef2b275826c4dcf064119463ceb93e6f0b8dab8c273364d1331d6ba5244eb0119c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lij/firefox-70.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a7927a14c82f8f095e36e5c1440e8e95bbd8906bb2945c0f8b6363b93290d9e3195c15a48d0a3e6ee9da44ff050c016e2ee7118f1e1f2c14bc234efa450fba4b"; + sha512 = "689c0b271e7efd6c45de879d573cd5fed31d1ee2445849ac3442559f11d33a500fe70e861b54b288cb84ed42434071f9da79db2c1c8f7460ebd53445079439ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lt/firefox-70.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0b382fe2188a0251cd0f45a4ca6b9e1e057249e01fbb2fbe76a34035fae4fd704f1eaeb75319acc75df1a94ece00d956b5886f07a0f5a21a5e00a6acdbd8f830"; + sha512 = "92ba0cf69d128848f2fc4dd86171ed7e4eb56c6dcf868d3918c7fbf41bb76305839f410567bb1ee7bf4ff114b858127dfb0320f2672560cb38141c88b601070e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lv/firefox-70.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "68cc69b2e070219bbd23322480cf232bce9daac37afa9b7a8cd4d8f512d82ac170cc3926a0245218b6bce0994aacc54d8f3dcb9ea0a7941e9bc3b707787ad04b"; + sha512 = "54587e5040c387431e94b4739a9e34020d7dce1777195122d513175b71ecdb44663c416fa648ed648cbf4f6279b7fcecbf819f6fc3a61155698f0dcff5f42212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mk/firefox-70.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "91fe3a635b0cbc401d5293c04da69dc3a59aafa062be8376e559858dbe9aaca49ba3826fb7486e8f12ebc582bc96a83268ed480b95324e008c77270dcf813f18"; + sha512 = "b7943903f7bd3783e5c3776d35125b19ed88e87f6449f25a5b26dead87407d0180cb21b67c89971d3e975d454098d22706c74a33d21c2888a90a0af9ef7b601a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mr/firefox-70.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8315f540933ef132f30ef28c744fba49b30fc4152d2929a7ed673939da5dc1c4de490bccca83a33dda2ebcf27624ad1892e93756555ee2da8395039ce76a5d38"; + sha512 = "07e742844231a1dc7a09a268501934c63caaa482ed7117d1a498c66b6f5c1d559e3b0d59cac06b9c3d358add59a13912af1dd11a6c2cf72d5cca97b68ecd1c32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ms/firefox-70.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "fa8272b4bc3d1a6a032c987331bafeee26b7f0881a75ba1b788171441a35e1ca95bf9dff46c529eb926dc867b524590ecb3262f2de04c0fcd8ecfad806955a6f"; + sha512 = "c649789abaac00c55ed415bdbd9c28185c56795754324517f5044cd753aedc004482501537c67c42afa616ddb5890a4ec992379fa30a28b8a492a0e559a73f95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/my/firefox-70.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b46e40abb59f4157800ebfa9e79a5aaf968fba405a77dc1c7360965d5d690139d8ce1f5735e6349a198c2cedb0a1fc90d3cdaa2d414e0800a7130de8c45753c8"; + sha512 = "06049a7770f621a9a72b5e563b485b81caad533410db23558679100f7a422fa1cf2a85233cc1bfd5d5b9c1705f8299544b4cbb4f52de3c73cf33bbe64cf845bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nb-NO/firefox-70.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "469a56fd2380f457bc84cb2fc96fa580ad0e7150042b6b9e0ebb27b29f315f34f8c2e2caf42284cc184531e392632eb52773be0d080f32281c540d81f3b63752"; + sha512 = "5f80bdb4a310d46cf5b3b36567964f444c75c92e19b5ae5cab81847b2b601f04ee3d43a2325b8bd6d7ed3422f146e90612785b25f982bbf95a86057344ae35dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ne-NP/firefox-70.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "88540a7aaa06488b3252e898cf654fe1031921e27e98525dfb5f44f770d60b43b5fd5450e5321b27b31e73e663b14fe98716f25b7db5b4acceaa7bee55f4cf79"; + sha512 = "f35496c71aa7efbab365e80050ef218fd4bad1e8c015bb97df65aa0e4f16613b531d40bbcf4739aa462077026259ea6f1d7ac71b10e51e04e75d120dcbab3ca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nl/firefox-70.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "5fccf7ad91b99aefce329b515bbe5096141618a96469912fd32f621c98be17acfe579cf03137d96cdf8d8319c4ed3d4b28e8bbe1ec2f3251b8c004e19b14b1c9"; + sha512 = "21327076b9196d799a40d28f1fea66f59944bbb0757fde66aba2b0f8b929a0d45a01bb0901c4b6eff4e0e5f7f033a44d2dac83c94494b7f95003c3dd620f1ce4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nn-NO/firefox-70.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7d9faba6bb18f19d9acab0c63bc4ffcbdf8eecdbe345943674ff2ac9545d24efae2cfeaeb34ddc8e6f24bdace18d6a6ad77d2ccda7518063ee1cea2e66382a8c"; + sha512 = "dc444e5546d1985d0ee4bbe2394e9e51131b46b9e41dae54c1402a9b08aa7de4a7d73fb57bd677af151420e71073ac398d28f4ae324b4e6e3028f01fdb98bd76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/oc/firefox-70.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "fc14d0fa30457836c0b41950df190f931c6c011a569f9160083665deddb33b6947d92485ed1e2c3adbad6a9bf51480d64c108de79a39889a87059020d0748f51"; + sha512 = "0c0fbf38f078c0fc4ae38112611f164808c7b9fbc4e3ef7d57e622e918f5c581915095d5bf7c92cc0ef9beb67cb04ba9b1ae1e011b7c8f91f23a79a326481931"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pa-IN/firefox-70.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "641580dc6260a863ee948e2fe7a814e7aee991efe556ca60cc6ff0074ffab369ca9dda05d9c3028ee22d000bb7cf5264dc56cec844f917039a7e2193b2709142"; + sha512 = "b9f07313118ddfd5147866045e047f9ae7cefa0116d86aaf7f5dbaa2a64bf14f7a56bb748e115945d04aeb1dc4572d54b3d122c1e775062ee1de366c710726d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pl/firefox-70.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "467b4c1f71cf5732834ec482f0ee1afb3d047b4a25c6a38928fd9199fed3598e94eb34ee3da7d552e3135a054d13423d94dabb430b19d00f73d0c99d6ea1df8a"; + sha512 = "bd1e920304e1bb7bf6cf198c5537f1b106b1484b7ecf683e1424d208b736d2a3ab40c7e885a385611ba6f033a2ae4fb00cf6113810a20dd8808a34ceb11c7b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-BR/firefox-70.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "af6e8ea04434f992a88c8a2fde33274776841bba274b0249b21f3ada6d991fdeff53a5499e0c92ec54e4f1acbd52b5d8226af89cab7641062d73cddfa56602f5"; + sha512 = "e1bb5ca89ea0b60cb2997b9dba3fdb25e90914899f38a51d4506cb9bbd3d61f33d32ec3a9d2d79857d339f107134a021e0253b6a54916b48b6aaa5ef4aa08638"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-PT/firefox-70.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "238852418c739d91ee6213da7c3fb9be47ca2c2f1ef13e459ebd7219814c6052147a9b8c37aa2f09155a15c84f281c20a6f23b53acbcb20ccc92392347970816"; + sha512 = "622bab9fe052fcfcdeb4d12b6b8773ed08e14dcf51fdecad24a638811a2f25c1a1efa13d7aa45dcdf06726eb366ee78c4abc7d22016303a9048df9af314c14bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/rm/firefox-70.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "13f001cc46a461176557a14de16303976f6f6cb91f778d6c9f1bb6f4973f2ef939635c28c64eac24ab2318abc558dd8b7b1b71e3ce71d5422c13fa0508900c49"; + sha512 = "b02769fd926eebc180eab8f3ab9aab7d2a8d78d81f51116ef156865c74b60ac76ec75656455557dcfda2323c3dbbb438f8979de64309851f5b77c01175fc4b24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ro/firefox-70.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2f454799772e92899a138a32702200c8a261e653fb0a9b588e312091e5acef92362eeeb18bc26ac62e6ca093f1ed07e7839010d07396754114a0b989d5aaec07"; + sha512 = "572204e2a2a6d7535ce36ba9479f1fd634069a1fd9799eac6a3e5dcf02133859f4574ab7dc36018be88e53ab5a8bafb561e5994d013c0b9da7c9ea467183bb81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ru/firefox-70.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "efe333e4abddf173a87bce8e3b82a5112a2d36f5ae690c5ad09ae668804ab3dc67a6ca3fc4d1fd49ad9591a482a5e617e4f897aa6ef59638920cd97e863d8a92"; + sha512 = "42a99586fa8d07827a597c83fdfc746beea7504e800037efe0e82b65868dcb0e1ba6dd2aa401dbe64a30879d521215d180bb39906ad332d9e362405036da48ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/si/firefox-70.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "245531ae683a796db5628becba71ba68e389d8d9646dd678a08327e41c66d2f1baf9ba223ac70d19eb110d56cb932238d1642ab129989067f4e9fe87b8d73f19"; + sha512 = "288b629c23e7bd61b64b3f5947a93753ca780906b537d1f97892424c7ea9f890008370f5ce44e74062196558e9a088856236c98031996f5d9b40b454827fb1cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sk/firefox-70.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "633c280502541f20572aaff136e0e7a2f4ca2bd2bf8c286703688ebd1fcb4516933ad46761b9bf90da033b4085985ca96e3224e8fd30d6b22bc2d531ec9195e9"; + sha512 = "47b295382b39a040171ad46268da5005173a1206a3ea26c7dd8138d287ded24740f031456dccd2fdd72266691aa2d893ffc93211ebff2759666a643e3e448915"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sl/firefox-70.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "0fcfb99cfc7be32f2ee53ec3d5d3cc436c6d423c3570e5d2564bd9e662d2e1b13339e1e63a702943b54de4374c756fcae5c6ffeefb5d63a962b5e16ce69d222b"; + sha512 = "fec91027bc619c7a6d0092db4493e40ab31311191117e1cbb39bac33450c9f8705356405b6ee38b52201ba39e4da8141505759f891c7e6ae3d8d22f9ae29a629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/son/firefox-70.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "da0321adc6aab116cdfbe1a9e67bca1e4eead2612827c783225badeec0c25af867cad573b16d4c9e052c325e922c1cfdac506fe77e707a7e554bb2268380ad15"; + sha512 = "8a1eff23ddf4391e77947519a5178724ba9393370669bc05764b971bdd930ca8ef9ede4cb0ba60c50daa2214d4212c6159f7379e16ec9a5c538ad8d7d39f0ff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sq/firefox-70.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d3f30a04a94669b0a4cc2f0067b6f15431de64a8e27d66f700274f498f4a19121fb3008a23e14c8e6949f9c261bcd4669a0afc613d4c7dc08b3075cbbb61dc79"; + sha512 = "3811b809979c87996b8db041cef14b7987331067dffcedcedebf36b9b9569c70088a38a624361b25ea5dde2af6005fbbe5add558cde41d5cfed7687a2bd96847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sr/firefox-70.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3c85221edfabe9cfc95a8d73a7435e8a4273293a4ed79d925059f12f7cff87bcdbf6b48779377bbf828fe3cd2ec841c3e0720d69c6c97b5727c27b2d3a08d42c"; + sha512 = "fbbc294a2f387e6ac44e4edc1a9b9a384d3677abdb6717e550f774d731037d0a7ce8036f25229efbacff75423e9a185423d2a39ac951c77ae62653097bc9ce26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sv-SE/firefox-70.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b88eb668b293a98f17956fcd48af915ac077c3f5c2fa0dad895fa4c05c577f0c56fae5ed2b4eba22518c979ba6af768ed92d8ddbd17e49a96388f36155388e98"; + sha512 = "0fbe4d264e97ce88bda435f7c8da09e589407030945b51b68004b5df2c0994bbe294a87b7a18a2e03a8d1de05cccbe2f23ecc59dbd1945c28b80c75e0ba45c1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ta/firefox-70.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b70452ca9eaaca80a4cba956037e67e236d1663a6a009193a4e78f80bc77f5d2fe77ee385ce6ec27d1356cddd59017741aaa9f78f6c25e2b706064b0e22aeeb0"; + sha512 = "57b86a405d32d9ca991c995316d51fc6f9363dcdbba2d0d1d601f302afaf863911e035d30ad67751210b4e3c726b3734b62b63b7dab6cc2f69a172bd8c62493e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/te/firefox-70.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "57e762c6ca3f3c9ea6c6b0088971ff8800203d38ca90bf65801a3d4f84f44e836d7454051e609f3b7bb4a851ba5c57a57d9781b81b872209bca2df3ee23283c4"; + sha512 = "54ac916b2352b545ac8f5a9ccea2cc1ea5b3e267dadec7bcb06c3db7406f4dc5f7479a0f2c3954e9e19d093fed849df50b45c51d69753626149757633039a4b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/th/firefox-70.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "4cd5b8a3b6d77f6e3653a4f9a1eaf36a93416f5c0e89c39c97863304227ff33363853d27174a90bc9d5e54c4b7d3c72b3adf2a09b2485655d1d24f7bab96f7a0"; + sha512 = "95ea774a8266d51054e7af4db09503963641981c8db332c8119e61c3d6349234aae202cc3e9726449454440f10f8ead17e4d6c682f261410937f7355cb7668b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/tr/firefox-70.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1f697f15c169a0ed5595699a20d37a3d6034d4ea2df2aa02dda2dc73b3fc91c07d8c344bfdffac5a4a6c4a44f016c9246dae1169c4ff7fdacfdf9d5093a4e353"; + sha512 = "44b70293b353fed9b8435de36178ef6ee3fea108ad4ee129a1631eb32714c06aa23d58064746cd62a0f407b1f0557da38bc749c3113f3ba1d1b5d049eaac126f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uk/firefox-70.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cc6c67520fa96593cdad128612a291e8b6c78914ddeb7088036743173b99dd3dd94a4670ce9e38e265591e1da95845f448e22eb8f0074877863dbf748f9967dd"; + sha512 = "ec6beef8f0b068b7c301a4a1a0c769b66ed5af08414d5306549b9b077592b06a2eafc175ecb097b9ab5033dad15344e52588506685222c14f73411a5fb9faeba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ur/firefox-70.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e22efcb9c9b36059209d40f1bf34bd65307b1319cb6c51a12c99684847228bc8cc139ee0ba7888e87042ac2b5866717e661b4f4e2bbd30f46dad6f18ab5c7df8"; + sha512 = "d1efd485f869b6555672d80057dfecdf7775cd45bde0711ad90dcdac8ffab4b46bf04e9350a0aa7629d9939c953f434e75b6aa458cc835e6cd06efcc7fa1bccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uz/firefox-70.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e27b755d4af110b3751de25925e95eda62037cdf8236db7587aa47aef099a055b5ddf1bf08f031ffa9c79142ecef49f2045751bb41c18d9fef9e0a2734440612"; + sha512 = "b7cae3888e2bc4a7b31a0b7313b7476799b16055f7af8e4016083da8a71f40f523f9963d79f53bd6a96c1bffe2fe2d34d62518bdbd9ad137fe17f4c175fd0f06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/vi/firefox-70.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "33617c205dfc61511df43de79c29ae8bae059e6d0d3bdc868a6965e98822efefa832d6f1ff514676f3531d4b5c89d8fac4da780b85151b05e2e05dd41ada3f1d"; + sha512 = "aa4aa778e35e72122fd857c736c226d62e5f6ec73f1075500728e90f9c2ddaf9c0e6033d1785b4102918a6db32a744617552769c29cedde655e9a3f0b173a4e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/xh/firefox-70.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "76ce282b86372019e4467d66ad1025ca6641cd8c5f4bce509def9aedcfc028b491f86cd5149a0496d08d55711578356c21ccdef786f910afe9b8ffa26c2c4c8c"; + sha512 = "41619782aca727c09262de57a128fdc7936cd4b3ace84565cf687a006bd462a3218682c56693efbb233df221c66b2b545cd701b025d6b3a5308b132ff87b35a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-CN/firefox-70.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1ccf7de81d4dbd19a9499cdfb3f286f86dee4451c5bbc5ce0bfb85d184b351e45b0d9289b609d3eca60ea32a45cbaf2160664511443a6c0d13d144945606ef26"; + sha512 = "befc922f6256bd8416758c4fcae972e939e645a752a97863ac0b432310605cbe46dea4c713d4ed86189a9f4094131fdbffec10b4d771b061335baeb180b75ea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-TW/firefox-70.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f645642c10edc2d36bd97bbf1b950710d1b52770717be35fe58b081604a4dba55b5dc417f1553cc6574826ebe7bc3435f0904754f5551f98f93d61023ca2de01"; + sha512 = "3bd89f88ca805e3b19edacb97efcbf50ffb2f4b3baf67c1d64d9c475922c6ca5ace13e07de292f95efc0f78bd1b0fe9e9e9198288c3d874263c7be6175291eb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ach/firefox-70.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "58b0df5500016a4c87a60233c8ef2d479937ec002b10ae53ee973b997c8911dcaa77470c8f0e6e3667cad5f2e4f11006a767040b0ffbc33d04b8a937087e9994"; + sha512 = "800146462c9bdef3a5cc021995ec558ba02fa1b5310973286d1360327aaa9967430d1432775c44c21dfcde6b06d39f9b7b7568661734f70f1452e78071ee440b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/af/firefox-70.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a9d47c62679e0c24a759812b6b194ae890e4cea6bbca683eb55f016a81eb05c207fef6f61f2ebc6c8f85cfb25d5f71f62b70502355435913094dfcadde81aba6"; + sha512 = "61b65cbb84523e3cf98e59847d07ec5766b2db3d5fd27c4633add006d428aed40c77f100dd87ab222b29d95bfa4cd7e2f7fc8ebae2fb4712935f51546939dbac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/an/firefox-70.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7b8fb37c1b458c9d04d45b69e3dcd054b14cf6f9bb3faa4c9bb978033e8e7fb67724ed8dfe1bce39b4821d669f9289e7ec3367a826f67ff9be81cbe37267cdf7"; + sha512 = "f9808793e9657622de595b529fb6341c13ded793177413ff5f829712f7054f42c98de5a5e153deb3f8b8f3b3fc8e80fc3737e1dc5ec577731744bd0e992d7be0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ar/firefox-70.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5ab368033e7281d7bdfc7d27b95cc7d28e8c5528e75ecb49e0b68fbbc02d2e3ff15e5c6c3218e3dd339ab2ea1531e47ecb888f7e379881d953667ebe1de3a1e7"; + sha512 = "9ab1dbce20235787d945f3ea6ada45ba174dbb9169f206c2aabeaa2fae8bba6f4cf55577c1985f59f62d2a302d97ad2e3d7b7baa68682e4ecf3b8978410b45ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ast/firefox-70.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2df1a20c28fe5d114cc1e0b0d95723ddbe4f7da2d38e9ae7a1cb43fb7808968472e32157981c612341d8e9ecf590b8d068f6b84dc3bd2642228b9d659a29e367"; + sha512 = "c5e4aedcdccddd1968564170d7f74deacec13e801bb19cb97ffeb7923924d66649b2bfcd0823d8e2b27b737bf5b0b558c57f931f1ff8b6928d2e2ad0c63d270c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/az/firefox-70.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "fcee266e1263300751f9d3829a41381cffcc82316d419cc5ad739bc67e96826cbdf7324f4cd5cc16aeb0cc3496c5188383810e311f6454b0c4794cb20b4a0703"; + sha512 = "d67fba709c62bd06288bfe80bee2e08f370824420b52b07bd0e8c6dccc350770f0710e22ce55f9ac4bf989aea74cc3db1ee026baa7fde967fdf14f8dd9694702"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/be/firefox-70.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "06f63c9f406e1c0ce2bd6400c30304a664b8728900a52ce1e015682596bf7488501da8dd6a766d54150b81ac287f04a058f110863ac6483c89348ca49fdbde4c"; + sha512 = "9fcf25f380bad5cea7c8fcceecd0734239bcf10d3081a22a24899103c96a388596135676a0769a8c2cdcce0ae7abc67e8a0b65621725de4201919d250bc28f02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bg/firefox-70.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "ff644c16c203058c37d7baee9d787d4373b3e0a2bca1d25330b11dd6da9fcebee5a93d038c283637783d27a216d062a0db84c462f9d858b35bc2dd26c638d960"; + sha512 = "a7a5818af9299a4b63098c102019134dcd74001a92a2d672d2c3c9e8dad6a58c28fdfd14ab10b96262ce34fca4947905f100a5d89df0e106df3c8b9a0a1796b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bn/firefox-70.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "54a33277a4b10d53cfc8f794ce1ecdf328f83ae99f0dfee6d47f9243c17d83351301e3138121f45928b9db54b2b9e63d0474533ae6644ca874b20405f4acac89"; + sha512 = "60de18a8524a67dfb90ee9d272ec06e70b4393b3ed76acc7c86a545af561b323710add4a4d8a896982dd8bb48bf3e32496fe800abf50fed509d91f0e54a8d04a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/br/firefox-70.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9dc72a4327bd02cfcb328bba9731ee90fda96e22ba4c46615ebc3ca0abe19472261386ffaeb06070b1456103090276c1da544fbb4c3ba8cca29a5f296fe6414a"; + sha512 = "61cca84ee862455860c3889480852df1ea62dfd9ef18209ca24fde83b3971ed7788811b4c6ad57a19d32525fa67ac82ece938700682385a4b99587959bc2af9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bs/firefox-70.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "34d0f109426869a9b6ead4d7509770f4b861590a028aa2228d4e4b508c72cb2be184a3734fc7e71b7fa0318e9b454a95bfb63314f0ee3c8af11339f1a3d15c62"; + sha512 = "45fa72a908bd24e6e8f35fbb1337b394850eeabc7d52252007a93f1f2993d4e43fadd3254a41664ecd76da29ed3b72dbebd95bf0735c71f07d9d19f3e3f723b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ca/firefox-70.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d4d442549316d417b1c013759b64d31b6fe1a55990b02357043528c5985c40dba1edd060cd58bca5d8233eb1a4a6b850bcd6cd297a81c9d6bed8f032538b9a94"; + sha512 = "53f9de3f0720b489cb7ae59c2dd2b7c0cbc6bb7306e802253562fb508ce0ff1415cf5b76c0a3eb085e592562cc1d39817009ba1e668e4c68f4ee0c8b5947cfa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cak/firefox-70.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c79a799abe3281b64e654f317de6956a1dedc4049b8c5f98aa41cd12d0d290018e7ab5faf411a777493b8e6e8d761637bad09db75edd0812cf8e57e49ebae4bb"; + sha512 = "ccac21ab9baea681bb170309fa3c1e7762aa731e49b831a4a45bb5a1477bf2582e1ea9ec78c8c63838589fbfe74b3f8e31653caf7c13355cc92de959b0d6820d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cs/firefox-70.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "bcc5a60b5795207cae1ffa2359e7668fa6f09583ea8904a73ccffdb13cbffe312a6f0bee62356fe1533f25d10b592d8ca620942f8d265ab0450a7eb42ba95c17"; + sha512 = "ac08d633f909edb3663d7e7cf5a27c1226d91a244786f941fc4fe771a7d5104183fa43782b8d838bbb50ee9342be081e28467b4dfaaae1c4b2a39233d5a9e31d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cy/firefox-70.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "221b4186252a507fce2398825039814173e55d767b1221835c0ced80fb19e4108006169009874c76176d7c39f25158cd9f554c7c08a18e1f2aca585c09054293"; + sha512 = "176f3b9699e0b2b8c7f108add3a07b90664e7eb5170c9669cb5b67f2b0a6c0b2a6c47cfb2e34494467aa865f12c12c525fc967761878b92e067baff2d6e625ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/da/firefox-70.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "947eae9a8a2e3761d5ee5d7d23d5edb2c5977417e0c812528116fe76216b7de6738978fbd561a0e78fa8e47877f880b63db5f92e4987814c69fd683f83b3dc82"; + sha512 = "29b8ccdfd4f202f418ce2005e5edff4f69d3c3c337ee78069ee9c13b9fd3e90d29b28ad2801d8133119ae3048b6a09ac8105dc4fbaf1dd8f267fd15bb9ed31a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/de/firefox-70.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "78e94aa258713c9d1d1c893d37b79062f6af8b7de49bd70857b77ed8a6eeccb8c6e452b9fcd35f726d504fafee49a7c45cd876ae7e4493bd1c11f13a737fd02b"; + sha512 = "c041f802e2c5d57f013f018e192f2c62271ee15f53a7bdc9adbb447f5b3319e4da0c9743b0cf8ce4dfb03e94d0b81e0f8256b749c4eb3ea3a3b9833bbee28db2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/dsb/firefox-70.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "041797c6567cc399d88bd34846092aa1af2e40d380d9c286e423ea797160e63616bcc3bf611c28e3eb3cfa2136db9db749f32e72141361064a71130db69adc3f"; + sha512 = "a6ed5dba712d1c5512f5e0e1caad7f0b0f7e2ccacd891bad54aee79cb749bb79610a46ebc75bb662352bb8419d8e0f047c0b0f8214f11edf8153708040188b5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/el/firefox-70.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "432d58b92a720d14b3df6cdaf685e471eef8b1f7b7ff7c9685304d99bb2382f4eb1eb0535105572d472e7887e880ab6cfe18baeb7f1660dcb59c432120dcf41e"; + sha512 = "987c29ca1d3b65bef9b5464b2d2c945cb66a6be671ce09b421218c3fbc6aeea0de6e5f7c2105943ca41b7f56d7aea25f8bdf4289eeff4618a92cf45c4234ed05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-CA/firefox-70.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "d7241e3dc44a5f66d7fa39eaf19fb0ba04f67ec1816cefe0dc2721e12df7d73b69d2fe1c7ebb24c2f5957ea3b575452ac6998bb9d9933d5ed39463d846b59d03"; + sha512 = "7e85aee04f790b6efe29ca592c38cd2962636d7b8b5901e1779fe371b7a8546f700fab25ae5a53d170afe67c3ac64345954b358965010e65fe1a63ef803dcfd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-GB/firefox-70.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "5b12a9bf265009d1baaadc0707042a4290ba398544249d39ded6f213dbf8274207cc924fe5bd47f416b0923d35559a43724a31e8ab9b5fbb52f0c8749d6441e4"; + sha512 = "a16b6b40a0c52c53b28113e5bc681b56846664899e5876d47b873816a8ee7cd309a1e49057b0bffbd923e5faa354f1f8ae4e01172ffb24062d7451fe361e8941"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-US/firefox-70.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c12dc9983539a597b00115cf1350007f9441c90e281ebc3d0d91c00bf4b260678925f52e4a1409f02f8b56d43f30191bd0eaa1ef29c3000bc3ebf1f527a5f635"; + sha512 = "de2716443b6dc3757fe58d42ef4fc526c1218601650ba7ccb0b0a9f77b7acb04a4e4af2c79b7587ab8d8e3515ca6602b563fb54ac5e102ca30952c39843c7d31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eo/firefox-70.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9429af640db7a461a66e67d7b35239eed02ed9ec5b96718c4337fe3812f93a2039c5c5eb365fc7ca3e502368657f6a33f7318b6594cd3767d0fe72314c4eef8e"; + sha512 = "bb0b25735ec9bc607661fed392c0dc841185f84b06410dc0c2b7a05245d62cdc4978285246d2b281b08507ae2de2b4fe561dc115d838a10e581e484cc12dffd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-AR/firefox-70.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "92200fa63eb1f034b80a28e45d4223e6a27a7d4f2daf07d9e1966f76927e0e6dc0da996c7528bf2dd87189a2b061adb6e44a540b7af6598923e1fb47eefef7d8"; + sha512 = "6161b532fb8412151cb007fe0fa679ff0f195206d71b4a07f8b312a28c0fa0041f32e960fc6f88f3c88e54a850a24d00dc370e8a3a16fcc5b420c0a9cfe2e674"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-CL/firefox-70.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "094dd4ff8ba4c4f5205f43b73afade5a210ac01824c3c9f475cdbfec83bebfc6390b899ffd44c395f379c40baf9254943ed5d15b30676bb5216ae8f40c02aec5"; + sha512 = "490f550d9091a70a9a693acd80f24cd644188a3ed0199781c5c04583ae2a66b623df8a5d1a5d3b1c7617a214aef09f99d306577db5bca1034ed1afdea8d909d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-ES/firefox-70.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "500400ffc47aebf23b7bc816be356550242b8655b703ddb992c18ae032ac524dc94513a81a05e4a593fd70e753a25c567e4c8089c341e6dbf374897d89c210f5"; + sha512 = "cb648224649c1f5a22c7b5eef4a4b4cb7381a76009cc1a4b0f2db7f1ca850f21ce3f5f4effe9e114f2ab55a0ca4a3f0180b5e7610cd895cbf1d8eff24a77ea82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-MX/firefox-70.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4d674f72fd150d30eb87bfd0bbd716ac93645dd69b0a8eeb5c57648077059436c6b071b4746a8b9104732e48ebbc8797c5981adfdc785500bceb99bb8b2a3190"; + sha512 = "bb5c9f06d2b17507f9036192558029a6068bc4b62c1403e228284722fd1011ca002b5b7669320c3613fb8362433a13a05960945c56721a220fd8e45e2908367c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/et/firefox-70.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ad4e26c6f7800bea6eec1be23e5964ae880b87e1bcad875c4925916c4b901bf0b4be3643d69a1785bc0bfcb35affccf2394cc2805ab0f2f8022c5bae666b70c8"; + sha512 = "642e8fb33bbffe1dbfec0caee8299051678c930b5b8382b7dbb27a139aa01edc737566b3b88444425296f29bedb30acf7e1e4bc39aabe37a4705271b0ddfa2e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eu/firefox-70.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e8091097cfbf737c775e8448e42866bcb167305e4d186b17190f41f45b12554fdf959d55be029c29915f8b3277d8d41192b740a65c218de84707f931f4e55bd6"; + sha512 = "b6856d8c07830809434528ade2e85da9577562e69e6753e0a3ba96e9e015642b77ee5cd913b017fe7ea96cd1eb985d8eed013c38e61078f37e155baf7d115711"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fa/firefox-70.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b6ea01641fdaa57026f7ad6193cb026c68392952dd3cb7e33f14bfea5762e04eebe23eb042e8b05bdef7a1f6e8bdcd7daf181f621442273f0f6a10f4d74b69a0"; + sha512 = "46f320dd9b746cfbdf6d41e6ed4fee3c36027a21bf69eec769dc656d4c4620ee702e4f6bd82a3121f14218a68948bcdc032a215bb0effe93d35b5f5e044152d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ff/firefox-70.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "293f1d5c58dd55c4a9af1deed28c3e89531df45b00e4ccf7add6e2e28b6eb34752e8eebe045392b1bfdc7a7287422ac8fb8f607822f13c28cbd7114b1a207941"; + sha512 = "f32d17a087c4fa5ab1ac6b692709b067607b5a9efaf8d15fdc3d52f9bf02db3b3e460fb1350ee17f583a8b32e1823d91aa472451598dbc3eba2774b953b32195"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fi/firefox-70.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5615e699341e9c49388e4db80d9628dc0bdb964a13885f5e5b070fef3c1a397145ad13b5c583305c52d6c1a5f466dfdd10fb97b05924c3220043da08b41121e5"; + sha512 = "ed4ce81ee0446841d989ea575654463ea8186e2e1b71e771380f2cb0ce6b2858ac8903330623be00c57a2a50f639ae320e794681647292fb6ed060fdc850d50c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fr/firefox-70.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3fb4b9aec3ee90cccd3f2fb34ff0665e68e7b55cb237e1760fbbec481748596f4c61c0e633cd1b5ef6993500f057fff74e983daa14343c820b9e3bed0cc90e2c"; + sha512 = "0b199767300180ed093b32685373d1b702a2d09587df3a4d99fc9f0d6b82c41b4002e83fd26be00b24dab4c1c3d38552d46676a5df52a69474f623ee94d72657"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fy-NL/firefox-70.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "47ab5c06277c1aff27a54e42e01501b6b33dd0452c9ed069d6cae1a19b551459b4988274ace92001a15409964a09beae84b49c356f9005416b2660a3c5b7275c"; + sha512 = "8e714668d8ad01ee6dc9cd5e5f607f393ec09434e62d1d08a55f4312a52b31591e64064bbf0da28e2e47d0c571e895e9061197ceb36d1ab5899f09de549b86c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ga-IE/firefox-70.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "0df94004a3443899ee641ba604174c996c03ff091b0e0738f5a61e5e30a2627e2d3ab468e7cd71065c6585f3eb450a9f0d6b9c82f997c8ae81aa9e891adb2dbf"; + sha512 = "4156af0bb459848815ec4bef7b91f69328cc44d9b23f56911849098d4b30422f013ac74597dbfe6610df093439170b5566e87a290e33dcb6b32d5e2e95525622"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gd/firefox-70.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2fa916963a8ee51ebe2e4e230efa2bdd36922008276ac6f67de09eea1c44b53070254e232b9713b4c1884e280727609c7e61d169219b8f56652964c7012e85bf"; + sha512 = "c2d188a2f4a63f9cc106b2dcb64d3277aea07de0f4290fec560927d8ac577ae57c0f6f9dab998833a51924f1f4eb94cbce9312ac7bc69205a64fe766093c0847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gl/firefox-70.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c4eef282b8e1658ef582c3d3219e283d1c741a00dcc3b3fb6b29494c7d0098ff7574cc92716f798c98a6ce0cb7e8362ab0b48ec1160b62520a5bc5cdf582e99d"; + sha512 = "c9427d99935fdfbf3b5ae3b0e9ab9f2b31b0a7b0d5b55b14effa1fd979d5f32b73016c939821f1db6eea286047334486b017b9000803e6ede4bcd4a564e89c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gn/firefox-70.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c6e913c6df1765846191e7979655b038d3a4b12e44812be36876380da49b646b1208119f299818fe4b4ee67f2999f3c5e442be40ec8343a2b6d6b3fcaa6edc05"; + sha512 = "e039e1bf1f0250c1179b3bd185c1a612754f496d39e087059bc485af6a280c15cecab6e7869a63357c7b0dd713ef3efe5ceb6cc4c1f7334fc67560722e63b523"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gu-IN/firefox-70.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "348e13f235c3c80b28717571916d2aebb7d0a6865d6d4577f651ed3061dd66bf02a43bdecbda879b69f78ccd9a8e2de8ac96f3abe49b87562fa6c6c398c21b2f"; + sha512 = "9a8d9a076e521a8b5a4f1cb3c06538d9cfcfbfe32862b48301c202a212beeea2d888964d317bfffbb4e4b5a56ef06ff2acda22f0b129a2521d23a5234817fcec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/he/firefox-70.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d0100433eb4194c415249b1adf984b4f3dbd8a11e4785008086603fdf1a2e6dd8d319e76296d0e5d9f9fcc0033b67f12d062b7ee0f2170c9e74b1cc73d55bdf6"; + sha512 = "763c4dc5241d3ec4337c17d4f7c7ef13667ad1a7ace2e71b65ead7fc4e771ffceb1eb1772c340ed8349cf401b1d9c4fa7f4e16031f5227e45a8e813e08437159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hi-IN/firefox-70.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "91807a5b65da4bd3d2c801431cdd5922617433068b85ac4f3c87de9e3b881239c9ffbcd6d426ee4f88a98c4fe706f2a03b105df4b124d9fffc029b158fc15105"; + sha512 = "a6092b8f611976117489fb9a860a801aac9fd598394be0b42e88091760a7f05c10d04d4e90b228a801ce784a981f4770c78e544614a68c2d9a0e8ab13fb89ff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hr/firefox-70.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3e0d747dd6e79117799fbbdc585c73312c13a21b8ea7c0ae4872b66d4da670267dce1942b350ad00026e3258af9da362e81c59e791820d3341c49ebd0e3816b1"; + sha512 = "ae2d26a2e98cc180699fa5f0a8fa1426525db4ccba99a57841fc8499e9595f0231de7802cfe347a81906d3abec3503b624ff224b1392ecaece17468ba12bad9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hsb/firefox-70.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "777ad7021020da8d302192f56e93de358af7deae7a60fe5e9f13a3b3d98779e99c4f23b8c3a801b0154f5ba35528f5800d93167de0fa3d397108df7f7ef23a58"; + sha512 = "0524a4f4ba2ddd3143f9f95e07749aa5f8c37c8f31cc9030f220a99d1a8d270b61ebb63ee3118edc79712f3af3f1795ded34492144d0dcf1857f04cbb3cf3451"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hu/firefox-70.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "651b0a70264ef15320391311ce357e944fc1cc59a7b68875578dee031247ebf8566dd70c566c43f94773751b73e783f1cbdb3cfadd0f9d11c302bcfdcb014d0c"; + sha512 = "64f4bd68c9a62965162bea7ca4bcf15369f9d3c69c0f6080d0bd660202f2a546f39835b8987e26da3752adc366164b451f842f2694305bf60a2b085749b13827"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hy-AM/firefox-70.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a3372d320797626169609e5e2d97a72f8a54cf7bdd106fd41eaf2d8e6ac8cf0615962b3cbea463aa412badb5ac02f7c1c04cf7aad546cac73caa2742e7d985af"; + sha512 = "6d33a2bf17038e24c323bd53372974062fe5a11278eb535518637ee68712f4c2da93a3dd3378161f1e67efc51a06c746578af10f02c81fd25b747820e963b5f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ia/firefox-70.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3f3925da5a9d5525f4427155061cec77307139ea61eeb532bf475aad3bc47f30af07213d26500ac8a2287bb81d37ad2bd4490626afcfe8839f94287779212612"; + sha512 = "0e4a78c9c03e7d87a934023cd0608426794f3e9818c7929b1e12bb300cc11d576334396c1125ceda555907363288726e286f6a376d6e301f386854ad3b437d35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/id/firefox-70.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3a698899d82d3a10a7c6c4e2eb61706896c73182f16b1752404a422d2731ad272052618e87bea89455eb2ffa410e138614c2c6285c1089bbc830a0217a0c9cd8"; + sha512 = "76b89937f37aedf1534b8e06601c9d59680426a55b3df3726318f438de1ec259c335876a1da31c6996e54c0d9efcc651e1504f764d4b426db2f0d97a1ca1e9ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/is/firefox-70.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d5cfdea22357a74ab7daead5a2e8b5aa16e454f0d63c569221bcdc71d8960f45780661cafff8c60499fe50dcc49d967600096e1d2f44bc1f7f649cd3f16df8d2"; + sha512 = "17c164cc5a95f3e89e2bbddf58442da84dcfe784812163b68740dd1caa9ab823333c3188abf579601437217e0e9e58871424d1227b4ade6a0fc77e5798ef9099"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/it/firefox-70.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "92da285bcd16df6a1f61f9ad7a57cc7eb867013421d61cee6a5eedf26e2a518a1988b53f6a217048eebbaa78551324a391f9c52e03d475d32eae513a4c9e2296"; + sha512 = "ae37e92971d2f0c6ce322011e66c2857aa73518f1d4e8d26c3c2cf1d99bea8909ff2541146b6789096af5141cd927dc82f91ffb9f7eaa0fcf4276d4782e72a97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ja/firefox-70.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "995903a57a7fc0f41c3737e570d61a1fcf226054d7c11be982d66ecad685aa9fa6ae6ffef93797aee387b3b442fc049f6329b5d88de86e7e809529ccf817947f"; + sha512 = "32690138d8c3dc2be001579602269ab5e89b7509f6d289a4cd0fb50b90e7a9a61ea57af8b064f904833504f0d523f1bab0a03f456fb75c967cc87f3e8e331b9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ka/firefox-70.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "834ba5046a53091f3b24038069fc98f6d40350a401ac811a75ee6053e9bcffa97d8b3210eaaadb748b328b7679c80783bde5cdc1d6340e80b7240174a3b7c140"; + sha512 = "6611137ec50a1a35b7ee3fa15a2066fd3231717ed6f7a4884c36306653226ee4211e8364e4872029d9b1967f69d10b799a4d58131d082f882e1b39e758132ebf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kab/firefox-70.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "75986a7f8dba13177b00a99f219fa1e5262015fb5688dceff96222ec1a2f6ae758aeeee620edc090acfa59a4870dd43ea181dde61a5a7e68e693e59af97d54b9"; + sha512 = "f06c8fb18639967870bd581d2757ea66631f35b167688f4693198f6d70d1f61985946216410c401f0aa881e566df5a0f13d085e1ee880a35fb9ed21b0fefddea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kk/firefox-70.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8cb2cfe5ba91af61096084aee42dd7f666605bdab54cd7304c6e839765e41e2cee627d34ed65b7162934b60eed448090e5c963813f87bc0805e79e4f92e99523"; + sha512 = "b22bae385110057cd77440101e27234afd17dc74602bf05763975ebc68e0940b4501ff168613fb664b2087a2782fe44a52589ab9972cfa44f9097513460cada5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/km/firefox-70.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "77d511c378a386c5567a47d4115fbc5c5b88dc03838a3de838c403f7b2d986b367e5cf43efd93749ac9635436f4ff1827ed3a59345a8897f332963f0cb12496f"; + sha512 = "7c49611ba0dfaed7717f385925ccc621f5313496235a90c3851d26f11ec183541553979e6efe67f36faf7997d1e27a15e3d5646f33ed884fd66e6553c93d7db6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kn/firefox-70.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "51646a4e9ef0a644266a925705e4e5d2f4488697c076f9156862d258bdb4ed2eb6b105d5b9047dfaf574154d4fca750365f86f0693f312f68d8984812997badf"; + sha512 = "c1fa863fa066a7832975963afbcf63aff6caf702ee8c58e2d54705e61b1863d71b81d7d0b9b8da7cf41d7c950a66820d8e1137a32ef91bb283ffad9b36b84388"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ko/firefox-70.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d122b9dc0c0d5f4b7d62b3f188558e0db25549cfddef321f54b53c66e704ac895e9c67d3c8970de1f4ba3e7ffdd47bac5a4430000c289fb332c1e3f9d5893b66"; + sha512 = "8d179e7660331ba4c90f666ad3792064cce4fc551144ae3a8d550f620765e43274ad18ca9eeef988c2a7ea612dcf82dfb65cf225f875b154a4d4a4c11e5d7a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lij/firefox-70.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f1d45f8a8938599b0eab9aca11b1a917b8be86a224ed5e2c2b9bdc3ca0e4532958c6cd3468c17512b718135adb4284074fa2f4f32e851ddaaf72535cff60d58a"; + sha512 = "e36bd824232bb3d7d7fb4779e3207cdd504d84861bd0b5b2ced6a29ecb9d16b10e2fb267162ca96452f52e8089a085021869eb107ad8ba5cfdb49f8e42e56648"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lt/firefox-70.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c6d7dba3ea655c9c419b5960f7d6bd6c4816a55e835470c1c77ad820fa48fa58a25db12dd26393d0eecc6aa77ee022d27ad4ba42779922a451297a35a65a87fd"; + sha512 = "4ec494f1fc2260d73aabd695a29441d12620a8118945974e8a0ca6f21a0e9e49bf8a6378d4409f26f05cef369c990e1432d0b11eec99b98399e994703ba286f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lv/firefox-70.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c5f8b3946e256c9d22b735e65987073776a1b7bfbc80b198e9a026f42b2d6161ea244d748de9948849d9fe3b760b30bb92bab2c459c8d925565f41ef39e916e7"; + sha512 = "3ffa772cecb4cea1c775b20b3ce505c2d84a9918c1422d85c5a2bde80c4b1432f223d828343af04c7c9518ae54bd7771e8144b66165aae1bdd140e068d0bda1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mk/firefox-70.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e847e1aceea05139b2f1884298d59bea6a57dc3f33edca3d0175e9137de40d8e9347116951a9e5e9f8acfe43b458bcb8744a404093d1857d0b42f72ffaad90e3"; + sha512 = "e8cf48b2e4a841c6101ab0759db844dce8865bcaf056dc0d2a5c43653bf86602dcdb337422a8149a4d4527f33ff79509d4c4a3fc221ca50c0f78fac80d7e45a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mr/firefox-70.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "92014b5413076602f711f3c71730ddd462b69bf67fffc104f2b18fd92189ae43a94c368fc4047c43366c3a15fca3cda9d8368631da51bd04f1c24727dec9ca63"; + sha512 = "a6be024f8c41f106157845fec1d5d4a5f81456d76f174883e8bc3d2f1d8dae327b20de89539980fef316baabdaf2cdf058dc91c12bbad1fefa0f374d66ac3222"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ms/firefox-70.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5c5decf31166b853e39b9a830ada9996778ad9331fb7ae21005968c1577daa156f852aab12e21da3cb5cddc55284b8cf0b439c205c0ddbe93b919de19567b7f4"; + sha512 = "4beb0656f90497f480a171d762d3b85260f4f7388847260faa15bf7835bffb88a2d44657401b5d0680992864b1a4ee8acf6a6f56d3e9f41b6704808f775076ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/my/firefox-70.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "60f910bc5a9cc7102bc6c9dfe8748e29d9590220acb5ef5c5b25e5c8b7186c6d17093df015df61296ba461c0a1f7dea139a94c4f920cd8cd8d770d0ee03d61ab"; + sha512 = "98c47dd55ce49f4933a1fd67626a6edaaa20b4945ffa21195f19c9676f284081d32de83047dcd6d0e7737be94deae34fd306484f0ea80527bf0e3117cb67fd04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nb-NO/firefox-70.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3b7702091cffa06e91d5c82c0d18468d09c6df66ce2e0aa84180db7cefc627c1f2dcb9fe889351d265a5b4a0ff49cbffe957a22b7400c8300642e68462e317c5"; + sha512 = "5d51f3e4dcdb82995c456e164bd4875e735029238ad47e7361c2af29c2c22ad43398279dad33356a858e054e268e846bdc72d8a82e869f12d2871dea8f6a75a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ne-NP/firefox-70.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6c66a05a2cb9d3224beeedc821874634049258e107820f3b1881a1cefc8d084091a418bf6c46400d56fafd7022979f324dde5309e365e06c9ec806a5020ebc0a"; + sha512 = "794aee0947e1a3b81534fee16e3d7efef9fe6d8eebd8ec18b8bb120b3a3cdfcb4929882d09e8ee15136f65d88c0d6c25cbf8570f86e8c0f337f86f12fb11580c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nl/firefox-70.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6fb7a1357f73852706906386572c1a04237a041890f4bbc6ef5c1a865ba541d6af86eb6b055ada442251e3dd7d4ce30a79ebc50ebffa3850c2bbee44ba866a19"; + sha512 = "e63f00aa526cdc8cb4eba86f4b920dc38e0a5f9eaef0a4103bf380f72b9fe2421aa4ee1417bca18da719ee01d57964c2edf21c4697121d70820686ad2f7379df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nn-NO/firefox-70.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "cdf167ea3728623fa7d3d9cbc39df02ba32750bfb61ecc9dfc574e9126c7e4b00c9c8fc938a6368d4f501d2b381eaefff9fb3024d4bdaad6f853c924fdc1b2eb"; + sha512 = "d9e30d8d820ef5b07f6814cb5e37e3918b321968229d33911afa815ea6e727f4d3b505a397b60f1c1e679dfb79f9e130de450c10f8946035153f535060b9d4cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/oc/firefox-70.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9e5180bcb7195b7064ea10046f1cd044e6d287ce732be1d6f4c0a3c5adb2a26b951d76e92866a667652616bb7853f5249618220bad09ea2d32b8aa71131d9371"; + sha512 = "94004a03a0b07fb91a30677168d19ecfb29d5613483da62859cc68d9e392f94ecfd87f29b5f3c44cdfbb3fe067216fe4f6db997da2368aeb289fb7b1d83029a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pa-IN/firefox-70.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e0ad213505bad75ce2947b0bd501df174ef4516916bef43e083506721438e83f5a35139d5aa661569ec8d955eab87973995e29ac077c330af53e9647cffbd825"; + sha512 = "5d4d9952600b81a93ed62314a536d91729ff6a423ae9359436e632c9d807b13ac19fd6b1d2034839450ed5ba5411b91afeb52d0cfd74ec84a1924b6036563b74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pl/firefox-70.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "9e84080936bbf5e7585edae2b3ccdd1d9a825ffcefea7d4399f892e9c2a18fab580928e74671e14dbde3ae0cfb0ad081f6ae3b9cd9ff1df3c778a8d0f399e11d"; + sha512 = "6f3f628b38e06494d528c96071c0ba0738582da37f16a4a28eacbd17aa7574f1ef795c662ad09b8a15637bc25fb6b791e1bc54b3d530031c66450f5f7ba3ca76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-BR/firefox-70.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b98aa88bf2c9207ab21708c7fb72be8256a0c89df32ed51202c9f24fe232d38285dcf7cb74017ce50e7eee22f091de494793eab15c36ae5724d393f49d70d78c"; + sha512 = "e97eb866f17277db6303c58411fb5f4ef561884c0e5437dc09d3da63145107a8ba5862a8d965d4c5ba38f40930e82c440ae1a26b023f6a212ce177c77df72f4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-PT/firefox-70.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0afdbce1e0c0571a31fd5f90e40bd088a3df479ecb40c851750480e917fa60150d00a35a32083a846640c2c9ed5ee455e1a71ccf2ba226f0fd6899c2e22490b0"; + sha512 = "81cd5a4c5b2a89079a45826f34ebd6564a929e1ba73dd07efa7d8a8b4958a36fa083377bd0e7b6b1e86a83a749f1117f3e7f2703961e668cced5cbdca8e95c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/rm/firefox-70.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "224c878a035a8c3a5fa6baa45964e676ee33bd5a52273f7da755a36f4d3191fb11eeed10acdfe8e5417eb2ce55fd524206cd8973a1874073d1b1c936a0490f5b"; + sha512 = "2b78c41faea2f3f91be9c21de826e5e8a2533a76dc925458e2f75f085fbce71bda63dfbaedfe988f29ef9384a0ecbf4599174a210269c6adf3f875d227374385"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ro/firefox-70.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3c07f89c0b52a0ab59d1820704fcd65c4d90cca95a4cac212b97697c6a25b918cc7cb2d86eabb4e58aa961e868c21ce5350aeee2ff2289b052fbaf9b1f1d461d"; + sha512 = "d01b01df0d9e25635b85abec0e0ac081beee02a97bc50b1902b271aa4ae5cacb410d7b9644d76785d54622553eeb8f4ca4f85e40c7867c6f99840de570974a2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ru/firefox-70.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "747f637a451e584e70414b11a5bbb65cf45a55c4491de0f0877efae6d348cffa3c4442235829474d1609d05749d3f785e17f6dea041a318dc504f795d312a88e"; + sha512 = "36ac6ec95c9c1e3d5caf1315854324bd0cb41fd6e83dabd81d3af2189fcd111ea7ab8a384e5a07f4618c9046b8f59c3590c6bb8d1a12a2475d19d7d65940a26f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/si/firefox-70.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "43a5d175b3759863ac557a69c6650bd3d7a1b2fe4747466a5e5d3b8eb5570c5b4d9ac18120ad5a79b768731409f1179fffbc5be9e6c171523ed5e0b71945eae2"; + sha512 = "796878bd3a982443558d042c64520d6cd65c1eb247c6630e1c1073c75be3a2d3e3d4f164deb44336ff536c6a7a81650c0806de79cc3698d6215fb87ff2ca50e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sk/firefox-70.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4c11c5e850d9dfbe8285973acdb85de064b9009df28b974dc482c8138472c8555c6e44718d770f561805a8dc4d600ec77cead4d217d76f412b1128db4dc3d31b"; + sha512 = "48f3179f9ac81ef1c69a44540adf994874a91770eb1b2af51804a791c10540485a61af2b1fd337f7cec86682c5a3df24e8e030add48773459b8ba7caba6e88ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sl/firefox-70.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b02dc1cbcd8307fd803d477a73c7196fcdf4cc7ce7b250892ed0cba61c2003c63454623a953a0186359e117b0ece427d977561f04d29757d2889236289fa7fe6"; + sha512 = "5ca3ddfef139448e411bb226cd2abb3a8fc4100986a294bedc5bcc4a1906a6b0ab82f6e3d536dfa66e404bd5b7eed671e98cb22f1d082764cc5d3080fa0363f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/son/firefox-70.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "aae03bccc5904c2b50d4bdc4bdbd0995ca8eeba67973bbd5ee5488606c2f0759b88334c500aa2b48edadb2c6ea27b16452db29a6647377de87a6f6d054acf202"; + sha512 = "a14b7a55043d2aeec02d1f28f30038e0ffbc3f76df1c5abad04413673d5e6d7290feab39e0ff40bfc35bf993fc49311b0cca38735c367da233808910c2a864f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sq/firefox-70.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2c9708666b8226ad9f2c107c3c9c8607942781544a6eb9a050915d5a55712fa5c9bb38a07581e9781c054a4799f4d677788cadaaa30dede88b508771da20cbeb"; + sha512 = "ea1575fefd6ffccb7a6ab428663de5e80b48062e13d3424d05b5aa3b86972236839f6a0df7546b5ead27be0a40293f2e9d74472d2756d9fa86bad18d478993de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sr/firefox-70.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b575acaaa5701c18fbb90cc71d6627eeae41a0ac1cf42327843e7c120cb51e7761b54669eda69577ed2c3c8c98ee9be66dba65e914283e50afb058f7b94c3487"; + sha512 = "8c5ecc59a41613ac259e1f1515e6475fada7cb7c33650722ad9d36005b8aa173afaab254eec004be082bd74406c88aa4754dc3f4dd131b9761fc82778a7dc573"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sv-SE/firefox-70.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "728c09e2feaaee2faebe8bd6a42ac78685c98c5d0065d14ea9d29df1afadb429f9d03519e9256e678f63c29d59f392805ea8843f7df8d25c3d42c557e91feca4"; + sha512 = "f6446ff3add515a7fe46af9752206c05632cb95b5e65e19c331556a6e4e304f765f8cfc9cd90fec2892fe7302230a5b3b85c462a557e7074e255ecd94befbcd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ta/firefox-70.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5415b52d2270d55c12254ae4cc61cadf0b743cda3ec80f36e8e5ced2bb0599abfa37725994f680165c3803889cc04f218dbd2b89f3011bc41a8f1fe204b1a821"; + sha512 = "03302b3da44fa586df13d2f20faee5da5e82151550498d7c0e0fc70efca8a98db47443bdd0289fe90d602ca53c1e82c9f610cc8432fefe5c99878faacd0c9153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/te/firefox-70.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6361e327a8d71977488d0b6e5d4dfcf9271dc4739b52e31a979bcc686b2a6f326065e88ebafba05e38e6628955690a934c02b510eb5ae0ea15371bc309ae43b3"; + sha512 = "49b3921154e909685e8e52a892a2af322e650109fa6b17bcebd62908e71b5b30c0346905c2422124629d93e1cded40b6f81222ad4871057ac482c1df7ca3b53f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/th/firefox-70.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "883fc0aabee67ca6098a4e860f58018bbdb511aeff8f1ffddf8c012357208dd2156ef0fbea7e92f2f0fc0da8d8a60d913ca638742c2b6511fbb4d943b59cb944"; + sha512 = "497da9beff43403f2b09da713474dde509ea2a71145fc8006a852536e4ab71a83586d67d6b7238b3b0ed3d135db6bb2716716b959463b13d92935f2b1ee147ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/tr/firefox-70.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "e5f302af1bb937aa0dc0283a97a61588a7ad72dd46f74c0514645edbe23a5c25032a585230709fffe34d3b7e739797e4a2a33c2b2115f4623ab2da9b7c5fda4e"; + sha512 = "43762b9401ad7337e0ff00003a07d374271ab032a4609bf9abb1fc3a69ab578e45721395d06aa4fdf41e15a71bf503156632b5e3d6f94b5d6e62592c78a267a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uk/firefox-70.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4590f2774f1b119bb76c23b65103a635c4c51541fd9ade6ae44d997892f21015c71d8d718697acff6525420d6b2d5352d2f3c4afd3f35841fd7b207260c1ac2b"; + sha512 = "e10bbbf8a8f899f2a7b57bed9a846d6b490303c456027b034a750dce6b21416415eb0d9420629d008d901ab903e7c643fe7ad5bdf5aab511da9977d536d71ffe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ur/firefox-70.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d559ce617dd2da4bf45eed7a61c79703064f29ca473993fd2df64f8e7006a6026c70e732db66fa33f78e550eaae88da2dd67cfefa85456d7e9e8a1d28e67b5be"; + sha512 = "9155b7efa37b299ce74ed6faacafb354947430265a34fea9e101a9f0947a57a4a3b001bc7b583002ea08d3b7f33074926c4f6184b563fa5a1811b2b7a9b05fd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uz/firefox-70.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1770b55e2f8a7119d5395587f9f7d7fdc10f8c3c55f954f62d08a1ec3fa66600cecbe94cc7cd04580c1ba568ce5e839bac52e8c8b3dc654937e91a8a573db358"; + sha512 = "a3a3aeaa6cfa114e619ba9685dbf9d796015f26b9fbb4529f69d17f8c40c0771d58ff044cd4f97123096244f29b964f1756868e35b5dec3fb79f7b32b7a31ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/vi/firefox-70.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "754513e26d09ceff0957a5d520097b600db660657feb1d8484ce046e90e60d37268474df79ebf5a450436b9f6574f0443fb7d647ff0f5b045055591488e4ab67"; + sha512 = "167a38acc587a4479fcd15d1e47f34e0412e846a0689a119c1f382ef119bfab3035450326d086f6c8efd67a93300df234d53165609c47e94327b4415f40d88c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/xh/firefox-70.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2e2e353006a2ad5430a201e0b7ed793d439afc1f7f4114258065f58afaa351eaf2be32f3dce1401af350cdc5753fffc13fee856181e51b961d688049c348c3f1"; + sha512 = "6a0ab1589a56d6563431d2e5f01e6c01a65be6865cb4b4d52a21b6438727d378ded049730374d3400603286104e4e05f246829b9a45513998db6c9c14597d6cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-CN/firefox-70.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7b86f1c8b7d81b90f7b72b3eec110257758da38f7f3bca50006a339de5ca1075e06762f07ba29b23a0718c6014ee30564329276098c9f8569487b4831f7b5809"; + sha512 = "f3e20c68a34ba6aca4bffd07d0bc1e5676ef7f2d9b56aa175431825e90221255bfaa76e40a6fdacf812172317deadd3e3a29756331ccb09aba5804ae58d2ca8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-TW/firefox-70.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "1f2a59adb5f3e243629f54ceb769e032eb2274990a7f5feb43a0c7f2df8344aea31fff8cb0ab9ea2e220f68548a7266ea052f8c02ef3fc8bbeb0b5917a1c853e"; + sha512 = "dea1df5beec52f0d12e18907922bbd2f27b4a20c87874c199d04671f636fbfebfc1d64bf0c8935ae41c139d4beaf08e164aabe47da8be67d4855b1fb924aabfb"; } ]; } From cb7d0d226ebbd9eb08230138f7ffb87e5229370c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2019 15:57:18 +0100 Subject: [PATCH 195/283] firefox-beta-bin: 69.0b14 -> 69.0b16 --- .../browsers/firefox-bin/beta_sources.nix | 746 +++++++++--------- 1 file changed, 373 insertions(+), 373 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 02087ae01ac..50b7153533d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0b14"; + version = "69.0b16"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ach/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ach/firefox-69.0b16.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "69f7a54d9e458d67fc554e282bd3d25a97e78e9e1aef70db3ca1ab63eec572da1746ffd405cd722243e12bede511b98fe5dd6d8fe70d39660c9e08cdde5d5704"; + sha512 = "5fe26093cdffc6c3afde7438bbcde7fb24867e70b74c18ef287d5897e4470f2671fe30053bf7d9077d9494e9cc97a2dabb9938d4c99fcaf7981d8df7cea281fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/af/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/af/firefox-69.0b16.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "367200eb6731ecc4934f98abccdce40ddf4a73324162e8c76ac3903593f7eb8a73c9abc34d36ce7502be4f55e865a1cc39d629b9f026e25ce56af8d76edab915"; + sha512 = "2a1ea5564ac0bb16dc716f29f4f3a63f8029ba314e353ad74bb437a70ade138b29f58df2fb8320efbf5c001232253aa4a16f48673bc4c6e5906ce3c4c912026a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/an/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/an/firefox-69.0b16.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4d146e92193945daada5e3db6e3de0beb5b453bd237b07c036a8bf3dfa92894b74e0cf956e5eb5217cc1872794f7f40dc58f9b1fd21b2ff89c6122a580ef5422"; + sha512 = "5fae2f3b33d7776f70a4244c6be02a47e81000a9de91fde1a3d73be2675e1ca67a2219f8aeacb70759cc779b985e4f0698c625c20f895e75e28ed9c764c8c3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ar/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ar/firefox-69.0b16.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ead64f65522c0775fe58dba27df1cdbc589dee666e2ffcd1ffa84b2285205afbe86f6d6b1b59b74eb6add2dd8332e2488165d6af21819269f2bdf394d0a32c89"; + sha512 = "dd8eb0155a3d9489645c03c3240f5ca2c6ee0b0de7cd82e62aad1575e8868f3ec763985c4142078ef8ace86da81887bf7d1f95c2ec22d5bc73086e230898e7a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ast/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ast/firefox-69.0b16.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c5e1faa329fe3c37eb4b2856280011d8750f0c5e1cd638b409277826d612421b35b14682e553bab41a856d8dbb9104edc32a08ee612830b2292c991860c0404d"; + sha512 = "960fea994048e4c08389c7701541266e3631c4d70f604146189805f1ad606aab16ef9c2b28eedee82acbe0f42f69c96a90a041ba4cf95fec060b1d6c29a94bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/az/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/az/firefox-69.0b16.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "dd48ea7a7334798dcd26a9d15ee101936d603fc0f3374f6e36653ffadd8bb623081e232d1aef682caa31ce2409cc508a51bdeb6388f43d47b946e74bd2022238"; + sha512 = "8e7b6bb3fc5c6726115a0a20f61d1cad5e9a4e9e86e462e1ab6a454f5257af22ebf8dcdea3298fc1e9648fe630c36245f4c45ba4093d45e59741ceb882fc501b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/be/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/be/firefox-69.0b16.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "de23e64ae742d96ffefcbe3abe1a39f62dd1df291c023d71b361ceaa596e9972ffe07b24a10203497024b575b2223ea4bf695b6561717e879dcc03d7b6b8915a"; + sha512 = "919a1f9007599ed0b325e0b218b18fc803c535f7eab76068cf4e94fe1ceb4543d090d7f341ba5f4d4de9aaaedc1b19d88ddbcb5c329ed5650d2ebc721f6aa49b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bg/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bg/firefox-69.0b16.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4e4dcc3e755b6b721ea005043310220f67e525e4c2339f7fcf12b078c2e611dac8b4fad6b734cf7207641b3823fa2d0d1f271e71103f8cff184d6669b1b1c883"; + sha512 = "6746f4d0c2a73f99bc04c3b12bcf54e5eca7262ac6d54835a567a23a07fc91775db9e64d0c5accf045aabd5d4645a753413f934e6eac9dbcefaea30c944aadd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bn/firefox-69.0b16.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "766f354fe5a168b902fa7c418e0f328f0e95ef0754db29740c6093bad202caad443cfe02e5c3841fe818b1f6b9b53e1b2ae84e29d72346260b5a07cf5ca24ea4"; + sha512 = "ba88ff34405c92b907cc16e44dbd5d1db0b4bcf0fb75ca650739bf307a6e2270cfd69bba9ead6c260721857738165fbbcd4af44fbe8cb9d7402d97c32eb09532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/br/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/br/firefox-69.0b16.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c5457927947a378e3778cc01e706deaf02a01e6ca4406270d6e4f5973e0f00ea3bbd27aca09b65c0dcfa5b430c600ec1e0d71cce48a796575d9c469e44679d9e"; + sha512 = "e7c78c11b3fd36d7c6ab55ac9571a53615a595dd5c5d66cd3dc6fb6d3fb42a1b29dcc86180f2028502f25869c951ad3caedf4590a61fe525616f18d560d6e775"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bs/firefox-69.0b16.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "50605bd4bb4583fe7835f31e3f21186e6ce8738bdb55fc4a2832442cb4b21d5bdfcf3bae7905636e37c132db6c4561dcd93ce208a12b1a9c52d8d8248df2c4af"; + sha512 = "36a677f1c449ad58e8750323cffdea3200c3953b9fc6bf920a0439229eb00164d4c1199286d1f0cc47eb31b3fe7acf9e78ebc3f4a3f49a443d1425afe717ab2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ca/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ca/firefox-69.0b16.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "baf2c5fc6e752a5d3f8b2e5a39a89f709e3203c53caef5bf3d649027bed2dfc5191b31998074f5ba7a437c8d8f2c911b5c6bb653ac1e6cf1d2594772431b0c68"; + sha512 = "b78937e7ca4c7df19ed1c40a8b459d65176ca908333d7d19f30a377fddf836438cd750f2efeebb235c75c25f4a42a70e919c2c0061b865f7b90d71fe2ea119f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cak/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cak/firefox-69.0b16.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8117c621252a9a6ce9eabdaf7dae8ab9499a20c407b9d48bdc49b17fb72659889b038296f6af11e66a3dd5a9f6fcca9581396812753b7ea80a9299c1f558693a"; + sha512 = "ac21c01a6528790fd31d56f0c637a0cee8b4cd0938ecd18200c48f8c982ee6a06a36ad779f9cb708d0b8191b7df4480d62dd75cd2a4bd0502cdd862aa8e95a08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cs/firefox-69.0b16.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "7c9103c4938e57bfc7b47a9cd0c07e38775edc50a001fb24f91def01a8c3c7a3de1330173fd3842e8b0ec42d001d2cd5c9b4a4caf60613edaf331059d6cde524"; + sha512 = "09cafbad6acc6db507d5589f4f89f3914cb80c826de9e55d8f02b42c29f6e46d24f49729efd8c67b5b575fc4dd240d8b32f0ed69992ac992b02c8f2639c2b613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cy/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cy/firefox-69.0b16.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "10ad0c39925c53381a5e8ccc6fdacb3939e2f32c17a6382f6279fea32bebb8a2a43f326e2467fcb48f4df1ea96c445cfcf0f413b436814da1074f6f5b353cf89"; + sha512 = "18de3618d1b1fd350a8c826e57898f019e9c792e5f97521ab52ee940956e8e49a9191e361e0426412ca27e63c1e502f350c11a68574f2be37b29e43a9a63b25b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/da/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/da/firefox-69.0b16.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8bc4c854a68db46280e0e9d561cf507ee5c334f3ba70d2834906face0540a47b77fc45d526024bd106c233f8e5245f3258279810a9fc2949e5e24d21fc17ef0d"; + sha512 = "7fd40f49390d1ca844f31eaad74a419a28aab6f74cbad1f040e01ecc5b6691ff516a4d2c41c906e241aab54573580eee3b6b01531468cc3e35c4fa61f7b60931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/de/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/de/firefox-69.0b16.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d793e9da3997aaa0318d1b1c22586d31b65bb1eaa21049a86878fe32acbc75161f1a48f9307c3c73bed9d15808252e644622648c150f5cb52a1480a418921b90"; + sha512 = "85347a3419e55984769031850ec30f757238801cf8483551ddba35abfd0e2638c75fa358ec09705d28dcc647fa47ad37c4f545522d5f8aa54067fbcc232a47c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/dsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/dsb/firefox-69.0b16.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e9ab9d16d1eff15d049beb6b9293322b425e6da4fc1f1286c2bc785d7235b1d672df1f476a6949371af687ffa3af3b7cc214bb886a1147f96fca4b6821aabbdd"; + sha512 = "a8f24207ea3b763a3295c1feb43c22f0e502561224a4d3d342cdd7321bd4e93fca83293834163d9a6160e0fc4c6aedb60b4f72e172e99eb98e6b8c0cfef665e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/el/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/el/firefox-69.0b16.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "31cc046a58bbbbc2bba80131bfb456019c1b38f6a5efec72d140743e5e1f61b0cf10094d61fbd9f76806ea03461365a27aaf3b15531004baee5b431a59e32539"; + sha512 = "ca8a37134a897631e398448683e4805ea9fd10a30629c09f760b6b90b9e8fb6505adf3143031e88b7a189791f487aa0ed852c0a4911b93fdedb34cd0cec7b7b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-CA/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-CA/firefox-69.0b16.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "eb9b3b8278c589f1b693bae1f48d86a4611b377c3949d51d75f534f133d85436b277f5acee1bd419a3f24faca245abb5d4d9f9fbd95b2adf05c03af72f37cdc7"; + sha512 = "b2c154bf92cf4ac6a4021b199e9e8438b59e4aeaa5ca7f72df41bdf64dcbdb196d384775b759b867a717e48e7a31f457cdec2c20e3c4dbd93d3c440ce277d396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-GB/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-GB/firefox-69.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "03ba44f4957abf9e2c36ad394af34354c0674b8e20a7e75d40b516434b3428fc3ad1d42ded42bd0587f282637ab663175a217eedf41f444d7e2e77d9d08c0dec"; + sha512 = "73c0b07840bf816f093c90b9103a25d2ff00cadcf13341ff228e09bf939c131db3ade9d3be472a4eec3ca5b4131245ea4c788171e6ee42beba7dc1c7881da0b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-US/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-US/firefox-69.0b16.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e61379736128667d1b4e5271037b3dff8f2c6425678791ce2883345a672023665573177019001364324bb4b166989bcc475844ef30ea5a8703a949d3c08882e2"; + sha512 = "c63d7358887ba0d8af897063c5431c2bd404fb9708e6b59d73c14dd8cfa1a2137af72eb01dfe25b9e6d92b84d5b966693cc89f5446ed3410f910e2df3f92b6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eo/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/eo/firefox-69.0b16.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "081d2573b5674e28e7cd04f0e856909ce7b1d2d16ec61bdf99cc5e0fd8aa5abb3624e220d609bf7dbb0b9d2db6367d7c67a64ffc470700896ed7520a250d06af"; + sha512 = "0e4a373bac78d80e2849c41c93196782ef41a74f91c6319da690916138a78c20c9d26d8c96e5efe67a835185c8df77354b3fed5a62500e791634eb2f15909031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-AR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-AR/firefox-69.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "12fb861ad3e36473e4384f8574d479b2beb4d036dde78478b391381afccc1fb1e7888e08d0de366acc8c537f141187a0075438cf53601fd0bb4356ad7a76484c"; + sha512 = "ff07382bcc926272bc69c10aa7f35eee7806d94a18ddebfa3599451d002afdda739461aad90d8df094f56b9b8840cedef659757245d4fd1a8603ac25d2a3100b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-CL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-CL/firefox-69.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6adf0c82bf246e256db530a4abff51e6389ec5ef899abf406fdf78c2c81831bccdf88cf133e2b8fb5a4ce4d843b947703dcf7a5aa721a6bb4913b6d07d04dbca"; + sha512 = "201f631a6682c9aa13c511a0d6da256e2f207362264f6e1ea060568a9e597216407ace99508ebe820a348859eb72c6df7581276eca5040b3ee2e99e048c67062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-ES/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-ES/firefox-69.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "6b31621b8d8f0aa090839fb4db7c10618374551b04b66b1696fff7ece4de9cdc7da06243f2f6a0be931a201cd984b9c8a4ff4332d0ae8ad2a42e08fe0de0f709"; + sha512 = "76573a05de730de4c6bc76dcf98a21764c78baec4eb0ead45adae2658e9173b33c97132d0a2e5c95807a60a22c9ab2e1dce09e5b73ae2dfd905ced82ba105333"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-MX/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-MX/firefox-69.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e1efaa7059a8e7c4b9dabc5481ef9ad14235e310ee42a8f28cf3eedc1907484be9fec8fea7dfc76e11fd531fdaa4933b581425d826ac41e040a855a3d2bdbc6f"; + sha512 = "b619f5a2392ffa0b36f48503e94adf9cf1719911258e1752507f274078d12f74257677f3e76493fd080a0be08ca94964dc55129a59e292b1e2573676dc59e5c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/et/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/et/firefox-69.0b16.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f8683048d0b87c0dcb0d929298e7b6429540edcc9308a1fd8dd6c40e47a39011c9abd4fc495bfe9fa8702f68717cbb06611e6f023d43f84cda623e23b67d2331"; + sha512 = "951288cf8a5745e433332798b87ceb54e35d408ca9f4e9d9fb288192de430eb45065fe88f0858f1a71e0cbeaf87c85c240a6d350bf8ce2f50c8ae548cff71f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/eu/firefox-69.0b16.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6ec1a27c6d786d3af512f03836f1b795df14dba63c935274fb601228af012eb6063c035d3cd5c9e7b24976be57f0d62e03f7f136bc322e667adf8612cca08b25"; + sha512 = "78c856affa639c531d70e20b1de6f0eba59b33e403a1d24c3508fab03624b5c90db636d39b0c199f2fd0b5fab10fa3ecb2fced6cc3b1e8a06b9be11e8ec917b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fa/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fa/firefox-69.0b16.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "0ef5ceebf4c144ba6b6fe8c999f97b78f6bfc18667229a85ed2093fe3838d5b1f7213ecfd004af95cb18b2a6dedd8675d1365d6b9a09b2976a771d96b61954be"; + sha512 = "a835fa37f804055dc117f694d85ae8b750c82f7ba92976def927f187ee91330a3d0616c0915917d1d0ec3c295f803c0bd2bdc9ecae0230f9a6642e42cab0e066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ff/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ff/firefox-69.0b16.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c17d2f95b4e1441e7f5efcf597c7c4ca362aeb837debd788933c52d6803bfc987bc8eb218391dd71a0581bfd386e625eaa2f4e3ac678f74a9ad3ec4f6ae34ca0"; + sha512 = "ed3664cd4418ed5af133e00c30b3a9d23a82bb681c5d965fe00b4e2bf6ce4c777b00c352dca4cfcfcf5a895d7001dcc6de67b4ef0abb3967014c483437f9b1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fi/firefox-69.0b16.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ab77f83eb23cc32fc5bdc4bec4f5c5710d53d7e46df6004e6a4751f9ba111366ee96742862fa5b76b438fe693b06245874ea9ddb2fa3575b4966bb1ebb66bf12"; + sha512 = "3edf6cc3dec21a48f914a754718a57cd495ed8bd9b807a9c4aae412a117ad1068abf0daf6cced6da74bd4887fe51746f1bb57dbc5858917ad17d8912cc9c4cb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fr/firefox-69.0b16.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1c78f9c50efbaa3336503c6810260fd9b8d7478fcafde0a54155fd177d22a8988e35edfb26ea9e3e0d6b37984ecf72a98b2928f14d39a7927b53c76df1d60bcd"; + sha512 = "9f92a2dbaf834f13f0f0fe2cff0ac433c01b7e8155a381d21324fc1e7224f7d5c0a8374a7e5e43f679232f565958ef946e3cbdacd3e711e34ae97eb27176321d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fy-NL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fy-NL/firefox-69.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "396d65f9647de3d46d6936143dd1173e91a2d023e82bd51d6b22fcd0a06d87e376f83c33ae983f3d192cdd34dda8f97b38a6a9b0a3c49dcc75db7ff913131172"; + sha512 = "f98eb4bdb595db2f688c25644dacddb2049fe8f8b21e83f8cd7031cd23587713f1fa53f39a0b444f6ee979901806811c16599224c6a1a7d17cda84b544ee1848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ga-IE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ga-IE/firefox-69.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c66a6cda941dfefaafaaa6e674110e4825032d468dcd0f299ff9795a7ade24e89524badeb27d6ee9decae81ed63ae1c4df1ca0f9f8c7f1d35d50ac4cc36450b4"; + sha512 = "eec73de53bce5c18ff0491d6f4018e3fb39471d3d63c6cf9527cff8f4b6b6e0a7e24e3b7fed58094409efee29df7dc35f2410ea05d5e916efa1d778926ab23f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gd/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gd/firefox-69.0b16.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "077423578f0acb3ab6dcafac6394a5a75110252532e7552e1c81976298fa50187cc9f93f43ff8745f2cf2e148f0a4ba3d206607396dec83021fb7c825295d02e"; + sha512 = "1d10666f6c563dfa07f708b058fe867b9618974394a5eb4733926429a76bb6ea59e7ecf6a2a89740cf2f04692186bcfcafd2eb6775c5b59421bab0a92a24fe41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gl/firefox-69.0b16.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "52dbe9d4f88cf6d2d5710fecc95f0ea78519034ffc9d4f111cf96e99296ae77617a11735dcae3ebff552ba1fe741c11f4f767cb9710e4fea4d4ff961d42fbf99"; + sha512 = "b56d98f5a1e558aa73ec385c03b18dc9bc615670dc5a539eaf6c925f4af3915362d2d072f29ae3bde3f9ba266a321d704c6bfcb959d47858a650ffe7fab5767a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gn/firefox-69.0b16.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cb38005b6db3b58559baed9c427d19b36550bae82d6b6049c7c705df67ce736a772f868d4d770fcadf37e7a19cf2d02f221b2472ea9fafe26d00f3ddb0798079"; + sha512 = "50a9d482efe2c22002419f4559d1b90fd5f368a23deddd78227b7d20b6a051870a997506a1de931ac8c45bd5d33ff9152f3a8ad41c735912b48dc0fe9c073360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gu-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gu-IN/firefox-69.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "776f81e4aa1c01d8bbbc7ff83f6c0eae549ca7b6b86aeb6b346280a7188704502c1f62790eaafda06defb73744930ab61aef97b9ddbe16581de2129da88c6eb5"; + sha512 = "8ce423880bb405240a78773c3f81aa08bf42b39c68068d3cc604486a96b44e7509c577b2c8f2285cce62181b7f11565ea6910c8871b798d0b6856765b16e1899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/he/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/he/firefox-69.0b16.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fa0a8beb4edc5363d339502aa132f257a6a78c2c96a5c9cf43ebc5522e43ccb96940acfcef0c06b2e9e5325860f2b93a5cbc3d77553e8c7f7a39ed010b1b69cf"; + sha512 = "6a0722861c63a414690e9eeb2456ee492a92b8b20f8fd9973c1580b2e3ef1bdb87bb7ca0d17603c429a76805076e2a7c4cf986d643e790b2b04c58b69aeb8758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hi-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hi-IN/firefox-69.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "114d157b3e2b4891544fd1c4496c8c2b2e697250c71210f0ad034c6eacf2b35157c18146ce843d2bd2927fb9e7f71f2854e8bda221d4af91b2d50df21747d0e0"; + sha512 = "4e9ba72349a3e58ee2b584b5d3ed5f601a1af7714104139e7dfa997921e6b7954a5cb7b78b9b8b7bcb7eb09da990116f844dbd96cab901ca408c2fd49303c35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hr/firefox-69.0b16.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "701470a4164010d28590f53008568b01017c4d0047d815f51b0fd1781c037f110c4fdec0820ef6ebda01efec1c0acddb7938ed40e946ee77ded662e760b2b61f"; + sha512 = "f53f4177603c41008d06f16bf9e102855273f53856e57f79967f59af64bd38f745c4d71583db50917a45a7c3bd64940f69ecdb864dd957798c2ce5b65f5a75d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hsb/firefox-69.0b16.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "625488b1e226d36b4995d81215128d647cb780062ab450a7df05c13edfa71ca5ded4d8d778876721228bb16c3545fcc069af692eb962d7a1028c0defe74a189e"; + sha512 = "f6044e9f09cf4fb64dd9d3935332bec46ddd783f6335206a51e68a411be57169d4a6388224da462d65090cd2ebfee64946626fc41ac3d779f53391c1765fa290"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hu/firefox-69.0b16.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5113917f0b5ac615fb68324acc6dc966a457262e40f49678c215184500cef1fdd300ddc18fd3bf62222f1fe2d00c916ac8dada8adf6060a2e2098cd96fc4607b"; + sha512 = "0178b084718079f1e6117f723e2931275a28944deb5bff48c3fc9d2548ceec7a6f019253cb7fb014b04e6800bdc62eded02b1ad26efc2eaccbbd2d0ca359faa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hy-AM/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hy-AM/firefox-69.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "70f989efad4fd4282a06e78a1a6cfc28159168428b24efd9d393f2ef7d02afc06eb3e52349797e9e5a8b6cacd13a2cf7e9bd0758dc203bcc7d0ba4a77a599b83"; + sha512 = "0f069f14ab5895b1242b0b583e2a952c9a794e363973f68d119a791d5777048849dad23badeef6f155e1539b06468a4b7b0555e0e76f137edc523d09b6a51b36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ia/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ia/firefox-69.0b16.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "a8f01c33f945eb0377f2907811db68d912ea2e7a200e362c311a9ecb5b8c5621e05364a05fdc07a35a438d0ffd8e56f83341561823fffd0aae7d7e9794ea9079"; + sha512 = "fa0beaf3088becebfc5e4f02b884a572fc86b5f89dafd8e79741fcddd331f1d667b1c2af81050b56121ff40a2c9077bc514df9ec2de4d165b536d5b17cf2fa29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/id/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/id/firefox-69.0b16.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "359744507ac8c7acaa18ef5b81b7979777e1e860ae443b93b8b510389e198a4482f02d10e86996ccf9879748613a5a26aaea9fb5affc7ed8477891dbfdd6006d"; + sha512 = "10bb29fb1f4a588f8ccde4e087bba1c7b405c44a9a79acb16d189f704bc31ba24e33b1c89b1879deba4d5c5da0a5f94ef69a7987256af6fbb6d7571db85a1bb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/is/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/is/firefox-69.0b16.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fa008324cb424c675bd5ed33eb886db661329254cd5809e3c1d51f4e530d034eabbdc607cc6fdcb3a332f5cf45078b0d49425c83e6985f9cc87b939c94391bf9"; + sha512 = "48229cafe81da44259f0768f1494685afe072558dddac63c6321955d852ddd80a3b8729692dbb9c6b283a302e6d412d7c8d4f48888a0d5a1cae12dc1a025124a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/it/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/it/firefox-69.0b16.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "406e361c1ef650cafec63b213f67ca016e251c50455866ac112039abb85bfe62ef6c56e7ac103afd87c05535f42767e937f99a045d456249f87187b00948cd71"; + sha512 = "1097ddf7dad776303b942bc80455c8902c0c0fe1667fab972754260da6fe45f383967b8bd2d51e845a66bc0728c7655050858722c1b3b8d2e8d0331c8f612cdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ja/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ja/firefox-69.0b16.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d1c5d95ec4f8ca8e46dbe90e6c16d4e2da7b2c29664ee878be09c8aa46aa421f91c419cee4e8db0aff47c768df49ed316d789fb20c50a04390bc63bdc5e5cdb1"; + sha512 = "ca0e8dd301c1e1f76acdfae325445b2ebf45a15be70febeb677d215edbff7df509db7a38409b5039aab1a76cc8cb235d597f5b87f02a96bf842ef6d2e11e6176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ka/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ka/firefox-69.0b16.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "623aee24ae26658971a1bc83b80fc45e296c9c17a82abf6956ea6f019db37b110d9642144c7c3fd05ee681a9953f9d4889dedb82c6b421d975d13f4d7e0c61b8"; + sha512 = "99a1ae878c93ddf52c96466bae92259a4e51791ae343574c09f99e5f1878a15d705c84323af6b2871ddbe14c3f4b7fa5cc7a45c27b10b6bdf5bc70ce3a315322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kab/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kab/firefox-69.0b16.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0405b91ea64f7840632b2c7f633af1ff478cee3910ffa32b6e49a87e4d7eda3f96f27eafca2c249f8ecf40ebbb89a615227ea011cd6269a7699bdf68b213f877"; + sha512 = "b2b6190978068d2d36baf58efff771dc48cbaa09e53da8d19ebedfec4da5ab6c9c1c212ab0a9fb6cf7a264565b1815bcd2a2e0283f912c9ae3ab5fc6dd0427be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kk/firefox-69.0b16.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "b8d170de3d7224c17e72d6c598f7d53184c0ac7437b93b3770df504789e862e68bbf0ba73727fb0cf8c3cbd177fd100c8c0039454a7c32bc33b6a4e05e1257df"; + sha512 = "3c56bffab7e32ba9e0a572df36c473e94a3ef7b84207f204b5fa4df1473e4f64fe11a0b7bf8dee4cc26db56e99cf21eeb17b598dc211a5d9f5b3ab3fc5d625b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/km/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/km/firefox-69.0b16.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2d6d79109681322c73a9ca4b544e5764a0c6312d98dc46403a1d9f62285ea4fc2d88900a2a2c67f32ac61826d59f684ae4e0d9d3c09a5eca0938292e8acdf545"; + sha512 = "6a33560d83232074445c0cb31949f0e8ed4ffb18ce9407f4f9b8f5bb9460e949eb5d302b7f58a4ebcee5d27de0bc588e7d047ff8a17aa3edadc0ab595a175362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kn/firefox-69.0b16.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9f143e23caa679ef6d7d5cd4abe3e078882bfab15cc18f1209b7a5b654208f5904a225eeb0be744de341954d076806679657546f2ad2560b5a7f8df1cca2d6ef"; + sha512 = "d67b40cb99923acd769bb10d824903dc01379c9a5245f6d9fe0747b58525773b2724329c64760ec1c18726056bd1f7d74d9e292b3173555011bf7e66d6169828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ko/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ko/firefox-69.0b16.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c1dc9b159da316ffc61a64684dde56aba305a7a17fe8a6ae32520ba950096e62c8e265bcf98124c45ab39ebbd6f9edf7ef63e8760b0b434810e7ef67eb9b7586"; + sha512 = "e932cf78de717646837ef432179a0b9cd41875b60ed5ec0c082f9b285c9899006844a61073689670449206a82c6a0bd72e076a51be1551ab3f757c6f0a060bb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lij/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lij/firefox-69.0b16.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7a9077eb4d267646bdd0890d785d6378e91ee4af4b41af1f90384af3ee1274441a78fe80e33de7eca3dd10f7ac4d1fa43d9720a931ff5036264f8c0371c4a401"; + sha512 = "d52ee5886f86e511f947366caaf2769c4b3fca87254091c395077dab4b665b35de7b66cf90849958bbbdd61316d5df43014a8c9f9bc9006641a40aa2e8d79f98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lt/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lt/firefox-69.0b16.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a9fb3b19c7413da23783dbb79fb890293b9f9efaf0e50ed1f7b13aa0382dc971da247824450338564303473f735175131b3bcafbde8696b227671ffc6e2d1de2"; + sha512 = "ea57e8db294d8b293a48d61257097caca093c9a2ed0b14b2d5c486de44b542cc546b751c2cca73ff6ae4945c210018a35ec61583f5b338628894117c04dbd135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lv/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lv/firefox-69.0b16.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "805556c78f01629f44dcd960d29292b1da81082fd110101e36ad8d41b4972207ee201938413c24b623d891d2632575862f42ad96271c18f13f4f50d12d8d06bc"; + sha512 = "66054fe532331c73b0718791d83f389ad369fc77ecb0904c6fe3f97310ffb4d88e316d9dc618a07dfd4569b3c746ac882d8b353484c580af63c59f44e8257c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/mk/firefox-69.0b16.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "ad3373da3f42c2d4960433da7bfc2717ca39c39a4f9e3c539ca72feddcbd24bb4138d0cbc790ad0c8d5fa64a652e5750b4c95e363e125d852548164062f590cf"; + sha512 = "0f67149117eef961fad9355fe61353a3a2ee15f19e92a592d6fad69e46ac488c26f2b0269f6c229df51690bfead9e85c1ae0489230ba32fb27609900a9725f57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/mr/firefox-69.0b16.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "9e9b07ddf0647977cf93d8be02eff0fcfcda2914e8c9fcea418dc03ed3bd0adb1bb71dfa9147d222866d9b86c2b2fdc8827304fb4099da6024c205ff9a564f8a"; + sha512 = "740667d86641c92ac299fd63700ad74dc4ec2fabb261bff9abfbb704e7181863556aec952b420f5883ab6a18e66d237d15636e2d9eb7bcfbece6227190b4b6fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ms/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ms/firefox-69.0b16.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a56f7c3b8c713b08e1f5e19b290fc1f0dd108d285b83fa3489bacad6757d02970368f4cbcad6ad78ef53c587989a8f96b23146024e705158a9c3b309bf530041"; + sha512 = "21ed058002c2c57c0e0e43658b12a7b257009814d13566d2d8a5164d0d3acb131a8c90f99b1e577b6d002f7e5019e296010e61b1df2c5d2e9443e8f55f20a4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/my/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/my/firefox-69.0b16.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "5be85980189d689fb1f16136c7ef0d427efdcacdd966a00c67527014588e62c20397483116e1728682be5eb6aea445c1cd3d8290452f05a32023ba593ce0b536"; + sha512 = "8273c4d0df0fda727465d5bd4b50aa09dda1c81b4e78e291479efcceadd87ad24f50e2dec1accc2783fd0bf2e30a2d9e775d44ba599384f0e8e4ad0b6fe08e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nb-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nb-NO/firefox-69.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "008908a88d4c4edf535b3cfc009140da760e40de0b14377ab79320431229b0e9b27ad745aff2265fe7d689e1391b3af3467a70f4279b82033380e3b7d234a5d0"; + sha512 = "492842b037b018bc07827902e76a117f9ee4620342af102f2753e0d898ec9b070412debc6f72dad2d899c3869c27d2d969bbd9a8cbfe4d0c10d85428d9c7f3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ne-NP/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ne-NP/firefox-69.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "7d7bdde40155ec5409b43cc150c44b6687f7ae8bbec411a5b1c257a0dc630d58c6dab289772804f632fece1a3dde5d613f939ff153486a8a38052d3f1abf312a"; + sha512 = "5e31871031f4745af8e050e18b1d2f2a16bfd18596358b189c7940a8ff11e999e44cf2e96b62404e481d0d8712f151a10290ec36e5903ab72e26986a03f93e12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nl/firefox-69.0b16.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "467e487abb563fb8354c0f3a3661951acd40c851b4f570bb9483580a9004758304eb35842b7d75b3a21f0108914487c56416584f02abfe0ec7180ccf0e9af166"; + sha512 = "8ca6f3842359e5a97445692747ffe0d65bead4222d0b2f90f86dc637a6e02a1cc75909ea03acb0c232185ad626cdcf2a5dafd27d578420385b7a4df353847323"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nn-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nn-NO/firefox-69.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "bd3ef206e3cc0f8674391940878f5b9bb9cffaa82013bd59d1bf924bfd20171df753ca51fc74f139c8bf4a977397ba8611cd90664de80b83a5eaf6ff3aec05e6"; + sha512 = "a64d50c1625f4da5cde3aad78b04a4e3278ef3aabcb19cc9a9542e45f0c82f09a63fb464c0b2d842e107f22ad12226655617023afad112292ddc22d735a25d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/oc/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/oc/firefox-69.0b16.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "5c955c03cb776dc6eb584d29197945ef22bc1be0074279947483750758b368a2a88f23b8412ac8e76ed209f37d35dd37f33726828bf33c8cb576cd5f7f51e7ad"; + sha512 = "1b873b5a90c8130be2a782f8c0459f853d3fbd340d7500550fc7628282b1e575d92a1d0af263665f7fac7192c22910e8338b66abda828ffecddfec79dab62fe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pa-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pa-IN/firefox-69.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "48442fc58995e0f97ab255307dd6adf55b296316f19487f35635df4252547b3d3da3d76fce995918e9885a5fe79a68c0e711ec20dd22546f5dd5a4a531654009"; + sha512 = "6aadc5b934136d99161d4f52df74653ebe0ba2d5fd1e2468c103b34862a331ea269c23956ad27c7883811a474b6f915f6076d9673ab4767e5a3b0ba44bd32ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pl/firefox-69.0b16.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ab5f1d3e874d4cdacde0ef1978202fefb71ca602775ffc5d228729a6ea23c47b0efbaa3c554290b90030fd5145ad4d9a2a11b8e22973ec5923fc41edd86b666e"; + sha512 = "b3caa21e7ebf3083be1ea13da68a83775a0713f6046994991328a293cef558abc523c43572ee98587c777aa779498cc5d7e671aac622142b4801386e2e1532b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-BR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pt-BR/firefox-69.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "55f0f8539a4439c9e78ba794f9837f89cf9470cca827b036c69098c83a9cef91a1abe5dcc0b350358e707b274944a81600b90022e52884d3f2c7f7288b4a7d19"; + sha512 = "f8b591901004a08c74a79cc4a9beb5139adaa2ba15261680c20c215ece1f1f115f0a71c4a2af2665c2c35bc3c5d3b5016159dfea5f603a981d5ccdc6b28c3b98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-PT/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pt-PT/firefox-69.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "23b9a79b6fdfae7a61a9efee4e0624a925bd234cad98c3309fe8ae389e4d01cdfd3c4f77cd2283f9649d87daba59c383d476d3f6d4768e580cf3905f5ef9a943"; + sha512 = "ba910b1e9e77a938f4208679141b24bae1dea6bf83a2f3a2778aeac59da1e8ab22ffe9333188316e170bff75bfae57258f3ff53c08774d00ee060de2d6871f21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/rm/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/rm/firefox-69.0b16.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b33e9e6a9d1fb694be1fb3990a790bf9fee990b1d45c8b3a318561c2417ba5fc0993349779b58aa2174f2fda9e610b0728a36c0d926a07f73275a5add8413f2b"; + sha512 = "0272ede3149ece3f87192f8cdcfd74313fca17fee53c3c86dedfe702c8157257f29931c14168ac11095f0b0def077f267f222919cd7f4b5ce020797c36c3c603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ro/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ro/firefox-69.0b16.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0dc002bd4872ed8907c0794430b44476e21d732624626bdb8f9cfd3c81b4b63ccd21b11456f660f58a05ffc91881903c510222b093c316f1182376eb051f5989"; + sha512 = "b58e3742fa43d52f737285c60e8b1237fea5158cd096450bb6187ee10471af0a77025fc526805c0ae8ddfceef7b7505dc637c8f72ab4188db31d0ffdf11ba606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ru/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ru/firefox-69.0b16.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "b29a6e02fb86387d1209b8aee76be34e5ab9e1848084d8f722a55bbc4f61801dd0e694ea6d284574ccb89c65ec0c12f395a97f4232b39c28ab7b75e730a436c6"; + sha512 = "f0086698a2deea24dd1510da377ed9094273a7867a920b0d05c6aa47d4f4c5042519d02c5977747df05a416a4bf94aad0a52a0b03869e693f621959a0f980a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/si/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/si/firefox-69.0b16.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a31294e1cb39c3949cdcf0b926edfd5f196e6e9a91e99c213d86129896c56b47e4f3a33b11c4b6b8d9d44a2b0fc767a87a67d9252cf1e3b4d2ae7f9716ccee4b"; + sha512 = "4b0018c753aacadac60961b1e4a793b6a0f36d2f8844ada2515ad8081822cbb869ba23f7a69143af860ad060d86e7ad157a41609c1fff0cf481b45bc55a23c0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sk/firefox-69.0b16.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f736359f8f3086d560b84070f35a2184b316c5f6ebccf9665232b031a220d3d638e85c67ede20c3ec5836ef12251f77f4df429842c824ebd6961d58a99ba3c22"; + sha512 = "f19ddd306e48cf04bd70b008fbbd6827045d332839458126ea16393b04e6b76dc8397ade3bc28f5798ef24f27c9dafb578808f3ede8808609c24a8bc20935448"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sl/firefox-69.0b16.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f5f0f3cfd91ca5a5201e3178a39d8ce0db3f01a36a4854dde16088c6b8423b5ff6e45793bc5221a02fe444a15d83078ab13ac48ae4b529144ac183aecfeb4811"; + sha512 = "104f68ebf03ca5165ad9fd049beee70658156ae80b62e88e2342e845ddaf5603199d3ad66423a08766fac2ea2db07766e66b9e09b9e480af4cfb08e680d5dfae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/son/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/son/firefox-69.0b16.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2ba05fbe3f440a9010f999bde29849976042f2874b6ccae408fea5e5057d812fd91879d5a288ccef6a4795101f854f74de794576706b90078e1f3c3887818592"; + sha512 = "4ba381efa38f56c60a7c9afd625514c2b93cd89dfbd3e99968b89b8ae57bc8344f5686f6e7c87d8b21136d8f72e4c61af617152d534b749fe0ee731220b60716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sq/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sq/firefox-69.0b16.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "cac976f53f72a5eb974ef97727a5d6ed38a5a4b8e61094f8e5d76968d6afadf0daa68c7d6b29a45df6dddef8cf26973e0ab1a65c29f906f7e404cf0b152c5e08"; + sha512 = "8a3a3b1a8a48e8e681ae7765d8a0e9fce8f87f3e12f4af3fa4fce3dac0ef74524d4a14c1f802233362969237f893e02d22fd44d7e032ce2f45e69abf8a18c738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sr/firefox-69.0b16.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cb87cabbe1a9d5910354887b0a6eda4ee055b823a0ac35bc414d41f9fae636834344451e3a882c65cf581d21e875b400f5e3e054ab053ad1577fe48eed8dbfd6"; + sha512 = "6ee469e7a091662d62250f17c7d45810f9db853571185364fd7e9f561dbe6e6582c13c5faad081769a8fd715fcb0230347cf88e642531a1d7e941072a2003990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sv-SE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sv-SE/firefox-69.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c4412a7488797482b3315a2872fed79ef033ef4fc32ea119e4a943999f5a892c430486a6e13236127c97af3c01f25724bd5ce6e84d4a9bce69d10b5ef84ffe7e"; + sha512 = "5ba63456a302baf31a03f129fbbb820a1142a83b41a44829947ecb1878c1b7723035313844b7ac5e950440ba1feac7f14ca1473b1acc75f4899fb2abe259057a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ta/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ta/firefox-69.0b16.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "55729c9d755d83286dd88642cb130d75a827ecf98959cfc8e20f205e6c4c3ec31a03fe0a6f304662beae68677aacfaf8b993a4f79dac79c2b8157a3845bb022b"; + sha512 = "b9f59f57c74ce57b80268a139bad81014494e9b2fd173be997c5aab61aaccf28f84d0eb1089c3abcf21fb62dff02b1b8e0176e0f4e3adaddbebc5452d9f9a07c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/te/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/te/firefox-69.0b16.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "2cd9b38b607b89b909216afc403e7394574e66abdafa327eed33edbac45eba850be22ff651b9581c53a7ab4735c29f1a4f2ee3fb3c220ef2f527f48d919b15fe"; + sha512 = "84130d585c0b0e80007c9c1fec4011c44bd087576d1e351bb899893797d4ee8c9f856dbe4b9f8ad37a2aca98dc46c9eb81aef1cc236947b672f7c6a978f28bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/th/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/th/firefox-69.0b16.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "721711be47093f846b42d5bdae36ce083e05ad7edfbd75a32827189c4cab9da3af0b34551d55ebd67cecf8e04912c17f2a44b032f2a9a76e926a589381f3ebe3"; + sha512 = "2a731a0294dd73b113983d70e4c5a779fdfd92a855e635655aec5e2316a32c97812dced18c04820c4332ffca63805af816df5e7a180d9c8108eb63f4339d8578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/tr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/tr/firefox-69.0b16.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "36c4b39480b95152795ebe744c6d1390f38540c3cdd19cfaccca40f3da446a5afb6c5b8dcd3bbc87b15bcfb5214870104724d645cc630c87373b78d89c7acf94"; + sha512 = "5e1f639a0807cb403bab8157b3ccc0806d3704e27d2e682ab56bdbfbfa488b71d454dd983f4c9cd1754cd1173ff6e14f097cd2c8db5cc7075a63b94871dfe94c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/uk/firefox-69.0b16.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4b388a81e67390ff461681587914ab944230361790f5b48676df5d402aad2a3ff28c808a2c8ecb655f2540c3d6cbab8188c2b154c0e173625b7be121968e853d"; + sha512 = "33ec6d4c9ecfeaeaf5659b809faaaf60f24382f2c8918eb4bba81231c12f0c8049bbf766fa3a41a8947e6c745932b4e908f158f6a532c473cbea3c6a833e8d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ur/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ur/firefox-69.0b16.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "43cb375b00bc335f5a5907796ffd84279799c8c907cf372968abb8a1e9c4ce4a4b9b199eb0384b548406a158216cb5e42efcc61836b5ece94fabe83d724bb26b"; + sha512 = "2b06b2b145593f6c3cb74b16553aff15b8d453b3ddfe6a8ccaf2cbfa0beec3274a2b04b10373c5420dc67062c246d484f099ca3dbf1fa94ce0dd6ab6533dc066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uz/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/uz/firefox-69.0b16.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "33c0922104c4f0d6e9a5860738bb5e5001ef24c047d617b86d16f9a8668092ca0c3bf88676c448947e4c07c3d80fead8714291cf9e947698765fbce65247a488"; + sha512 = "86b5066b07f8b80dc86873f2f418a4526e386f65711199008538ae192d9af06cfbcca1132cc95007b44a9ae1afb5a76de7a2c4d971b59177e097b4266e075fdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/vi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/vi/firefox-69.0b16.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "d4fc27a2f69dcda6832bd0372c97381e3c47883b2f9abdb21b67b2c06f392cf2e2e8aaca8f0c5f67da87f8884b7be8d407b49a3caa04dd166165a8623f621cf7"; + sha512 = "c474e765f85a145d4fd0c9410305e56fc8f32c6eb9c0ae139aef48e1b35ed4eda941c92d3030266d38738ea559088ba799db1c937a0fbe3867583beb4825a93c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/xh/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/xh/firefox-69.0b16.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c7d3c3975ccd4b2635f30aea2c2ef8e2c8197c52730fb60fc0a9adc5321a1f960565a442d73b68ab15367ff06f87ad09e463c8b9a0f871aca526716828795d1a"; + sha512 = "2fd1fac92f3bd260949c0851849424fce5ff56989e7c9486ff11702c85514929c49952568ea45d0e2889e806f6ea1556748b475646c90647a92e50716b1250fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-CN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/zh-CN/firefox-69.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f6df2df60e020f07aa210e373d177a49204ac35912172a0885e9767eebf64f660d2288e3d9d3cdf574c22c4c0257c955faabc02721c34c59a113de94674d80fc"; + sha512 = "b3d7786d3883a99ca1833905ab971aba5a4ed42fec451bd7d5664c329a4deb495afbf00975a7c9935bff42b42c828d830984d389a6b0b728586dec9017e37fe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-TW/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/zh-TW/firefox-69.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "70d1cc8904f27509fc476b59a634eb7ac26cbf53c88069b104d00ddc3c596384d75bb5522bd38fa25f2aaebe2ade7453505622110a36f7f77f19062a846f01ec"; + sha512 = "67d506a05c404911c3b937dfef3c696ae6d3739b3113ad288b46b9a995028d48ab7c7dfbfa7a735f453698dc1b58864aed7b718f3b81bf42d3e8114180743692"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ach/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ach/firefox-69.0b16.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "74550f32169f07e5d551ed20ddc3f24f731a18966f75f80d40187496af4bffd1b0742c6ca001fa263b236826f2dfc6edd21e724bb1e4c8c8260e5526e20d031d"; + sha512 = "8115dc00b12319c89463a0c97c3117df8109d68372ce91287bc382238d0f0a6d2795d8540bef5ad5c5215f237bc1b23e4e9f11a63ec8aa32b80e0a501c27f534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/af/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/af/firefox-69.0b16.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2d305bfc2ad71d6c37a3de2e4427417c5ca67cd97eeecda91c8d5a84d72eb7f02c6d11a857af6af673caa5921abe8420b673c4ced79025eb5a639f466e0cc8d7"; + sha512 = "1bc5809edf99dea1ecbd942e92879139056e1d5bc83512c84fd110b227c37f76997e1f2d00f4471f03cc00cecfe4e3e2e62af858641539c08c4685a6986baaf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/an/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/an/firefox-69.0b16.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0a6319ac1017a9c022da4d8a3a619e9243668090e8266b4778e767a9313aaba5c1d2d5174f640c3103220b5e0dc40ec4040690767062d8e6819ac0b3573ac464"; + sha512 = "7a1abe0ba440d50362ec550da3061df3d2e498f94587591cbed920c7348e2da6f8fbd087bd3fcda2462e18722db0b0c2ec129aee8562670af44ecb333b2a912a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ar/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ar/firefox-69.0b16.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "dee2b757f449dab23baa5ff16cdc123564650c48cc4492bddd36e7ef4f99608c2a4077fe7478d035275aa3ab2368b54e2e171ab689537081b09de0388cdd0922"; + sha512 = "89adee7c9ce7e74ef7890f3b8ddabea3d6e06c90db695f3d19af64b7c6602f9d80cc2c2c6d2958ffe4909d734507074f658cf4f04701e5ddfa9a9a9d4062e21c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ast/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ast/firefox-69.0b16.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1e92c8fb6965dfbc9dcfda7bdd44a8612487541930a0e758c0e8b8fd27e2a5984761a430420924adbffbc11f6523beb80a8995f1e6d0ab37cec9d130306f81f2"; + sha512 = "e20bf6a66f67713cb3225b8f8109c4d44943102d2a37571c3489b02d88d5b677d2465e2bd51783e720e5f31b59ad51a1ba7ba0cde723e942059080e840c63253"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/az/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/az/firefox-69.0b16.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e35e1e9a217a7a8da13297e7cc1d553b7a4698ddce0eef31bea85709c836f4ca5993cd4892bdcf0e61d6a37cf125a4b9b6a4df36cf19fd4f09ca63c802069bf1"; + sha512 = "30a25fdb3280a740c11f9b3f53f871fcb294e83377fa1f6cfebdf939a73df583d8806470eb62d3174603a29eba599ea5c6d5dcb4106f4afed18a899dc30c1170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/be/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/be/firefox-69.0b16.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cf65d94565d2b25ef90353dc686cc4780eeefb29cde142a735d10e8511e4d9d1db74ce57d80da35d1ad9b9cb3b8cb060fad01ea95b46a86231063f4559cb50b3"; + sha512 = "485be4d97719bb771e25ec80f84ee94b7ac5741baf4a08a06a02ca54fc915d7c2a54ead25a0abc9d40145cdb7c1a34ccf6a727eab710a29407ab5587f6a0e778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bg/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bg/firefox-69.0b16.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "09540c63919525169cfb3c2ef8d19115cabaa63b41b21de43e15335797761d1d452c80ebfce1768a88f3a0e135a222e30486708a8b2ef5c1327738f2d5bc8325"; + sha512 = "14b2380a52cfce2dddc48a8c0cd52ed31d01f3c46728aa866e0d05360f9d078aa7f59ca7bcc33d0ca7beb60c81780d5def46e1b05786164a0123d95b80aa100c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bn/firefox-69.0b16.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "47d497da9c178e675989b046acf7d35caa7a66090d8751090e86c5b9d9ddf6924767a586d43d33a7a093f1885f5477a8bc008e58eede27bd219e0acd6b00468e"; + sha512 = "1ca9adfd64c8194fcb7014cf48a87e171d5fd667515a972259e9bbd5ae436470a64c2c03a7d672c411bb0644bd962e41f60dd5385a5c04aee1ff7a2f5b847eb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/br/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/br/firefox-69.0b16.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "bb313f01a39abb6687b71314755be566ec6944fbe0aeb5571321032ee814e4aecf57fbdae9847f4e72a8844813d086d7cdb2521a09578ad04a0f31891571d508"; + sha512 = "e80b7a6ea23d381b416af92502b74de117eaf406f139705390b756c604b58fb874eab389da7d4adab4a14925b53dec66b768892a12324f2f57979ddf9b3fdff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bs/firefox-69.0b16.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "3b6a6e000d6887604696014e82c8668f4dd5e798287bc2e60cab98a0a51a4446854fc78a606615fd760f731c70cd10bade6e6f07fca17c5abc4e50d2c1cdb893"; + sha512 = "72b3c206cbf559784bd2adccf3a24f85f840e26b4975b3b0a2796ebd5c1ecb2bb00ccf6c1cfd7fedca191fae33f6abbb71d742e00e74aefb7b4314c91c0bf0a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ca/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ca/firefox-69.0b16.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ddde0c94dae1ef133d3312043271d7fc9d626900f5bbb473b7aa6c2ebb455d358736da2736271611f3e6b336f7c88a4e60d060101788bfc7ccccb9e2ff863259"; + sha512 = "450f99474c8f86c5af4bdd210be09a6c05d9638aa9efdcabc8a0d636d7965033f4b885fe6a48d22fd50b6144fe461fb0f5aa7870fecbafa9f1b8cc769465099c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cak/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cak/firefox-69.0b16.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "875439f58c7ccba85c6a59031d92344262de3fb27852fcc727b15ee0964d37eaedf6715dc5569cccd0f7d684e96052b84926c4b81c509fe456015eb67ff883d8"; + sha512 = "dd9396d37038bef1a0dc8b052afce384c83c7aa9ab9992fe6eae879b6721b251bed5c12f7b1599de86658e16829bcee15b411ff8dd40bd8afda29ae5996bb041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cs/firefox-69.0b16.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "c93a27a66889e2e2ced6dcea0495d9295c179b2aa2afc706196b84a4c4537e0499875bd2b2ec152a38d2c5afb5d1d45224086c2cc2bfa56907c9f9aa883deea2"; + sha512 = "bb722cbf74437cf3ac9f870fcdfdba191334c3f6970e1ab0b4d0da8257e60cce09d65177a4f81dbbf225e73b03a8616aef4289a27f25440e2526d96a501443b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cy/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cy/firefox-69.0b16.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "66059d9f6e059bbebf42ab3d29fc9103de639e5b1fd7f4b8b0648b98d86a030d668bf35852bbe83ff27dc3d1ababe47a74f1e37a227a61da6b4c90b12543207a"; + sha512 = "e6c0f84a810005f2081ef8cd88b94e689caf07c5aa08b4c2f9ca5d5cd071a8e37d1f572c82b262f3e26381a6097c54ab80bfc4a0d09924693937751c7a1d79d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/da/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/da/firefox-69.0b16.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a3943bc573c65a0c90a88ea76882a4b43ded06aa33c1bf1d861d3d6ababfef3c75104c7614b740860cd682c4d0cf3fdeaf54a41ef206f117ae8197a73431d362"; + sha512 = "d209f91aac27c9cc0a075cb51ed4f9d41aaa74a7407892ec45ab2ce8c09e77a725fa6e8287988cd53b0b681be785c04babe13e19e63c25351cc6cedd84156a24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/de/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/de/firefox-69.0b16.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2635e6ab49e4545f562043cc56e56750a882943ee160b3f2bcc328ae53bbeda364746a3d97cec3d84086e90b554a98184d268b27efb9e51255a3778ce1f5abf0"; + sha512 = "64b843eed8012fdb91fb6573e2e7e8900e3d3ce2c476a509e1171746261ddd1c15874d539e416d5c0607b34e19b01d56f2d497e4d09c595d29febdf3461094e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/dsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/dsb/firefox-69.0b16.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "aa44a98135e4e5b3f28ac37eed0103876a817c07b231830271c2dd44351ac43da9139a3adbbc8a6ebf0cd28c87e802db27632d87e7f5afb0209f4816f35273db"; + sha512 = "27801c40f75cd6824af2f6e583b99396c07baaa66c1aed6bbd7382fa85b7969ebedb6877dc0a979775ae153c4274dcb970401cf5686bf681b3858009eb8059f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/el/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/el/firefox-69.0b16.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6c86717c1ec09829567ade584c4f114d6bc92c9ba85a4583670a038b5616521a4578ad97b023673125fe85b9a99fc7c3999fb7e4b50fd75540386b6024d26c69"; + sha512 = "7c4452fc29cd4a2c6516445fcca6c470f9f8ee81ffd600dae225eab8857ec43593f85b182b2e252cd04f3a6279a86dbad71ba0c2e0b723cd6d8c4a354b3cc582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-CA/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-CA/firefox-69.0b16.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "90af2b18f403b7fd25bf5d920c3eaca638a6fd5c75dd57afdb0c9e1a20a8404cd652d2c69b63bcbf4365af88d1483f02b929d3b825899eb465c142775e4eeea6"; + sha512 = "53e7855ab3575799e96569115cf5882233a31e4af1e15009b85593c7fc086e85b7bdf0148694789b816e8a469665f82cb5f1448aa4cdf160a5f8abc97f92253a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-GB/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-GB/firefox-69.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4ff1dfe725977d16c23333b3f3c8ca035d4973fea2d7d1f49daaf75cf6597fa56690512636a19455e5fcda984a4ac887d4b987b45b811683cb65d40daee7b8a5"; + sha512 = "db512b8a4a6a46021e2a24ce0ead90d8f56b9eff756b9b1a6c8cc1290a96eb51d763d96c0475c7636b9ee9a88adde7f3c81eb9366e3eab3448afc60e2a060108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-US/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-US/firefox-69.0b16.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "851e15abeda5a7d9faf74950e97b2decd6ef989c04acf8d57833f9172f0793f9741d9f1212c2aec41f017c8ccd491a1dc973beddee39ac7660e63f2a24463911"; + sha512 = "eb6ed30b684c016b947e3354da57b5886b29524b57f4bff4e071fab5d5ae978b94adf0572e74e9e31e15e493098aaba03344b632d0ff71145f90a8e5c7e367d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eo/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/eo/firefox-69.0b16.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "623247002b82238eb05f4bc7fa6182aa5f68121a87af6cb78315b4f144a17a50899905d915dba41b5dc2d372ff97ff8dfbf0ed2a0a216c85cd45f65206ad23d3"; + sha512 = "b2b343ec5448978d9ecefbe1c73c94e8d578d875dffa09fa3739c396c3a09ddef4bebb7bf2f5c12b1bc39fdd3b8e89185c2a514422883d0e8856af854369a501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-AR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-AR/firefox-69.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fe485782e38e7f0b74e96e2e06283b6ad30223ab1cdc3636fc15810b327ba564706d134ef00ab0a38d4f6d5639aa84a52cd46af4726e1fbfc9eb2ec19ce1862d"; + sha512 = "fbcc4138161f11c0c61eadfef889a72aa691bc5b9db961a52cda092b638ad5d2313fb5934bcf2dd035f225971bfe1561acab549da61a7aa885191ca2c3112d7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-CL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-CL/firefox-69.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "8520600de63e160c21f4edddefdf8f971c12456a5ffe967dd02ca00c7227b34f6b8acc569fa0c0d40c6f91bdfe97683444eb38cbda8d1cb1ba2b913c943038d4"; + sha512 = "ff8908b2c09877a2c7cbb0842e826c51069234656efc9b7964c2432e3d61154596cd63864a3a6b331fec68ece3118e5cacf9014389806dff8897933d584c537a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-ES/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-ES/firefox-69.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0e36857acf8231b9be9983aac35b2090ccd85dd2f8cd7b37021f2d62b37b17eca4e29afa8afdc000ff608bc535b3583720c4111c6bc87a67b5928e25d1912f9d"; + sha512 = "1546d5d67b1b4c778d137b35189470c1aec01e617c2ea8b52bbd58c636b5e2a262db5a8f02bcfaa45ad1fef499d9c9e135eade38f3daaeab6c456e52458927e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-MX/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-MX/firefox-69.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4611aa1bf2f9717093027cd38e60afecd855f9bd6f5b90e57ec64ba61c2d3cfa38e94688e5b7e02e6ca40a9ccd03ea9c25543b03be297ab76a89db3395fd7dca"; + sha512 = "da8809ae2d281547be55b0d3db4c779758ecd5c2b8204f54f732708816fa1d653f593e9e0bb24136213f3d1e94dee6394e47326b74be2401ba59732ff4f8dff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/et/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/et/firefox-69.0b16.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "94d4cbfcab4dc697462001946eb91733e7c9cad2d70d1d7070ed6d6e4cd83f364338a70f313c400ebd9f17bebc05d8297e27b5d662f0f940a66e63a97e549ee7"; + sha512 = "7d9cdace25276f868e853d7b964d1fcd18b7109d4072db49984d5d00628c9910c99cf494304fc962245f8d551ca9f95a603dbb1cc48f655b724353e869237218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/eu/firefox-69.0b16.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e140a1bb452d2a970d540b764ba41bd70f4042f7f6f2d8bdc3407cd3d428e009815c3fffe4dafe3964dce45d860c7960d0818acc6fc8878e323b4fa1dbc340cd"; + sha512 = "e3f8db0d5be3fbec65d27c3cd4f2272fc5dec401ca19a0fd5bcb7b48a196e81752d2b1c6b72bc94b3294ee09eed58b765790663185973ab34fb7816c38570ce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fa/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fa/firefox-69.0b16.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "2ce77cb106e64e49b2605edd7f6ba19e7c0782356de0a38ee572e8b5f18020ff4e8235bd83749b578d67a40ac81b246a531e21ed24a944e562444344bb594121"; + sha512 = "5be17588077f86e6766e1c257b73e8b81b2213f3f9079c01539578a6480fd07a90d4129af77f81418b4dca8278c44bdf997b3e0686ed1c2e8e4a5269644d21ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ff/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ff/firefox-69.0b16.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a3b44ae73ff9bb7ace9ddc7d7886b4362eb2265fe0f8d5b2e34fb929dc367a6be29a46d750cd33b7d03cd321827dc261f1d88cca91fbb180ee1dc72398c1281e"; + sha512 = "57f543f448b8a4abc99201eeae76b0574841a5c7815d7303844b5cdcb4a5668fa03483d9a2953f9a56bbe175f8f82e94b4aa58d77174e5ca26c8755c25cc6c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fi/firefox-69.0b16.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "934f497203bde168237ba43d49400dc48c9082a24de8f74ce887cbbc1f35057a2419dc346b88f18ed7d78596ed220d4f65371fd2bc34a1ef005803109c7e77d4"; + sha512 = "bfb0d7c4a4e4d0633879f79d8ad5a406e7e3d57f80ab1f1eed671ef85ff7065afa826769b868c90b8e90b87dc012016b419eb0a57de344ce51f49bbf61094931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fr/firefox-69.0b16.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "778509904c83b8c00c0b71331c770cad677ee487079710d9244d1bcc5a2e2f6e397b30c1c8ffd7f787f8fbbe87f509105bd2978d26f60406b8904245f170d79c"; + sha512 = "b944d8473f8c7a859b738d78140fc6b840ae7798a3a0e8c237bd81f411f87129528ddf68f33da6578547fa768fa1465625dbc4a94f265491722bd4f23a614ce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fy-NL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fy-NL/firefox-69.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8cd82fc3c7a2558f5408d2e18d8fffc01dc1a0c69f52e61e7da185a9b7d24c79e29d68c7e61386b6910aeb8f91276fc1fe5c142ca526112b1e0ab206ec3757dd"; + sha512 = "445018db73c97ffa87377bc78162cbe2f31dae2ffbf47ec9e0bb42001e5a15787fadf4ce2d4027693eaca4edbfcee72a7e3874594d3409384df62c91b118d388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ga-IE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ga-IE/firefox-69.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4e0184a5d0f6a8213d250b2210076e4857d27224b2d6ca27375a8951417ffc74e8fb02b9b571a12f34f59911f0663ff21d1abb09836bc0f4a1fac3c6894bf82d"; + sha512 = "2a6b8f3ecfacea21415daa0dfc8e3797b5c3567e7e7bb9ec933525d2a2e9e51dfd94fa81477878e2bca68f8127e32e387f43ac8ceb0c02622813baa5b17fcf08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gd/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gd/firefox-69.0b16.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f67a284aba28000a070f06c1b075dbf3edb60b4704c62fe80df4714df51395644507ebb89506ab2cb65ccd8d1c16e896da0c4dbac7fd3251026f0e00bcabe014"; + sha512 = "474d524fdab0d83bad98e0f05348d8db0f49c11f2e50e7b5221137359e268e37e662440961bb206cb2ee44aee9d07b4565bb8b27a696ae0df89ceff76309820b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gl/firefox-69.0b16.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c07c74904f845e2b740f6eabd334fa1aa0d74012e86fbc17624d671c7e2cb3d78143a499aabadeecdf276c3c6d4f2934a54240ec7078619491eeb28c8c50be9f"; + sha512 = "ba2dfaa33b47ce1106496783bde98b1ff7cdb0171262feb8890a6ada29a67c34165b8b7ab58aabb89029d0571a6ff8cc83b14c310270e0e7a725ffb9fd7dccc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gn/firefox-69.0b16.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "426ceb6386da90c30726ff5318613bb88875c1b109bbd73f46f6c436b61a18b76a8272807323abf925e1ebbc6531c7d82ce1af5dbaa9a2941a8007cf8dffd3f2"; + sha512 = "e5f5bf7d20eccc3d860ae2b8c6aed372944f23ed6d7a41774141cf1d67ab40c8bb2cf7e8e5931d37b9951668f03c6ab1271bb57ca7ead9aac52045244fbce93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gu-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gu-IN/firefox-69.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "71217c32a6cf4fe5bdc922d09bc290537e58f26a75290bf23a5fc60be3e42b8b17d5b05dfc8ea4c547a149e795fc9449459d5f74efb4c7d9ab7068f5533c0bb2"; + sha512 = "9ca06aafebb4ae5a65af94c7fd4dc30bb0fb37d6f50a8a8d0b5d3a92cdbfb7a6a5fc609f5f9d93c47cbfd811198e19ab554d47cb7a03db5a9848135660b17f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/he/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/he/firefox-69.0b16.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "580b58ccefbc9f1d79027976dcb8b880c6608208322449146c99e1e6ceb18b0d9069891dccee5c37df48b8251984ad915228fdebd48d3770b54e47ee2433440b"; + sha512 = "ff9331af69d497b9886b7fbfe3954c0149e170973c96d0bd23252e0d9f97964f88f60e8258785337c8143a5abddfaa4da5d1222b27c42e38686ec44c738521a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hi-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hi-IN/firefox-69.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "52d0bf548b7cdf6db5bda320f8262d226adde14cab042458e591fa922e5c4cb66c7a10699ffd3a4e90b9be522c5dba77bb8bc787b4db73b6805a04b72d92f752"; + sha512 = "d50d6887657b6dd61db4d53c0008e42850000d56a56b53532900cd6384c64d029a7a276386a5b46aa74b05c5597a4782f586b27cb01d34058c124c5bb58faec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hr/firefox-69.0b16.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8a24d6c60af65b624a3f577a984d237ac93582bc5630ec2fd7d3c39902ca73ea47ae34d41fe90dbdabf15872bfd679e029ec361ecb7d38c17be4441f3df298ff"; + sha512 = "d5c5a069cc845544cdc905c9ed3083329b75e367c99accf1986a799a6f69f081565ed0c9e5bfcc6ea9e5c4b606262e60a62be6d4271267094c5aa701f090cdfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hsb/firefox-69.0b16.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "085f6fe6b298047cd08c153c8fa9c3266c8fe69c0165647c863053e2b9836db9b5dd083c7fcedbb2100b22947a296da5b0894897eb801734430e153eddd168b2"; + sha512 = "9b2b8198bfad4f9f1bd5808c2d696abb1473230afa20e42e216c6616821a98cdb6bea6b92efdc8280892e04a0c1b6a967adb9c69fdee9f9c1bfb4f6fd4d17da4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hu/firefox-69.0b16.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "06c2e59c69eabee03b5bf118d27fcc5b9ee3ca21e1596926c5e75200f47ee4b27c4bba5da0e3a67cf6acd7986dd066f2ca79089156559c2cb725023067dddbbd"; + sha512 = "bb189556077d8490596acf9433146923ac6a68e26d804fd6946a0af1b247342f5140693d777b9dcda41972ad2ca6773b362381ffb9fecb58826c0353511065e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hy-AM/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hy-AM/firefox-69.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "94f95dc01d54875be32db75a8ba17202678aeb8f0dc471a356b73ff6cf2725d302dbb5bb41318b69e904d9a685e8b833bf0ad489818fdc4aec72617cf19e3221"; + sha512 = "a295c182fb7bb80d21e551156e8e1d77327311274e22eca16f4640e833a4db21597e3e4b5f64e2d39dc40bca387497ea78e2fa198b760062a33b1cae86c6405a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ia/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ia/firefox-69.0b16.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "ad541cabe5f20fc90cccb932e4062d8088fd58b9bffdacf6da8c53cf9667d82363a8da70bb441881fd132bf0239adca681abad4ffc44808f4565eca9830ef387"; + sha512 = "9a5f01f6164751f0ed8cd34e9d792fa889a5a7ea9eefcc3e8afba20ed419da984db0983126122c8cc7770f0b34bdf1c39695632f737aa83281b01f8f713b43df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/id/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/id/firefox-69.0b16.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ccbba3cd4a34a2db26c81bd670b53e50279ee22b1e43203802112010024ab496077f2efab9f100f50dadfda7d35edad09cfee7e54997ee2034d84e8efa24dc3e"; + sha512 = "3073f0b719b1b4d71eb07b9f1a62f51176377579cdd8cdb1c8ec0876fc820289db29cb13f049058d0efcb955c15a3c377c4496c458b4b3fe438dcbdaa9d6fc07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/is/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/is/firefox-69.0b16.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "11ef7c6e96d4fe5813bfa63a322b9a57f283e444a22be440ea14acc0d186314e57119642dae7d285122a17ede96eb8d37f8f879c22101f8a64ea5f0b97dd1a17"; + sha512 = "15a8593945e4cafbbd4a1b274c652fb121cdbf567031f6919e84767df65eb4f4e42d411b4799b8e5299d6215dd3f1cfef5104c9197c1ff1feb68f89e0bcfa2b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/it/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/it/firefox-69.0b16.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c568510a83c61f9472852f8c8fff0293bc7dff741f4ad8bdcb16caa5abdb2fc9cc0186ed13c95485775c8041e9ad0a4f6433fff933626f80eafea9ffa3fd3f61"; + sha512 = "55c688602fb41d39cf4e33f96b57ff98d466623ca80281564ea6a4384b1985d29436f7288f56e969151d9873cece10422abf753b262b5ac6e283731397e53e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ja/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ja/firefox-69.0b16.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f04b5d728d9e319c2f88db4c283daba74cc36b03221a61c92dbd3301f1a2a8d725dd72fc9fc95e984082eb128a519e002bb62c59f82e6a529afbb36289be5e23"; + sha512 = "f350eca93c6110e8a258802be4ff1cb8b07e819f2fe3b24e912f296c4e18cafed279ad5ad8eb093f3bd7945b0c9cf5466d673e5b4ae342a3b2d0e418e5e6c86c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ka/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ka/firefox-69.0b16.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9c47c3e57913fa009e92858363a7384f9e71a9b6826c64edaa2772984be43c32e45c73b7599d45ff51dcb11a42fb70963ab95615f730a2f11d792e0ee1c0417a"; + sha512 = "ce392f476b5eb00620c2170cda585e4cf73416a5d564446e65e39e0deea538825f3d91e91e5624c353b163983efd0bf844baa9a52e3e308d9e232d83f9167d0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kab/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kab/firefox-69.0b16.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "aa7e4e641d79568af30845813ae6aed59d59964b37be672b9a18a0006f152dce7fdace65a6d4ae2626f80becfa56b32f0b18cc826cde2d555816a27c76b175da"; + sha512 = "ffab6510cd2b68b0b4b57ae1ec727e391a0330cf44c9c1f9fb8bd1385c8dc86f1de5dcc5712b0f0dfa5e25920eadd6561501579ee5d15ade22fce747ba88b988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kk/firefox-69.0b16.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "30817ac01333af478e9dc6be7db8e898705bc9020627b171de664e892ec13987f17e8e2a346cd94bf77bd9caae62cf8b37a1ee3714cdc034c648cdb424c72cac"; + sha512 = "f9aa18138713b9b704c8d0d3fd8a5d2c5f802d3b23b7ad89d7f18eb885b9efeee53b94117bf7492a4fe83be19b5052d5ec6fd8f203d96f7988e5cb1eb524f496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/km/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/km/firefox-69.0b16.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f0c6fac7c89b677eb2407b199d61690a3ad59128b9d1a06575dfe289718e0d5677573cb0ff3da8e313d24798a9776c4387e57a60bae3ba916383cc02a57612e4"; + sha512 = "1f0a4ba8942210a0ffbee2ec09f79d628638f58e26bc83d175d0b95ccb43636c976fba556720b39b42c37ac2fe67bd52c28f0a2f672706d967d09a26c3e446f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kn/firefox-69.0b16.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "5ac4a09bf82678f3d8bd53c8bd44c1f6c0811a942a99321cfca1d553d68ead2abe8ed2f4af3c50e9ee88ac1ede35e201fa4fa2ec399016b122389a51f16cd5be"; + sha512 = "c23fc4fc298f88f4aee69680156d95fc98fc311630586d5a2a964c8fb74f2b56483e0b4267b90b1a3f37815ecb379e6583e7c801e57a94236d35e0e68f68bcda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ko/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ko/firefox-69.0b16.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "dd1bdf3e30b3a43d196ec50870bc8f2abcacf703860dab5b21e9b50fad5dbf9ed7cf0bdedf0844a2d56e60f9fc461e397b48f12956e2d95ab6e941b760e6f5c8"; + sha512 = "4dc91ea327d7c69b68bb065eae6ef812ca01c32dcc22048867e43130b15a15edeac505bbf859d96185f90fb3958c74fb0c3e8bbb58c4a0d7856837f864163d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lij/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lij/firefox-69.0b16.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "5c9feb27b7ccec9a6594cf027b7ce55df4e0becb5871444bc24328401e3a764d7dadfa3a56b654b18b2e10ab8a8e03c96021a33de5cdc66b0d7e3d6992a2fb5f"; + sha512 = "3588c1b35428dde09cc0262d3730407ed4bcf821b28556f7b05fb60250eac006e12ef8a929327a80429bab195632f9f40771467e572dd6821c646338d3c7d862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lt/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lt/firefox-69.0b16.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ebbda17ab983261c9a593a4368696026f4743a79c6cf70e89184390b4c1966d474b75bd751a52dabe06e303b8f223c524494a6cb753dcd547cc8c93ba911088e"; + sha512 = "972bfbd93200dc87a6f9cb246b30f301c8db216dc9067bf40f42cbd73ee5795cbb276ade5ba44a6e3df2239d481ea305f4499fe88f42a0f7d0071f84dc2fc9f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lv/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lv/firefox-69.0b16.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "059c241db15b20d4a5713b35fc7dec60d51253a0d3c9e9e1337defa2ec33e0a3e22b2be6346b6b7fa51e35fd48870a86c2315bedbc32669260195bdff3e5d9b3"; + sha512 = "c7a0a65c0649059cf35b394b033b965b3d708531f6a8414d5fead08f2b5e5fd907c903c23e22e9bf5cdc78255e0215dfe34ce45ee96fc619fbca87fe086ed32b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/mk/firefox-69.0b16.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "170ace7a442581946c8ab52b63c935ad58cd3e6415c109c564faeec9333025fb9647f0f049a192386a2d980b7c3f9ceea62e1d56cc90e8c8a4aec568f58e4dbf"; + sha512 = "677e6238580a561fa86dbe1ba8d293aec4d51ee96adea11871e169e1d6ed0c1de29a6a44c374c87aaf93b00178719f142b44821d3f2f866cd43308f7ddc95784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/mr/firefox-69.0b16.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "91e4aa884b26041047ab3bc0c3eb5bb14a62776982f7e1edfc53f1732c5fba9bdb97b77e5f9603cfdd4bb2f67ca5f5959ea61eb4827c6075d30b502c9282cb3b"; + sha512 = "1457c464363505e787367bad9b90e6396da7e5d0840618cbd02c1996985fc42af4279ad9f53b6f0014c9f0296f1912ca5bf7832794048e69cf5a7d5b89ffe811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ms/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ms/firefox-69.0b16.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2c236d61824b559def24a9f96ff15075d17220893ce5500bf1f997d582b89b8948eeb88683997ffb64dd57c2fdc01961d877de28be6110da7ff4bddb129540be"; + sha512 = "54d0c0a9a17534891267a3dd89682a1ca24dfa42e13c0a68ca67ac800c210f77a1b504d2ea0e16293df31ac716dac2e646fddd6eb4a5996e6cfc9fb578391cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/my/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/my/firefox-69.0b16.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "909aee75dd8597d4c7d08cd28972c27fbe07aa774c93a6639d38ca152ea2d0a5330329a857b04100b67b35142689b3ab9f4376200b9d6efe8612a8dbaa19618b"; + sha512 = "21a851362356c568d93a24e7038ff30c376d712d0ba52d9eb51ad325d43e6a36f3565b48385b54bd90f846d03b626e96e002264d10741005403ab6d30364feb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nb-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nb-NO/firefox-69.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a7b65f920dccfefb64e1d0a2425a8514e555089262f2d0d5300009c9d8b8ff343f387d0f3797819808a2d2b67c10ec026fd12f0306e23d8b31573a9ebbad726a"; + sha512 = "d625f65dfe643608689b2d7858f06b3e1b06636249be516a76798bfa728827592a543e5e61279c7b8a5e8a0c07a17510232bccc98fa8fdac3f98806b94582db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ne-NP/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ne-NP/firefox-69.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "10e0715ca360b3299312c6f8c86b4d89ccc0788611c44e20d90b0cadb20e00f2071377fb934383d6d76cff49d0fcaeb155b68328fb5bc96fb09479a192df1464"; + sha512 = "5d85049a3d8f11b164d091cd7925d456e54db63fb93883e42306b1bde48c502e3ffab120c4f9d05de688086ab94470d4eed827f24689cb1872cdaeca6bef7233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nl/firefox-69.0b16.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1e688394daf56bc6900d765ae4d01941d9cc02457b95965cc9624be7ad5a50a8b8cdc6212d7270c8253d539ecbe60a21648cf13f61bfade3dafcd8e6273509b7"; + sha512 = "9716bbc5c5faa1ae284b7182f0473823d265993dc43c4ee59d6c6c17ada6cf7d898dda64cc7647ff65f46984aaf1658a5a3e2c50361d5a731ba6b82844d7b432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nn-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nn-NO/firefox-69.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "8fcaadfa9e895a97403c60a09e27282b0907346d20c8dbcc8bc9343c0bbba03d3bdf6fc22e52271d5edb9e1df214844f17dc81d3aa74adbc2623fc34f034dcb5"; + sha512 = "f227cb22ea4d15bdd4b20f2096f70d985cb3d9e174e464462c718a0bc6f533bc0c5bb098dacdb1a8ecc6fb07acd22f5dcd365e266208f75423677eb2bdf4ad65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/oc/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/oc/firefox-69.0b16.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d2edc1fc3fb685ec8f46b58559edac3e6fa3eda0df5ef7bc95c4b4ed444bfdbff43257e5cebb50ef438c7638ac3cde6411e9d5b0a93bd22876c0a13965403a30"; + sha512 = "0e116e00a58d1086093e321a188c2c060f9dce3374cb7152d753064e170eca302c0698cda110ed12a4e41b669c242e3865165bfafc4463d1ce583d0854e16075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pa-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pa-IN/firefox-69.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "535726a70b1d2e4562f4459df2873aff9b41ffc8e88bfe606465871e13ea4205431ce8846670b178e043e35b81ee8e71bcc896971dac2d8d538681ca8dd0db9a"; + sha512 = "9966030d3fdb5da3e2f943078294615d64fb019ca67e8fb335693580bd100f6f10ad760b50f7d26c68098a3080e87359dcb1c22ab657c43c23fc2cef3738eb26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pl/firefox-69.0b16.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1704e78bb2d0e9e8b50c078a52a01777f6df1fd4b2ed05a7226fe7f6eaaa38ae72a9ffd8780b0e6b9a51da40990de386e8acd518426ee89e61d16d6505e7befd"; + sha512 = "ffb5a5cffab404ca1685f925580c47eba975d7a26af1ef31f05cf8f1e0ea72d130042f9b11e69427a2ab8b86fe47e279040af95a18869bad0465869c43a988bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-BR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pt-BR/firefox-69.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0cee5dc74c31ccd80b2cd81a83b909a77dc77c06f38af6290b7d6897d97e7aedf3036d03b1d42ef33dc3942566809388ca5b3e6d9b78a84793987db77fbb1fd3"; + sha512 = "14956079e61152b99696ab29a92b57a3671519c4f58111999587ab796dd8e7d6805828e8d14a59bad28218c136f282ef052e56daf024ca3923ead95d7eab0af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-PT/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pt-PT/firefox-69.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b43c1fe0fcdfac892b73a3ef7c3ecfbdb5b646f9badb0dc5d64f9614ad35686e1eaa1e6ccc2cccf9c9a9bf25cd629e5bb893d13942a5dfba67368cf3ccf59c82"; + sha512 = "cd5fef4336203fdfbd8af89a3cc17a01e88ddd4fd670c3b778b1fe228325dd35fc64ea6d0c85681cc1bbb51c588b53972c85746d9ac0c860b3143ec93a344361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/rm/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/rm/firefox-69.0b16.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "370593dfc73e15ec56950c6fe788d579582451151e26896587258bbda65e623bcf28943413d80ba7bb629dc2230e4f42da0c26cd137f8fcbee79d85a8fb4c57a"; + sha512 = "33d608066859460da6a50012fad5a76eb78bc4a3f8565dac1753b80b86755432340c6e9b5e13c319c24d89547fd32567ad99853ef7f954aebda9b15e2eddd064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ro/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ro/firefox-69.0b16.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6a415e17b0a3511da4bc97be2cbff5cb4307c4c63bdd2bf316b3469d6ea1abf365ac84608b169efe3e5ad8629a0430bac0898750b964672f83da0999c1c9b12e"; + sha512 = "18bb7599738aff68f75dac1a6cd87e6a3a4a326ab64e9bf36f28d3e4890340c07e93b938d77ee4432548c5880b79862d9c472e283f638aa9e2d977ba8f54f686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ru/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ru/firefox-69.0b16.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "b6a7c931874e0b41dbdfa7658b3ce1f7560d20acdc2ad1cb7fd3a51c05e6c7f392eb39c55faae6d723b23cf83ba5134bf9ae12463161fc9df0b04a311bb8f7cc"; + sha512 = "c1a0c7b717740167f9906a2bec1d81dca2754c7a10f2139bee269bcad6b9d563f5ddd25d05bcc7a0621b910366853aa43663bc6d711fc1fc3b53e407dcbf9805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/si/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/si/firefox-69.0b16.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c2ccb292b6652320593dfb05af30be4a5fca09318981e255f15003bfb8911a6fc3c8bff420bdc13bbd1aea69b44e5809370ec100c4b6eb6ff54c71c85b3f52c5"; + sha512 = "e807ae18343102df9030189f6e067062421a64f1fbfa9dd0d9e5590e727c049ae849dff2fb581a2f4de892fed21144a792535df188dd08c190c24dd1a58dfbe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sk/firefox-69.0b16.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8cecce76d5d8f6ed8d778fe2d2c733f1d81255696e78f7422c464df96275149246704175ae1c28566d223ca38da908d7974f0b055ab953cd3acc08c4e1c246a2"; + sha512 = "35f1206c717f5475f4af6ac74bab0b691b21789457496c1226d6ace5d4d0f8f88e2c3467c6a01eae49c013b972e07f12b577be6543219b1a274340639799b2a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sl/firefox-69.0b16.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0cfc0a94d8273926407ebc8addb69b76fc734215e6f0199c8b7e9e932ff89315f49f2695826446591a7e223d07b61da8ac2146f5589d58093096f70425ae15c9"; + sha512 = "d665b46a8e6569e8e0e41411e647d3a27b172cbde22e3d9157a5610dfe559d6648adcd65418c45256d8fb9f56022ebf8d3eabadd9b8414f32565c421bd74e371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/son/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/son/firefox-69.0b16.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "321034ab272f1bfd07bc4938912be05b0a14e81ba537cd232ce38e408d3c9dee6d93010c62c029be27d0322db7883cba6d418b35b0afba534eb32f4bf18e0273"; + sha512 = "e0b22c18364e4394cf982f2cac370bff79c5440a949d5e69ef753bdcab05688b591f3d54e2721507c502f05a094436fcb219c8fa4be33462ffc7fd5090506944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sq/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sq/firefox-69.0b16.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3eb99ec8007060e049b1be8a70360d8839b90a48599866687b7ccefb46f736ecbcfb166936946feb4e959a941fc0534b6f843d8c62ef4f77b2cead7df32b892d"; + sha512 = "75050296533af930bc1fa4602246b9d6db0aa48d1fce9a53212fc11041a331236fa88f70d8179c9961f09810d06df297d9dcfce791357e8c7db956c160019f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sr/firefox-69.0b16.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "1645d31f9ae714a85bbc3433bfb97d910147d2b4c8e0b971a75d4bea5b8aeb2c500093e85beef9b28720a6c372db5edf68bd83be874cdf121add61fed3f098d1"; + sha512 = "ceb21bac8b36872c7ec47053846e20376884678e7017632164026f0b6a8cc56416cfc4c693229964e287381739d5018836da20f8e5d636aa9607c80567a0c36a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sv-SE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sv-SE/firefox-69.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "5a6c3329faf019a10d55a36cf893ce0d961c339c1a80ddec644266c164b774a6fb2bfdd371ceb50de758f12da5172c9bfc37aa6dda254c95b6fe01039c708191"; + sha512 = "a92b5d28645dd601dd5f8d4892d210bdc284ca5ef6023f3e6660d6519fd8fdf1212e757f31048522009021f00716a1faa3da6e818b3f39ac4b96d68564aabe8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ta/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ta/firefox-69.0b16.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "98810df80bd496c8fab57530c56c7aaba0425bcff3debe07dfa4a647f63d6b7cb652fea19c5ec00c61536ea0e94fed6ea583aa411cd72919852f832dd02d6b61"; + sha512 = "4935baa87058d2c2f87bc4e320d7fb1329c2380c93a72834783d5884e3e374a5b9f80b66fe1824b9d7003ba41b2f10648d8d257c34f71314de0ae9959233637e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/te/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/te/firefox-69.0b16.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ad71ef457a0eb6324a23f7a2e4c6a0dfb6b07063e1ee5f2425a6dd6ab9feeac9f9240b9193d4bc8a70b715cb4f88322f39da577b645cc9359915ccaf91d1d19f"; + sha512 = "5aef655c7d736d5c4cb91a6ba7c0fff7c9adee6dfd96b57f5c1f968d258fd7707a1b1ef0fabc049f2902085afd55455d016d9a786e94ef836e6a6379f33bb577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/th/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/th/firefox-69.0b16.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2e522f9c164049b6f8510065e2bd69394067b45f361ff127880dcaf1bb4bf893a8d4559222c39dae46b85e6b72abd0204e36296c119ac8c3442bebc8426a5276"; + sha512 = "1bec6b20ae731e982a4be6aac81bbfad2d27add2fc1339401807fb41af36a27391499677355f0737a9230466e27f34bd5e97f4b3697decd56ffe854b932900a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/tr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/tr/firefox-69.0b16.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b6f684716068ad18aa626c05fb2ea331f33e0648c1d710f1037e3c5ad79d9f95748314d1f205fd1c3f3bda57c8512adc0bad55b56f355d9ba5f20469b00e2fb8"; + sha512 = "ccb0537f3cc85331037070761e4b450bdb07215d024052d3b946b96deb89ae30333c3b90e25100bca6cc58efc2f0f5b864daf6b353dbe7655e71106b7d5c0784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/uk/firefox-69.0b16.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "edeeea9cddcbb5505bef77b91a7f85ee909aa1fa803fe0e5a142a2207a0e8717a983bbf5636c3adf0798fd77e509bb90c759615810f19a59a2839e5336264d1f"; + sha512 = "a3490dd08645d2bc21a0a7176b1e9ba2da47b4d2a5ef45472715dd6905eb1cb1956849fdd006a4d370c0e58744e126fb1902d4997c7280fff256885becb39877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ur/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ur/firefox-69.0b16.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "36193d23c39331bbdae452acd06fa9db963366cb302ecbfc19724ab41fbba4d1ff3daa0f58cfafda95146792dbc1988878080ed104b8f77f1f81a53157728a93"; + sha512 = "a021c72eb298bce45097ed0d2c9aa2ade86b06668bb0d22e1832b600ef15691680b9836598467ae40d20203bf07246ed85485d0f2b3d145452725544d62b033b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uz/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/uz/firefox-69.0b16.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "06ebb9c3c88d2332fcca2eb51f4a2995c9e181da9e84db1d8f57ce1c2ad4dd35a6b0ed3e7a61395bda7302bd6e7eacfb2114b51fb71e2e3dcefc9d3ef975036d"; + sha512 = "ee54245bbc0845e680f5b02a2b217f2e253daa99e531fbf721a0f9dc03e68fe77371665bf2db7aad94748ad5c641bb93c7e3bf43f6e3f4e53b7ec91306d69f7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/vi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/vi/firefox-69.0b16.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "944b716ccd4ba2ca23f1fe1ab8f5a6e16edee1d8f1ed3d2d785f061ec3317431f941b6aa811ed02f35d9862e44dd7b31a860e292509632258b45b6160a6bbd5e"; + sha512 = "e14901e594346298a43cf9b7cf70be1cd26e6f19415fd11c09e5ac8eca7a43fb07d7b4f4e238f4b13e986e1a9e37f23d73e456990403f2983a9939b8bec455b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/xh/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/xh/firefox-69.0b16.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "f391a9ef0b66224e91bdc99a0a509211a56af3958f0b2d491d11ab024771bc91986b79b87733c86f8d045564d2546f68a8f2891bb13baacffa55d8f481a87421"; + sha512 = "a256c23d0c478dec86c5a3413c7e64c61e7e4a519c5e1a343b457481543529354d588b07f1b0ea37450c2d3d317145796401c05988ed6d35f545612d6c5f87f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-CN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/zh-CN/firefox-69.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ec812067a347aa55d3555f156ce9dcce040ac7fa363dd3ff06dae9120e8186f521b08e4b02ce23e41adc5ee443dcf112264043efdadc328b43ba192d977f7d15"; + sha512 = "a10aa5ef7b4fb6e4e3ac64a7d25c2d329eb42a0e5e0f680d786c9215d1f536a9daecbe5df31fb8484eed1471ccf89a596a5d2f97ae9875686b6f394f2a3c25ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-TW/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/zh-TW/firefox-69.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a42ceb0523b083feda01262678344ae138bc5ff64c4713791a005191b5fe8378813501de11b25bf9c50019f0a07b9180fb34547ae4bebe98eb9964ab9312560b"; + sha512 = "790725d0674be5ee347dbef3c2f0ac0d017cd972ae32dd318767535a4006432c5d56ef2e13a602f705fb177476ee120a5327dfa3625b6966a9fed8bb04f50c04"; } ]; } From c930cf74a018697008138019cc8954218d1dd85b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Aug 2019 23:04:01 +0100 Subject: [PATCH 196/283] emacsPackages.cedet: Mark as broken --- pkgs/applications/editors/emacs-modes/cedet/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index e350dc08e71..5fbe095c4f3 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -44,5 +44,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://cedet.sourceforge.net/; + + # Fails with `semantic-idle.el:42:1:Error: Invalid function: class-p` + broken = true; }; } From 81168273ff4d21f141a0d755a1b05eea34c65054 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Aug 2019 23:12:11 +0100 Subject: [PATCH 197/283] emacsPackages.colorThemeSolarized: Mark as broken --- .../editors/emacs-modes/color-theme-solarized/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index 6b51f117ad8..fb3de6ea3d9 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -30,5 +30,8 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.samuelrivas ]; license = licenses.mit; platforms = platforms.all; + + # Fails with `solarized-definitions.el:786:1:Warning: the function `rotatef' is not known to` + broken = true; }; } From 7580e58dde95e5acbc84df9c8dbe640417a2d8be Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Aug 2019 23:12:46 +0100 Subject: [PATCH 198/283] emacsPackages.emacsClangCompleteAsync: Mark as broken --- .../emacs-modes/emacs-clang-complete-async/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 66ac9a3d77e..23a9b3b1920 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -26,5 +26,10 @@ clangStdenv.mkDerivation { homepage = https://github.com/Golevka/emacs-clang-complete-async; description = "An emacs plugin to complete C and C++ code using libclang"; license = clangStdenv.lib.licenses.gpl3Plus; + + # Fails with: + # ./src/completion.h:5:10: fatal error: 'clang-c/Index.h' file not found + # include + broken = true; }; } From deda623918024c8f1aa33c98bf7f6295c3ca7ef4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Aug 2019 23:13:09 +0100 Subject: [PATCH 199/283] emacsPackages.hol_light_mode: Mark as broken --- pkgs/applications/editors/emacs-modes/hol_light/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix index c32669239f8..38457af120b 100644 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -22,5 +22,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + + # Fails trying to fetch dependencies in build + # broken = true; }; } From 87e16d70746244187437fef72d11f4764738539c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Aug 2019 23:13:30 +0100 Subject: [PATCH 200/283] emacsPackages.prologMode: Mark as broken --- pkgs/applications/editors/emacs-modes/prolog/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index b01c526aa8e..337a1585b1b 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -17,5 +17,8 @@ stdenv.mkDerivation { homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/; description = "Prolog mode for Emacs"; license = stdenv.lib.licenses.gpl2Plus; + + # Has wrong sha256 + broken = true; }; } From bd87895d7302f30724e8f97b8c238bdc7435d077 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Aug 2019 23:27:27 +0100 Subject: [PATCH 201/283] emacsPackagesNg: Import old packages not available in any generated set --- .../editors/emacs-modes/manual-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 7f75de74ed6..34b81cc8329 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -142,4 +142,22 @@ zeitgeist = callPackage ./zeitgeist { }; + # From old emacsPackages (pre emacsPackagesNg) + cedet = callPackage ./cedet { }; + cedille = callPackage ./cedille { cedille = pkgs.cedille; }; + coffee = callPackage ./coffee { }; + colorThemeSolarized = callPackage ./color-theme-solarized { + colorTheme = self.color-theme; + }; + cua = callPackage ./cua { }; + emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { }; + emacsSessionManagement = callPackage ./session-management-for-emacs { }; + hsc3Mode = callPackage ./hsc3 { }; + hol_light_mode = callPackage ./hol_light { }; + ido-ubiquitous = callPackage ./ido-ubiquitous { }; + ocamlMode = callPackage ./ocaml { }; + prologMode = callPackage ./prolog { }; + rectMark = callPackage ./rect-mark { }; + sunriseCommander = callPackage ./sunrise-commander { }; + } From 41d1b8fa883724c2f14ee214b9373f9bed9b7cd0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Aug 2019 23:52:22 +0100 Subject: [PATCH 202/283] emacsPackages: Drop old emacsPackages (non-NG) sets These have been deprecated for a long time now and has not seen much maintenance. --- doc/package-specific-user-notes.xml | 4 +- nixos/doc/manual/release-notes/rl-1909.xml | 9 +- nixos/modules/services/editors/emacs.xml | 20 +-- .../editors/emacs-modes/melpa-packages.nix | 4 +- .../editors/emacs-modes/updater-emacs.nix | 2 +- pkgs/build-support/emacs/wrapper.nix | 4 +- pkgs/development/tools/cask/default.nix | 6 +- pkgs/top-level/aliases.nix | 6 +- pkgs/top-level/all-packages.nix | 163 +----------------- pkgs/top-level/release.nix | 2 +- 10 files changed, 37 insertions(+), 183 deletions(-) diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml index 196c760251f..a176f4d1395 100644 --- a/doc/package-specific-user-notes.xml +++ b/doc/package-specific-user-notes.xml @@ -6,7 +6,7 @@ answer some of the frequently asked questions related to Nixpkgs use. - Some useful information related to package use + Some useful information related to package use can be found in package-specific development notes. @@ -196,7 +196,7 @@ overrides = self: super: rec { haskell-mode = self.melpaPackages.haskell-mode; ... }; -((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ +((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod dante diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 166be1f1c28..002bb371168 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -338,10 +338,17 @@ For nginx, the dependencies are still automatically managed when is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all acme-certificates.target. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal - ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at + ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at NixOS/nixpkgs#60180. + + + The old deprecated emacs package sets have been dropped. + What used to be called emacsPackagesNg is now simply called emacsPackages. + + + diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index acd69f18376..8ced302bad1 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -9,6 +9,7 @@ Damien Cassou @DamienCassou Thomas Tuegel @ttuegel Rodney Lorrimar @rvl + Adam Hoese @adisbladis --> Emacs is an @@ -130,15 +131,6 @@ Emacs packages through nixpkgs. - - - This documentation describes the new Emacs packages framework in NixOS - 16.03 (emacsPackagesNg) which should not be confused - with the previous and deprecated framework - (emacs24Packages). - - - The first step to declare the list of packages you want in your Emacs installation is to create a dedicated derivation. This can be done in a @@ -164,7 +156,7 @@ $ ./result/bin/emacs let myEmacs = pkgs.emacs; - emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages; + emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; in emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ magit # ; Integrate git <C-x g> @@ -262,10 +254,10 @@ in Querying Emacs packages " -qaP -A emacsPackagesNg.elpaPackages -nix-env -f "" -qaP -A emacsPackagesNg.melpaPackages -nix-env -f "" -qaP -A emacsPackagesNg.melpaStablePackages -nix-env -f "" -qaP -A emacsPackagesNg.orgPackages +nix-env -f "" -qaP -A emacsPackages.elpaPackages +nix-env -f "" -qaP -A emacsPackages.melpaPackages +nix-env -f "" -qaP -A emacsPackages.melpaStablePackages +nix-env -f "" -qaP -A emacsPackages.orgPackages ]]> diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 1a647466abd..12cc2c571d8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -6,8 +6,8 @@ To update the list of packages from MELPA, 1. Run ./update-melpa 2. Check for evaluation errors: -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaPackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` */ diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index c7e858078e6..518ee67e451 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesNgFor pkgs.emacs26).emacsWithPackages (epkgs: let + emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index dfdd5b60851..b242672df10 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -18,10 +18,10 @@ the correct version of Emacs. `emacsWithPackages` inherits the package set which contains it, so the correct way to override the provided package set is to override the set which contains `emacsWithPackages`. For example, to override -`emacsPackagesNg.emacsWithPackages`, +`emacsPackages.emacsWithPackages`, ``` let customEmacsPackages = - emacsPackagesNg.overrideScope' (self: super: { + emacsPackages.overrideScope' (self: super: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index e33761a67e0..0b6742fbf43 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, emacsPackagesNg }: +{ stdenv, fetchurl, python, emacsPackages }: stdenv.mkDerivation rec { name = "cask-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; doCheck = true; - buildInputs = with emacsPackagesNg; [ + buildInputs = with emacsPackages; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ]; @@ -44,5 +44,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.flexw ]; }; - nativeBuildInputs = [ emacsPackagesNg.emacs python ]; + nativeBuildInputs = [ emacsPackages.emacs python ]; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a4169605a6..3b8818da5c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -87,9 +87,11 @@ mapAliases ({ double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 dwarf_fortress = dwarf-fortress; # added 2016-01-23 - emacsMelpa = emacs25PackagesNg; # for backward compatibility + emacsMelpa = emacs25Packages; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 + emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 + emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 + emacsPackagesNg = emacsPackages; # added 2019-08-07 emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deac1550c0d..fc5a35320ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -377,7 +377,7 @@ in mkShell = callPackage ../build-support/mkshell { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -7919,7 +7919,7 @@ in # package. Wishing we could merge it into one irony package, to avoid this issue, # but its emacs-side expression is autogenerated, and we can't hook into it (other # than peek into its version). - inherit (emacsPackagesNg.melpaStablePackages) irony; + inherit (emacsPackages.melpaStablePackages) irony; }; hugs = callPackage ../development/interpreters/hugs { }; @@ -17917,7 +17917,6 @@ in emacs = emacs26; emacsPackages = emacs26Packages; - emacsPackagesNg = emacs26PackagesNg; emacs26 = callPackage ../applications/editors/emacs { # use override to enable additional features @@ -17962,153 +17961,7 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; - emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { - inherit emacs; - - autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; - - bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; - - bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {}; - - cedet = callPackage ../applications/editors/emacs-modes/cedet { }; - - calfw = callPackage ../applications/editors/emacs-modes/calfw { }; - - cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; }; - - coffee = callPackage ../applications/editors/emacs-modes/coffee { }; - - colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; - - colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { }; - - cryptol = callPackage ../applications/editors/emacs-modes/cryptol { }; - - cua = callPackage ../applications/editors/emacs-modes/cua { }; - - d = callPackage ../applications/editors/emacs-modes/d { }; - - darcsum = callPackage ../applications/editors/emacs-modes/darcsum { }; - - # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; - - emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { }; - - emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { }; - - emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { }; - - emms = callPackage ../applications/editors/emacs-modes/emms { }; - - ensime = callPackage ../applications/editors/emacs-modes/ensime { }; - - erlangMode = callPackage ../applications/editors/emacs-modes/erlang { }; - - ess = callPackage ../applications/editors/emacs-modes/ess { }; - - flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; - - gh = callPackage ../applications/editors/emacs-modes/gh { }; - - graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { }; - - gist = callPackage ../applications/editors/emacs-modes/gist { }; - - haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; - - hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; - - hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; - - htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; - - ido-ubiquitous = callPackage ../applications/editors/emacs-modes/ido-ubiquitous { }; - - icicles = callPackage ../applications/editors/emacs-modes/icicles { }; - - idris = callPackage ../applications/editors/emacs-modes/idris { }; - - jabber = callPackage ../applications/editors/emacs-modes/jabber { }; - - jade = callPackage ../applications/editors/emacs-modes/jade { }; - - jdee = callPackage ../applications/editors/emacs-modes/jdee { }; - - js2 = callPackage ../applications/editors/emacs-modes/js2 { }; - - let-alist = callPackage ../applications/editors/emacs-modes/let-alist { }; - - logito = callPackage ../applications/editors/emacs-modes/logito { }; - - loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; - - markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { }; - - maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; - - metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; - - monky = callPackage ../applications/editors/emacs-modes/monky { }; - - notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); - - ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; - - offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; - - # This is usually a newer version of Org-Mode than that found in GNU Emacs, so - # we want it to have higher precedence. - org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); - - org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; - - pcache = callPackage ../applications/editors/emacs-modes/pcache { }; - - phpMode = callPackage ../applications/editors/emacs-modes/php { }; - - prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - - proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral/4.4.nix { - texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; - }; - proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix { - texinfo = texinfo4 ; - texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; - }; - - quack = callPackage ../applications/editors/emacs-modes/quack { }; - - rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { }; - - rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { }; - - rudel = callPackage ../applications/editors/emacs-modes/rudel { }; - - s = callPackage ../applications/editors/emacs-modes/s { }; - - sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; - - scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; - scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; - - structuredHaskellMode = haskellPackages.structured-haskell-mode; - - sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; - - tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; - - writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; - - xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; - - cask = callPackage ../applications/editors/emacs-modes/cask { }; - }; - - emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages); - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); - - emacsPackagesNgFor = emacs: import ./emacs-packages.nix { + emacsPackagesFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv pkgs; inherit fetchFromGitHub fetchurl; inherit emacs texinfo makeWrapper runCommand writeText; @@ -18133,12 +17986,12 @@ in }; }; - emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25); - emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26); + emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25); + emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; - emacsWithPackages = emacsPackagesNg.emacsWithPackages; + emacs25WithPackages = emacs25Packages.emacsWithPackages; + emacs26WithPackages = emacs26Packages.emacsWithPackages; + emacsWithPackages = emacsPackages.emacsWithPackages; inherit (gnome3) empathy; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3437f620c74..9ae5a9e1fbd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -192,7 +192,7 @@ let # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 - #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg; + #emacsPackages = packagePlatforms pkgs.emacsPackages; #rPackages = packagePlatforms pkgs.rPackages; ocamlPackages = { }; perlPackages = { }; From cd6e9c06b365e27a4bd15c61437cddf69590f572 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:34 +0100 Subject: [PATCH 203/283] emacs-packages: Remove auto-complete from old emacs package infra Use new auto-generated packages --- .../emacs-modes/auto-complete/default.nix | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/auto-complete/default.nix diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix deleted file mode 100644 index 40f172316ef..00000000000 --- a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "auto-complete-1.3.1"; - - src = fetchurl { - url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2"; - sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj"; - }; - - buildInputs = [ emacs ]; - - preInstall = '' - install -d $out/share/emacs/site-lisp - ''; - - installFlags = "DIR=$(out)/share/emacs/site-lisp"; - - postInstall = '' - ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode - ''; - - meta = { - description = "Auto-complete extension for Emacs"; - homepage = http://cx4a.org/software/auto-complete/; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From d76160105b4fe0c75108db9170138619a282de24 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:35 +0100 Subject: [PATCH 204/283] emacs-packages: Remove bbdb from old emacs package infrastructure --- .../editors/emacs-modes/bbdb/3.nix | 25 ------------- .../editors/emacs-modes/bbdb/default.nix | 35 ------------------- .../emacs-modes/bbdb/install-infodir.patch | 28 --------------- 3 files changed, 88 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/bbdb/3.nix delete mode 100644 pkgs/applications/editors/emacs-modes/bbdb/default.nix delete mode 100644 pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix deleted file mode 100644 index d20ab53bf7e..00000000000 --- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "bbdb-3.1.2"; - - src = fetchurl { - url = "https://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz"; - sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05"; - }; - - buildInputs = [ emacs ]; - - # Hack to disable documentation as there is no way to tell bbdb to - # NOT build pdfs. I really don't want to pull in TexLive here... - preConfigure = '' - substituteInPlace ./Makefile.in \ - --replace "SUBDIRS = lisp doc tex" "SUBDIRS = lisp" - ''; - - meta = { - homepage = https://savannah.nongnu.org/projects/bbdb/; - description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3"; - license = "GPL"; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix deleted file mode 100644 index 689bcfc9adf..00000000000 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, fetchurl, emacs, texinfo, ctags}: - -stdenv.mkDerivation rec { - name = "bbdb-2.36"; - - src = fetchurl { - # not using mirror:// because it produces a different file - url = "http://bbdb.sourceforge.net/${name}.tar.gz"; - sha256 = "1rmw94l71ahfbynyy0bijfy488q9bl5ksl4zpvg7j9dbmgbh296r"; - }; - - patches = [ ./install-infodir.patch ]; - - buildInputs = [emacs texinfo ctags]; - configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ]; - preInstall = "mkdir -p $out/info"; - installTargets = "install-pkg texinfo"; - postInstall = '' - mv $out/info $out/share/ - mv "$out/share/emacs/site-lisp/lisp/bbdb/"* $out/share/emacs/site-lisp/ - mv $out/share/emacs/site-lisp/etc/bbdb $out/share/ - rm -rf $out/share/emacs/site-lisp/{lisp,etc} - mv bits $out/share/bbdb/ - # Make optional modules from bbdb available for import, but symlink - # them into the site-lisp directory to make it obvious that they are - # not a genuine part of the distribution. - ln -s "$out/share/bbdb/bits/"*.el $out/share/emacs/site-lisp/ - ''; - - meta = { - homepage = http://bbdb.sourceforge.net/; - description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs"; - license = "GPL"; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch b/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch deleted file mode 100644 index 31ae6b26698..00000000000 --- a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- bbdb-2.35/texinfo/Makefile.in 2001-11-20 09:00:12.000000000 +0100 -+++ bbdb-2.35/texinfo/Makefile.in 2008-02-20 12:07:36.000000000 +0100 -@@ -27,22 +27,22 @@ all: info bbdb.dvi - install-pkg: uninstall-pkg info - @if test "x$(SYMLINKS)" = "xno" ; then \ - for i in `ls bbdb.info* ` ; do \ -- $(INSTALL_DATA) $$i $(PACKAGEDIR)/info/ ; \ -+ $(INSTALL_DATA) $$i $(infodir)/ ; \ - done ; \ - else \ - if test "x$(LINKPATH)" = "x" ; then \ - for i in `ls bbdb.info* ` ; do \ -- $(LN_S) `pwd`/$$i $(PACKAGEDIR)/info/$$i ; \ -+ $(LN_S) `pwd`/$$i $(infodir)/$$i ; \ - done ; \ - else \ - for i in `ls bbdb.info* ` ; do \ -- $(LN_S) $(LINKPATH)/texinfo/$$i $(PACKAGEDIR)/info/$$i ; \ -+ $(LN_S) $(LINKPATH)/texinfo/$$i $(infodir)/$$i ; \ - done ; \ - fi ; \ - fi - - uninstall-pkg: -- -$(RM) $(PACKAGEDIR)/info/bbdb.info* -+ -$(RM) $(infodir)/bbdb.info* - - info: bbdb.info From 588adcc20e7ba9788ceb8c5c27a68f76d136f60a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:35 +0100 Subject: [PATCH 205/283] emacs-packages: Remove calfw from old emacs package infrastructure --- .../editors/emacs-modes/calfw/default.nix | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/calfw/default.nix diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix deleted file mode 100644 index b8c61bb97af..00000000000 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchgit, stdenv, emacs }: - -# TODO: byte-compile in build phase - a buildEmacsPackage that does -# that would be nice - -stdenv.mkDerivation rec { - name = "calfw-1.3-5-ga9b6615"; - - src = fetchgit { - url = "git://github.com/kiwanami/emacs-calfw.git"; - rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d"; - sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393"; - }; - - buildInputs = [ emacs ]; - - installPhase = - '' - mkdir -p "$out/share/doc/${name}" - cp -v readme.md "$out/share/doc/${name}" - - mkdir -p "$out/share/emacs/site-lisp/" - cp *.el "$out/share/emacs/site-lisp/" - ''; - - meta = { - description = "A calendar framework for Emacs"; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; -} From d3bc11da929c0126ea442abb115efb167b602b75 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:35 +0100 Subject: [PATCH 206/283] emacs-packages: Remove cask from old emacs package infrastructure --- .../editors/emacs-modes/cask/default.nix | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/cask/default.nix diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix deleted file mode 100644 index 34120db6aa7..00000000000 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, python }: - -stdenv.mkDerivation rec { - version = "0.8.4"; - name = "cask-${version}"; - - src = fetchFromGitHub { - owner = "cask"; - repo = "cask"; - rev = "v${version}"; - sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686"; - }; - - buildInputs = [ emacs python ]; - - # byte-compiling emacs files automatically triggers cask's bootstrap - # mechanism, what we don't want. - dontBuild = true; - - installPhase = '' - install -d "$out/share/emacs/site-lisp" - install cask*.el* "$out/share/emacs/site-lisp" - - install -d "$out/bin" - install bin/cask "$out/bin" - - # We also need to install cask's templates in order for 'cask - # init' to work properly. - install -d "$out/templates" - install templates/* "$out/templates" - - # In order to work with cask's hard coded file paths (during bootstrap), - # we have to create these links. - ln -s "$out/share/emacs/site-lisp/"* "$out" - - # This file disables cask's self-updating function. - touch "$out/.no-upgrade" - ''; - - meta = with stdenv.lib; { - description = "Project management tool for Emacs"; - longDescription = - '' - Cask is a project management tool for Emacs that helps automate the - package development cycle; development, dependencies, testing, - building, packaging and more. Cask can also be used to manage - dependencies for your local Emacs configuration. - ''; - homepage = https://github.com/cask/cask; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ ]; - }; -} From 6dc2d9645cac7b7e4fc0110615c13dc483aad5ff Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:35 +0100 Subject: [PATCH 207/283] emacs-packages: Remove color-theme from old emacs package infrastructure --- .../emacs-modes/color-theme/default.nix | 26 ----------------- .../emacs-modes/color-theme/fix-build.patch | 19 ------------- .../emacs-modes/color-theme/gnus-bug.diff | 28 ------------------- 3 files changed, 73 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/color-theme/default.nix delete mode 100644 pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch delete mode 100644 pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix deleted file mode 100644 index 407b9e58f0b..00000000000 --- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation rec { - name = "color-theme-6.6.0"; - - src = fetchurl { - url = "mirror://savannah/color-theme/${name}.tar.gz"; - sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn"; - }; - - # patches from http://aur.archlinux.org/packages.php?ID=54883 - patches = [ ./fix-build.patch ./gnus-bug.diff ]; - - buildInputs = [ emacs ]; - - installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ]; - installTargets = "install-bin"; - - meta = { - description = "Emacs-lisp mode for skinning your Emacs"; - homepage = https://www.nongnu.org/color-theme; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch b/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch deleted file mode 100644 index cfc237c8cdc..00000000000 --- a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Makefile 2009-05-15 18:22:49.000000000 +0200 -+++ b/Makefile 2009-05-16 08:59:36.000000000 +0200 -@@ -15,6 +15,7 @@ - TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE)) - MANUAL = color-theme - MISC = AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in -+LOADPATH = "$(shell pwd)" "$(shell pwd)/themes" - #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \ - #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \ - #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi -@@ -47,7 +48,7 @@ - - %.elc: %.el - @$(EMACS) $(OPTIONCOMPILE) \ -- --eval '(setq load-path (cons "." load-path))' \ -+ --eval '(setq load-path (append load-path (list $(LOADPATH))))' \ - -f batch-byte-compile $< - - %.info: %.texi diff --git a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff b/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff deleted file mode 100644 index 9d227df562e..00000000000 --- a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el ---- color-theme-6.6.0.orig/color-theme.el 2011-11-18 01:17:29.000000000 +0100 -+++ color-theme-6.6.0.new/color-theme.el 2011-11-18 01:24:07.000000000 +0100 -@@ -73,9 +73,10 @@ - "Non-nil if running XEmacs.") - - ;; Add this since it appears to miss in emacs-2x --(or (fboundp 'replace-in-string) -- (defun replace-in-string (target old new) -- (replace-regexp-in-string old new target))) -+(if (fboundp 'replace-in-string) -+ (defalias 'color-theme-replace-in-string 'replace-in-string) -+ (defsubst color-theme-replace-in-string (target old new &optional literal) -+ (replace-regexp-in-string old new target nil literal))) - - ;; face-attr-construct has a problem in Emacs 20.7 and older when - ;; dealing with inverse-video faces. Here is a short test to check -@@ -1626,8 +1627,8 @@ - (add-to-list 'color-themes - (list ',n - (upcase-initials -- (replace-in-string -- (replace-in-string -+ (color-theme-replace-in-string -+ (color-theme-replace-in-string - (symbol-name ',n) "^color-theme-" "") "-" " ")) - ,author)) - (defun ,n () From 743b468cdd5bcd005fd402c69e1e908204c1e54a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:36 +0100 Subject: [PATCH 208/283] emacs-packages: Remove cryptol from old emacs package infrastructure --- .../editors/emacs-modes/cryptol/default.nix | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/cryptol/default.nix diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix deleted file mode 100644 index 5b408ad7999..00000000000 --- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "cryptol-mode-${version}"; - version = "0.1.0"; - - src = fetchurl { - url = "https://github.com/thoughtpolice/cryptol-mode/archive/v${version}.tar.gz"; - sha256 = "1qyrqvfgpg1nyk1clv7v94r3amm02613hrak5732xzn6iak81cc0"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs major mode for Cryptol"; - homepage = "https://thoughtpolice/cryptol-mode"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} From c6c316eb2f112a0d3a2a4205a594f1d7b2a8f04b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:36 +0100 Subject: [PATCH 209/283] emacs-packages: Remove d from old emacs package infrastructure --- .../editors/emacs-modes/d/default.nix | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/d/default.nix diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix deleted file mode 100644 index 28736acded2..00000000000 --- a/pkgs/applications/editors/emacs-modes/d/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, emacs}: - -# Note: Don't have a version, using date as fallback. -let version = "20150111"; - -in stdenv.mkDerivation { - name = "emacs-d-${version}"; - - src = fetchurl { - url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz"; - sha256 = "0vb0za51lc6qf1qgqisap4vzk36caa5k17zajjn034rhjsqfw0w7"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Major mode for editing D code"; - homepage = https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - }; - -} From 9ff83498eec17fb1f7ca7e6a17825e2a3df10951 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:36 +0100 Subject: [PATCH 210/283] emacs-packages: Remove darcsum from old emacs package infrastructure --- .../editors/emacs-modes/darcsum/darcs_context | 7 ---- .../editors/emacs-modes/darcsum/default.nix | 34 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/darcsum/darcs_context delete mode 100644 pkgs/applications/editors/emacs-modes/darcsum/default.nix diff --git a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context b/pkgs/applications/editors/emacs-modes/darcsum/darcs_context deleted file mode 100644 index 7e9de1ed80b..00000000000 --- a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context +++ /dev/null @@ -1,7 +0,0 @@ - -Context: - -[TAG 1.3 -Simon Michael **20131103203640 - Ignore-this: d12bac373e4aa0e5ffe6c390e1dfe269 -] diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix deleted file mode 100644 index 0a1c2c77b2a..00000000000 --- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -# To automatically load darcsum when needed, add the following to your emacs init file: -# -# (autoload 'darcsum-changes "darcsum" nil t) -# (autoload 'darcsum-whatsnew "darcsum" nil t) -# (autoload 'darcsum-view "darcsum" nil t) -# -# (These lines were copied from 50darcsum.el in the darcsum repository.) - - -{ fetchdarcs, stdenv }: - -stdenv.mkDerivation { - name = "darcsum-1.3"; - - src = fetchdarcs { - url = http://hub.darcs.net/simon/darcsum; - context = ./darcs_context; - sha256 = "18dyk2apmnjapd604a5njfqwjri1mc7lgjaajy9phicpibgdrwzh"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - install -d "$out/share/emacs/site-lisp" - install darcsum.el "$out/share/emacs/site-lisp" - ''; - - meta = { - description = "A pcl-cvs like interface for managing darcs patches"; - homepage = http://hub.darcs.net/simon/darcsum; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.falsifian ]; - }; -} From d12e80ca4a07d914ff3a258e1fd1bf5d1821aade Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:36 +0100 Subject: [PATCH 211/283] emacs-packages: Remove ecb from old emacs package infrastructure --- .../editors/emacs-modes/ecb/default.nix | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/ecb/default.nix diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix deleted file mode 100644 index 807bb91f850..00000000000 --- a/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchurl, stdenv, emacs, cedet, jdee, texinfo }: - -stdenv.mkDerivation rec { - name = "ecb-2.40"; - - src = fetchurl { - url = "mirror://sourceforge/ecb/${name}.tar.gz"; - sha256 = "0gp56ixfgnyk2j1fps4mk1yv1vpz81kivb3gq9f56jw4kdlhjrjs"; - }; - - buildInputs = [ emacs ]; - propagatedBuildInputs = [ cedet jdee ]; - propagatedUserEnvPkgs = propagatedBuildInputs; - - patchPhase = '' - sed -i "Makefile" \ - -e 's|CEDET[[:blank:]]*=.*$|CEDET = ${cedet}/share/emacs/site-lisp|g ; - s|INSTALLINFO[[:blank:]]*=.*$|INSTALLINFO = ${texinfo}/bin/install-info|g ; - s|MAKEINFO[[:blank:]]*=.*$|MAKEINFO = ${texinfo}/bin/makeinfo|g ; - s|common/cedet.el|cedet.el|g' - ''; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp" - - mkdir -p "$out/share/info" - cp -v info-help/*.info* "$out/share/info" - ''; - - meta = { - description = "ECB, the Emacs Code browser"; - - longDescription = '' - ECB stands for "Emacs Code Browser". While Emacs already has - good editing support for many modes, its browsing support is - somewhat lacking. That's where ECB comes in: it displays a - number of informational windows that allow for easy source code - navigation and overview. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://ecb.sourceforge.net/; - - maintainers = [ ]; - }; -} From ff92c81d905617560c74d43a0711e756f1dd1f71 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:36 +0100 Subject: [PATCH 212/283] emacs-packages: Remove emacs-w3m from old emacs package infrastructure --- .../editors/emacs-modes/emacs-w3m/default.nix | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix deleted file mode 100644 index 8e1d7092e6a..00000000000 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }: - -let date = "2013-03-21"; in -stdenv.mkDerivation rec { - name = "emacs-w3m-cvs${date}"; - - # Get the source from CVS because the previous release (1.4.4) is old and - # doesn't work with GNU Emacs 23. - src = fetchcvs { - inherit date; - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ emacs w3m texinfo ]; - - # XXX: Should we do the same for xpdf/evince, gv, gs, etc.? - patchPhase = '' - sed -i "w3m.el" \ - -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ; - s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g' - - sed -i "w3m-image.el" \ - -e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ; - s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g' - ''; - - configureFlags = [ - "--with-lispdir=$(out)/share/emacs/site-lisp" - "--with-icondir=$(out)/share/emacs/site-lisp/images/w3m" - ]; - - postInstall = '' - cd "$out/share/emacs/site-lisp" - for i in ChangeLog* - do - mv -v "$i" "w3m-$i" - done - ''; - - meta = { - description = "Emacs-w3m, a simple Emacs interface to the w3m web browser"; - - longDescription = '' - Emacs/W3 used to be known as the most popular WEB browser on Emacs, but - it worked so slowly that we wanted a simple and speedy alternative. - - w3m is a pager with WWW capability, developed by Akinori ITO. Although - it is a pager, it can be used as a text-mode WWW browser. Then we - developed a simple Emacs interface to w3m. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://emacs-w3m.namazu.org/; - - maintainers = [ ]; - }; -} From ffd0fb4c8e38d5e724c982834e02e48bf2687c74 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:37 +0100 Subject: [PATCH 213/283] emacs-packages: Remove emms from old emacs package infrastructure --- .../editors/emacs-modes/emms/default.nix | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/emms/default.nix diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix deleted file mode 100644 index f966989b5a3..00000000000 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchurl, emacs, texinfo -, mpg321, vorbis-tools, taglib, mp3info, alsaUtils }: - -# XXX: EMMS also supports Xine, MPlayer, Jack, etc. - -stdenv.mkDerivation rec { - name = "emms-3.0"; - - src = fetchurl { - # These guys don't use ftp.gnu.org... - url = "https://www.gnu.org/software/emms/download/${name}.tar.gz"; - sha256 = "151mfx97x15lfpd1qc2sqbvhwhvg46axgh15qyqmdy42vh906xav"; - }; - - buildInputs = [ emacs texinfo ]; - - configurePhase = '' - sed -i "Makefile" -e "s|PREFIX *=.*\$|PREFIX = $out|g ; - s|/usr/sbin/install-info|install-info|g ; - s|/usr/include/taglib|${taglib}/include/taglib|g ; - s|/usr/lib|${taglib}/lib|g ; - s|^all:\(.*\)\$|all:\1 emms-print-metadata|g" - mkdir -p "$out/share/man/man1" - - sed -i "emms-player-mpg321-remote.el" \ - -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g' - sed -i "emms-player-simple.el" \ - -e 's|"ogg123"|"${vorbis-tools}/bin/ogg123"|g' - sed -i "emms-info-ogginfo.el" \ - -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbis-tools}/bin/ogginfo"|g' - sed -i "emms-info-libtag.el" \ - -e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g" - sed -i "emms-volume-amixer.el" \ - -e 's|"amixer"|"${alsaUtils}/bin/amixer"|g' - - # Use the libtag info back-end for MP3s since we're building it. - sed -i "emms-setup.el" \ - -e 's|emms-info-mp3info|emms-info-libtag|g' - - # But use mp3info for the tag editor. - sed -i "emms-info-mp3info.el" \ - -e 's|emms-info-mp3info-program-name[[:blank:]]\+"mp3info"|emms-info-mp3info-program-name "${mp3info}/bin/mp3info"|g' - sed -i "emms-tag-editor.el" \ - -e 's|"mp3info"|"${mp3info}/bin/mp3info"|g' - ''; - - postInstall = '' - mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin" - ''; - - meta = { - description = "GNU EMMS, The Emacs Multimedia System"; - - longDescription = '' - EMMS is the Emacs Multimedia System. It tries to be a clean and - small application to play multimedia files from Emacs using - external players. Many of it's ideas are derived from - MpthreePlayer, but it tries to be more general and cleaner. - - The fact that EMMS is based on external players makes it - powerful, because it supports all formats that those players - support, with no effort from your side. - ''; - - homepage = https://www.gnu.org/software/emms/; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; - broken = true; - }; -} From 65938fa496c69d1adcd0a01e20323eb1cc47aff7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:37 +0100 Subject: [PATCH 214/283] emacs-packages: Remove ensime from old emacs package infrastructure --- .../editors/emacs-modes/ensime/default.nix | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/ensime/default.nix diff --git a/pkgs/applications/editors/emacs-modes/ensime/default.nix b/pkgs/applications/editors/emacs-modes/ensime/default.nix deleted file mode 100644 index d776103a662..00000000000 --- a/pkgs/applications/editors/emacs-modes/ensime/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s, scalaMode2, sbtMode }: - -stdenv.mkDerivation { - name = "emacs-ensime-2014-09-04"; - - src = fetchurl { - url = "https://github.com/ensime/ensime-emacs/archive/d3820a3f362975f6e14b817988ec07bfef2b4dad.zip"; - sha256 = "0gwr0r92z2hh2x8g0hpxaar2vvfk1b91cp6v04gaasw0fvl5i7g5"; - }; - - buildInputs = [ emacs unzip ]; - propagatedUserEnvPkgs = [ autoComplete dash s scalaMode2 sbtMode ]; - - buildPhase = '' - emacs -L . -L ${autoComplete}/share/emacs/site-lisp --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} From a6f38b3d76e04f7d5425ba762556790b449c4f5b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:37 +0100 Subject: [PATCH 215/283] emacs-packages: Remove erlang from old emacs package infrastructure --- .../editors/emacs-modes/erlang/default.nix | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/erlang/default.nix diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix deleted file mode 100644 index 463d7fc7e15..00000000000 --- a/pkgs/applications/editors/emacs-modes/erlang/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, erlang }: - -stdenv.mkDerivation { - - name = "erlang-mode-${erlang.version}"; - - buildInputs = [ ]; - - inherit erlang; - - buildCommand = '' - mkdir -p "$out/share/emacs/site-lisp" - cp "$erlang/lib/erlang/lib/tools"*/emacs/*.el $out/share/emacs/site-lisp/ - ''; - - # emacs highlighting */ - - meta = with stdenv.lib; { - homepage = https://github.com/erlang/otp; - description = "Erlang mode for Emacs"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.samuelrivas ]; - }; -} From 6ac327abe7aa655a74c676867f5de053cae522fb Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:37 +0100 Subject: [PATCH 216/283] emacs-packages: Remove ess from old emacs package infrastructure --- .../editors/emacs-modes/ess/default.nix | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/ess/default.nix diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix deleted file mode 100644 index ce335a5d482..00000000000 --- a/pkgs/applications/editors/emacs-modes/ess/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, emacs, texinfo }: - -stdenv.mkDerivation rec { - name = "ess-14.09"; - - src = fetchurl { - url = "http://ess.r-project.org/downloads/ess/${name}.tgz"; - sha256 = "0wa507jfmq3k7x0vigd2yzb4j2190ix4wnnpv7ql4bjy0vfvmwdn"; - }; - - buildInputs = [ emacs texinfo ]; - - configurePhase = "makeFlags=PREFIX=$out"; - - meta = { - description = "Emacs Speaks Statistics"; - homepage = http://ess.r-project.org/; - license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} From c9ff69ec3d5e8836a3c6414adc9d5d6fa3368c02 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:38 +0100 Subject: [PATCH 217/283] emacs-packages: Remove flymake-cursor from old emacs package infrastructure --- .../emacs-modes/flymake-cursor/default.nix | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix deleted file mode 100644 index eae338d241d..00000000000 --- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "flymake-cursor-0.1.5"; - - src = fetchurl { - url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el"; - sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src flymake-cursor.el - emacs --batch -f batch-byte-compile flymake-cursor.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Displays flymake error msg in minibuffer after delay"; - homepage = http://www.emacswiki.org/emacs/flymake-cursor.el; - license = stdenv.lib.licenses.publicDomain; - }; -} From f42f46f682bad24e8762b69f8a89f8a2089bbe13 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:38 +0100 Subject: [PATCH 218/283] emacs-packages: Remove gh from old emacs package infrastructure --- .../editors/emacs-modes/gh/default.nix | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/gh/default.nix diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix deleted file mode 100644 index aa59eace2ae..00000000000 --- a/pkgs/applications/editors/emacs-modes/gh/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, emacs, pcache, logito }: - -stdenv.mkDerivation rec { - name = "gh-0.5.3"; - - src = fetchgit { - url = "https://github.com/sigma/gh.el.git"; - rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e"; - sha256 = "1pciq16vl5l4kvj08q4ib1jzk2bb2y1makcsyaw8k9jblqviw756"; - }; - - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ pcache logito ]; - - patchPhase = '' - sed -i Makefile \ - -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \ - -e "s|/usr/local|$out|" \ - -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|" - ''; - - buildPhase = "make lisp"; - - meta = { - description = "A (very early) GitHub client library for Emacs"; - homepage = https://github.com/sigma/gh.el; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From cec46692f62c8c4f5aebe8ec5c026be31734eacb Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:38 +0100 Subject: [PATCH 219/283] emacs-packages: Remove gist from old emacs package infrastructure --- .../editors/emacs-modes/gist/default.nix | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/gist/default.nix diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix deleted file mode 100644 index 08471247f08..00000000000 --- a/pkgs/applications/editors/emacs-modes/gist/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchgit, emacs, gh, pcache, logito }: - -stdenv.mkDerivation rec { - name = "gist-1.0"; - - src = fetchgit { - url = "https://github.com/sigma/gist.el.git"; - rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed"; - sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L ${gh}/share/emacs/site-lisp \ - -L ${pcache}/share/emacs/site-lisp \ - -L ${logito}/share/emacs/site-lisp \ - --eval '(setq user-emacs-directory "./")' \ - --batch -f batch-byte-compile gist.el - ''; - - propagatedUserEnvPkgs = [ gh pcache logito ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install gist.el gist.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs integration for gist.github.com"; - homepage = https://github.com/sigma/gist.el; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From f6350284d21c17a2a48518c2c4159e3a32705d76 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:38 +0100 Subject: [PATCH 220/283] emacs-packages: Remove graphviz-dot from old emacs package infrastructure --- .../emacs-modes/graphviz-dot/default.nix | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix deleted file mode 100644 index a08f138bed9..00000000000 --- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "graphviz-dot-mode-0.3.3"; - - src = fetchurl { - url = "http://www.graphviz.org/Misc/graphviz-dot-mode.el"; - sha256 = "6465c18cfaa519a063cf664207613f70b0a17ac5eabcfaa949b3c4c289842953"; - }; - - buildInputs = [ emacs ]; - - dontUnpack = true; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v ${src} "$out/share/emacs/site-lisp/graphviz-dot-mode.el" - emacs -batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile "$out/share/emacs/site-lisp/graphviz-dot-mode.el" - ''; - - meta = { - homepage = http://www.graphviz.org/; - description = "An emacs mode for the DOT Language, used by graphviz"; - }; -} From 84a09cad680d2f1c73398ccafa1ed275807de6bf Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:38 +0100 Subject: [PATCH 221/283] emacs-packages: Remove haskell from old emacs package infrastructure --- .../editors/emacs-modes/haskell/default.nix | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/haskell/default.nix diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix deleted file mode 100644 index 6b10766bedb..00000000000 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo }: - -# Use "emacsMelpa.haskell-mode" instead. - -let - version = "13.14-169-g0d3569d"; # git describe --tags -in -stdenv.mkDerivation { - name = "haskell-mode-${version}"; - - src = fetchFromGitHub { - owner = "haskell"; - repo = "haskell-mode"; - rev = "v${version}"; - sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k"; - }; - - buildInputs = [ emacs texinfo ]; - - makeFlags = "VERSION=v${version} GIT_VERSION=v${version}"; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc *.hs $out/share/emacs/site-lisp/ - mkdir -p $out/share/info - cp -v *.info* $out/share/info/ - ''; - - # The test suite must run *after* copying the generated files to $out - # because "make check" implies "make clean". - doInstallCheck = true; - installCheckTarget = "check"; - - meta = { - homepage = https://github.com/haskell/haskell-mode; - description = "Haskell mode for Emacs"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; - broken = true; # no longer compiles and this package is obsolete anyway - }; -} From 6b2f177737305a03095685a0615055b7c4b61083 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:39 +0100 Subject: [PATCH 222/283] emacs-packages: Remove htmlize from old emacs package infrastructure --- .../editors/emacs-modes/htmlize/default.nix | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/htmlize/default.nix diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix deleted file mode 100644 index c16f449c3a2..00000000000 --- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - name = "htmlize-1.47"; - - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "htmlize"; - rev = "release/1.47"; - name = "htmlize-1.47-src"; - sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp"; - }; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp htmlize.el $out/share/emacs/site-lisp/ - ''; - - meta = { - description = "Convert buffer text and decorations to HTML"; - }; -} From 26af6f335bdeb92bf25f75ad7d6e5678501f4dfc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:39 +0100 Subject: [PATCH 223/283] emacs-packages: Remove idris from old emacs package infrastructure --- .../editors/emacs-modes/idris/default.nix | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/idris/default.nix diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix deleted file mode 100644 index 2e168b3abf7..00000000000 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "idris-mode"; - version = "0.9.18"; - - src = fetchurl { - url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; - sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs major mode for Idris"; - homepage = https://github.com/idris-hackers/idris-mode; - license = stdenv.lib.licenses.gpl3; - - platforms = stdenv.lib.platforms.all; - }; -} From f4c2f9794d2bef809a2d961580902c126390e2b0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:39 +0100 Subject: [PATCH 224/283] emacs-packages: Remove jabber from old emacs package infrastructure --- .../editors/emacs-modes/jabber/default.nix | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/jabber/default.nix diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix deleted file mode 100644 index c0ddbc88cf2..00000000000 --- a/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, emacs }: -stdenv.mkDerivation rec { - pname = "emacs-jabber"; - version = "0.8.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26"; - }; - buildInputs = [ emacs ]; - meta = with stdenv.lib; { - description = "A Jabber client for Emacs"; - longDescription = '' - jabber.el is a Jabber client for Emacs. It may seem strange to have a - chat client in an editor, but consider that chatting is, after all, just - a special case of text editing. - ''; - homepage = http://emacs-jabber.sourceforge.net/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; - }; -} From 438131a1a46c9bfe43919b7a8c081d0cdfd50c18 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:39 +0100 Subject: [PATCH 225/283] emacs-packages: Remove jade from old emacs package infrastructure --- .../editors/emacs-modes/jade/default.nix | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/jade/default.nix diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix deleted file mode 100644 index 925fa54c735..00000000000 --- a/pkgs/applications/editors/emacs-modes/jade/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation { - name = "jade-mode-0-20120802"; - - src = fetchgit { - url = "https://github.com/brianc/jade-mode.git"; - rev = "275ab149edb0f6bcfae6ac17ba456f3351191604"; - sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -L . -f batch-byte-compile *.el - ''; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc $out/share/emacs/site-lisp/ - ''; - - meta = { - description = "Emacs major mode for jade and stylus"; - homepage = https://github.com/brianc/jade-mode; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From 0e7598677c599daafcb4854c025870afdfbca596 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:40 +0100 Subject: [PATCH 226/283] emacs-packages: Remove jdee from old emacs package infrastructure --- .../emacs-modes/jdee/build-properties.patch | 12 -- .../emacs-modes/jdee/cedet-paths.patch | 18 --- .../editors/emacs-modes/jdee/default.nix | 99 ----------------- .../emacs-modes/jdee/elib-avltree.patch | 105 ------------------ .../emacs-modes/jdee/java-directory.patch | 82 -------------- 5 files changed, 316 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/build-properties.patch delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/default.nix delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch delete mode 100644 pkgs/applications/editors/emacs-modes/jdee/java-directory.patch diff --git a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch b/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch deleted file mode 100644 index d0a733b912e..00000000000 --- a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch +++ /dev/null @@ -1,12 +0,0 @@ -Make sure `build.properties' is honored. - ---- jde/build.xml -+++ jde/build.xml -@@ -14,6 +14,7 @@ - - - -+ - - - diff --git a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch b/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch deleted file mode 100644 index 8c866e2d1db..00000000000 --- a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ -JDE insists on seeing CEDET's source tree layout, with various -sub-directories (`common', `eieio', etc.). However, the installed CEDET -is flat, with everything under ${cedet}/share/emacs/site-lisp. - ---- jde/config/build.el (revision 90) -+++ jde/config/build.el (working copy) -@@ -50,10 +50,5 @@ PATHS are sub directories under CEDET-DI - (jde-make-autoloads-and-compile (expand-file-name "@{build.lisp.dir}") - "@{src.lisp.dir}" - "@{cedet.dir}" -- '("common" -- "eieio" -- "semantic" -- "semantic/bovine" -- "speedbar" -- ) -+ '(".") - "@{build.lisp.autoload.libname}") diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix deleted file mode 100644 index 306fe66823c..00000000000 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ fetchsvn, stdenv, emacs, cedet, ant }: - -let - revision = "137"; -in - stdenv.mkDerivation rec { - name = "jdee-svn${revision}"; - - # Last release is too old, so use SVN. - # See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment . - src = fetchsvn { - url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee"; - rev = revision; - sha256 = "1z1y957glbqm7z3dhah9h4jysw3173pq1gpx5agfwcw614n516xz"; - }; - - patchFlags = "-p1 --ignore-whitespace"; - - patches = [ - ./build-properties.patch - ./cedet-paths.patch ./elib-avltree.patch - ./java-directory.patch - ]; - - configurePhase = '' - mkdir -p "dist" - cat > build.properties < Date: Sun, 18 Aug 2019 17:02:40 +0100 Subject: [PATCH 227/283] emacs-packages: Remove js2 from old emacs package infrastructure --- .../editors/emacs-modes/js2/default.nix | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/js2/default.nix diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix deleted file mode 100644 index bc94828ec51..00000000000 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation { - name = "js2-mode-0-20141118"; - - src = fetchgit { - url = "git://github.com/mooz/js2-mode.git"; - rev = "3abcd90ddc2f446ddf0fb874dd79ba870c26ad2d"; - sha256 = "0sh9ax2w0ydhjjn4vnwbgy3926p7ad6h6nmsnm0a3zlldj9a4vwn"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile js2-mode.el - ''; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/ - ''; -} From b25416192340401d65344b3264215de6c7984d79 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:40 +0100 Subject: [PATCH 228/283] emacs-packages: Remove let-alist from old emacs package infrastructure --- .../editors/emacs-modes/let-alist/default.nix | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/let-alist/default.nix diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix deleted file mode 100644 index f6fee846f92..00000000000 --- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "let-alist-1.0.3"; - - src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.3.el"; - sha256 = "12n1cmjc7hzyy0jmsdxqz1hqzg4ri4nvvi0p9mw1d6v44xzfm0mx"; - }; - - buildInputs = [ emacs ]; - - unpackPhase = "cp -v ${src} let-alist.el"; - buildPhase = "emacs --batch -f batch-byte-compile let-alist.el"; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - mv -v *.el *.elc $out/share/emacs/site-lisp/ - ''; - - meta = { - homepage = https://elpa.gnu.org/packages/let-alist.html; - description = "Easily let-bind values of an assoc-list by their names"; - license = stdenv.lib.licenses.gpl3Plus; - }; -} From 7c3726ae9577a9f5d7f2f0b63295eb6f5845a4a1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:40 +0100 Subject: [PATCH 229/283] emacs-packages: Remove logito from old emacs package infrastructure --- .../editors/emacs-modes/logito/default.nix | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/logito/default.nix diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix deleted file mode 100644 index c324e395fa9..00000000000 --- a/pkgs/applications/editors/emacs-modes/logito/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation rec { - name = "logito-0.1"; - - src = fetchgit { - url = "https://github.com/sigma/logito.git"; - rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052"; - sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile logito.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install logito.el logito.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Tiny logging framework for Emacs"; - homepage = https://github.com/sigma/logito; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From fb4ba957da5fa175ec700479b1ff7ce8b8d70a69 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:40 +0100 Subject: [PATCH 230/283] emacs-packages: Remove lorem-ipsum from old emacs package infrastructure --- .../emacs-modes/lorem-ipsum/default.nix | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix deleted file mode 100644 index b75c51d3bd7..00000000000 --- a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "lorem-ipsum-0.1"; - - src = fetchurl { - url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el"; - sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src lorem-ipsum.el - emacs --batch -f batch-byte-compile lorem-ipsum.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Insert dummy pseudo Latin text for Emacs"; - homepage = http://www.emacswiki.org/emacs/LoremIpsum; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From ed3d9288a16c87e13b2a9ba03a87eec926504e91 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:41 +0100 Subject: [PATCH 231/283] emacs-packages: Remove markdown-mode from old emacs package infrastructure --- .../emacs-modes/markdown-mode/default.nix | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/markdown-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix deleted file mode 100644 index 7176b289b8b..00000000000 --- a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs }: - -let - version = "2.0-82-gfe30ef7"; -in -stdenv.mkDerivation { - name = "markdown-mode-${version}"; - - src = fetchFromGitHub { - owner = "defunkt"; - repo = "markdown-mode"; - rev = "v${version}"; - sha256 = "14a6r05j0g2ppq2q4kd14qyxwr6yv5jwndavbwzkmp6qhmm9k8nz"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta.license = stdenv.lib.licenses.gpl3Plus; -} From ea726bf658080a673da4e5d060146b02ad06ba64 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:41 +0100 Subject: [PATCH 232/283] emacs-packages: Remove maude from old emacs package infrastructure --- .../editors/emacs-modes/maude/default.nix | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/maude/default.nix diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix deleted file mode 100644 index 9b737a938a1..00000000000 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation { - name = "maude-mode-0.2"; - - src = fetchurl { - url = "mirror://sourceforge/maude-mode/maude-mode-0.2.tar.gz"; - sha256 = "19jdd7la0bxxxnnq4ryckf63jykg0r3v92z126x6djaigi3xn1yx"; - }; - - buildInputs = [emacs]; - configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ]; - - meta = { - description = "Emacs mode for the programming language Maude"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.peti ]; - }; -} From 07e7cf853ac2c986888e0892bb4c09a7557644c0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:41 +0100 Subject: [PATCH 233/283] emacs-packages: Remove metaweblog from old emacs package infrastructure --- .../emacs-modes/metaweblog/default.nix | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/metaweblog/default.nix diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix deleted file mode 100644 index a5633cdfaba..00000000000 --- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, emacs, xmlRpc }: - -stdenv.mkDerivation rec { - name = "metaweblog-0.1"; - - src = fetchgit { - url = https://github.com/punchagan/metaweblog.git; - rev = "ceda65048afaa4c7596c7f50ced998c59ef41167"; - sha256 = "a4c10bb1b4be574e560f87d5f07da4e24e5fffe9ecc83e6d4f9325f3a7eb1e2f"; - }; - - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ xmlRpc ]; - - buildPhase = '' - emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el* $out/share/emacs/site-lisp - ''; - - meta = { - description = "An emacs library to access metaweblog based weblogs"; - homepage = https://github.com/punchagan/metaweblog; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From 1c00ad630ec055921b7207ed1baeb63929f67bcb Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:41 +0100 Subject: [PATCH 234/283] emacs-packages: Remove monky from old emacs package infrastructure --- .../editors/emacs-modes/monky/default.nix | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/monky/default.nix diff --git a/pkgs/applications/editors/emacs-modes/monky/default.nix b/pkgs/applications/editors/emacs-modes/monky/default.nix deleted file mode 100644 index 8e35a4e2b57..00000000000 --- a/pkgs/applications/editors/emacs-modes/monky/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip }: - -stdenv.mkDerivation { - name = "emacs-monky-20150404"; - - src = fetchurl { - url = "https://github.com/ananthakumaran/monky/archive/48c0200910739b6521f26f6423b2bfb8c38b4482.zip"; - sha256 = "0yp3pzddx7yki9n3qrriqa5p442qyrdivvlc4xbl024vzjyzddrj"; - }; - - buildInputs = [ emacs unzip ]; - - buildPhase = "emacs -L . --batch -f batch-byte-compile *.el"; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} From 3386f5488f512d94096d65a576f26310f52a5276 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:42 +0100 Subject: [PATCH 235/283] emacs-packages: Remove offlineimap from old emacs package infrastructure --- .../emacs-modes/offlineimap/default.nix | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/offlineimap/default.nix diff --git a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix deleted file mode 100644 index e03b1a42ab1..00000000000 --- a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation rec { - rev = "646482203aacdf847d57d0a96263fddcfc33fb61"; - name = "emacs-offlineimap-${rev}"; - - src = fetchgit { - inherit rev; - url = "git://git.naquadah.org/offlineimap-el.git"; - sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - substituteInPlace offlineimap.el --replace "Machine.MachineUI" "machineui" - emacs --batch -f batch-byte-compile offlineimap.el - install -d $out/share/emacs/site-lisp - install offlineimap.el offlineimap.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "OfflineIMAP support for Emacs"; - homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; - broken = true; - }; -} From 5cdc278b4c71d82df240799083ee5b6281262bc3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:42 +0100 Subject: [PATCH 236/283] emacs-packages: Remove org from old emacs package infrastructure --- .../editors/emacs-modes/org/default.nix | 51 ------------------- 1 file changed, 51 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/org/default.nix diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix deleted file mode 100644 index a8250ead7b4..00000000000 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ fetchurl, stdenv, emacs, texinfo, texlive }: - -stdenv.mkDerivation rec { - name = "org-8.3.3"; - - src = fetchurl { - url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "1vhymmd41v7an457xdjhk5zfc4q1x7z64b25rs1ccam5p550cq65"; - }; - - buildInputs = [ emacs ]; - nativeBuildInputs = [ (texlive.combine { - inherit (texlive) scheme-small cm-super; - }) texinfo ]; - - configurePhase = - '' sed -i mk/default.mk \ - -e "s|^prefix\t=.*$|prefix=$out/share|g" - ''; - - postBuild = - '' make doc - ''; - - installPhase = - '' make install install-info - - mkdir -p "$out/share/doc/${name}" - cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}" - - mkdir -p "$out/share/org" - cp -R contrib "$out/share/org/contrib" - ''; - - meta = { - description = "Org-Mode, an Emacs mode for notes, project planning, and authoring"; - - longDescription = - '' Org-mode is for keeping notes, maintaining ToDo lists, doing project - planning, and authoring with a fast and effective plain-text system. - - This package contains a version of Org-mode typically more recent - than that found in GNU Emacs. - ''; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ pSub ]; - platforms = stdenv.lib.platforms.unix; - }; -} From 1349476a9a4d7ca12466348a19bc49ac29ffec32 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:42 +0100 Subject: [PATCH 237/283] emacs-packages: Remove org2blog from old emacs package infrastructure --- .../editors/emacs-modes/org2blog/default.nix | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/org2blog/default.nix diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix deleted file mode 100644 index 5c1aec7e02b..00000000000 --- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, emacs, org, xmlRpc, metaweblog }: - -stdenv.mkDerivation rec { - name = "org2blog-0.8.1"; - - src = fetchgit { - url = https://github.com/punchagan/org2blog.git; - rev = "5f573ff3e4007c16517a5fe28c4f5d8dde3f8a77"; - sha256 = "e83c08ceece92bb507be70046db4a7fa87a4af34ad3f84a727e0bd6a1dd99a33"; - }; - - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ org xmlRpc metaweblog ]; - - buildPhase = '' - emacs -L . -L ${org}/share/emacs/site-lisp/org \ - -L ${xmlRpc}/share/emacs/site-lisp \ - -L ${metaweblog}/share/emacs/site-lisp \ - --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el* $out/share/emacs/site-lisp - ''; - - meta = { - description = "Publish directly from Emacs’ org-mode to WordPress blogs"; - homepage = https://github.com/punchagan/org2blog; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From af4faf11dabbddbf6baa925c64124f4e32f0707d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:42 +0100 Subject: [PATCH 238/283] emacs-packages: Remove pcache from old emacs package infrastructure --- .../editors/emacs-modes/pcache/default.nix | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/pcache/default.nix diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix deleted file mode 100644 index f4dcf03dee8..00000000000 --- a/pkgs/applications/editors/emacs-modes/pcache/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation rec { - name = "pcache-0.2.3"; - - src = fetchgit { - url = "https://github.com/sigma/pcache.git"; - rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6"; - sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile pcache.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install pcache.el pcache.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Persistent caching for Emacs"; - homepage = https://github.com/sigma/pcache.el; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From 61d42be5b081a8727ca461a8a047a3de60b7594d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:42 +0100 Subject: [PATCH 239/283] emacs-packages: Remove php from old emacs package infrastructure --- pkgs/applications/editors/emacs-modes/php/builder.sh | 7 ------- .../applications/editors/emacs-modes/php/default.nix | 12 ------------ 2 files changed, 19 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/php/builder.sh delete mode 100644 pkgs/applications/editors/emacs-modes/php/default.nix diff --git a/pkgs/applications/editors/emacs-modes/php/builder.sh b/pkgs/applications/editors/emacs-modes/php/builder.sh deleted file mode 100644 index 85c44848057..00000000000 --- a/pkgs/applications/editors/emacs-modes/php/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/share/emacs/site-lisp -cd $out/share/emacs/site-lisp -tar xvfz $src -mv php-mode-*/* . -rmdir php-mode-* diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/pkgs/applications/editors/emacs-modes/php/default.nix deleted file mode 100644 index 2b3cf7b2971..00000000000 --- a/pkgs/applications/editors/emacs-modes/php/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "php-mode-1.5.0"; - - src = fetchurl { - url = "mirror://sourceforge/php-mode/${name}.tar.gz"; - sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq"; - }; - - builder = ./builder.sh; -} From 99677ec06b91020baf3ea2d76b38d79932ee657a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:43 +0100 Subject: [PATCH 240/283] emacs-packages: Remove proofgeneral from old emacs package infrastructure --- .../editors/emacs-modes/proofgeneral/4.4.nix | 47 ------------------ .../editors/emacs-modes/proofgeneral/HEAD.nix | 49 ------------------- .../editors/emacs-modes/proofgeneral/pg.patch | 16 ------ 3 files changed, 112 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix deleted file mode 100644 index 0f7ac1d1dc8..00000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }: - -stdenv.mkDerivation rec { - name = "ProofGeneral-${version}"; - version = "4.4"; - - src = fetchFromGitHub { - owner = "ProofGeneral"; - repo = "PG"; - rev = "v${version}"; - sha256 = "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8"; - }; - - buildInputs = [ emacs which ] ++ stdenv.lib.optionals enableDoc [ texinfo texLive ]; - - prePatch = - '' sed -i "Makefile" \ - -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ - s|/sbin/install-info|install-info|g" - - sed -i "bin/proofgeneral" -e's/which/type -p/g' - - chmod +x bin/proofgeneral - - # @image{ProofGeneral-image} fails, so remove it. - sed -i '91d' doc/PG-adapting.texi - sed -i '96d' doc/ProofGeneral.texi - '' + stdenv.lib.optionalString enableDoc - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - ''; - - patches = [ ./pg.patch ]; - - installTargets = [ "install" ] ++ stdenv.lib.optional enableDoc "install-doc"; - - meta = { - description = "Proof General, an Emacs front-end for proof assistants"; - longDescription = '' - Proof General is a generic front-end for proof assistants (also known as - interactive theorem provers), based on the customizable text editor Emacs. - ''; - homepage = http://proofgeneral.inf.ed.ac.uk; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; # arbitrary choice - }; -} diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix deleted file mode 100644 index de72b24f87a..00000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: - -stdenv.mkDerivation (rec { - name = "ProofGeneral-unstable-${version}"; - version = "2018-01-30"; - - src = fetchFromGitHub { - owner = "ProofGeneral"; - repo = "PG"; - rev = "945cada601c5729edd16fcc989a3969c8b34d20a"; - sha256 = "1zjmbhq6c8g8b93nnsvr5pxx6mlcndb0fz152b2h80vfh9663cn8"; - }; - - buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; - - prePatch = - '' sed -i "Makefile" \ - -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ - s|/sbin/install-info|install-info|g" - - # @image{ProofGeneral} fails, so remove it. - sed -i '94d' doc/PG-adapting.texi - sed -i '96d' doc/ProofGeneral.texi - ''; - - preBuild = '' - make clean; - ''; - - installPhase = - if enableDoc - then - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - make install install-doc - '' - else "make install"; - - meta = { - description = "Proof General, an Emacs front-end for proof assistants"; - longDescription = '' - Proof General is a generic front-end for proof assistants (also known as - interactive theorem provers), based on the customizable text editor Emacs. - ''; - homepage = http://proofgeneral.inf.ed.ac.uk; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; # arbitrary choice - }; -}) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch deleted file mode 100644 index 704e4b6c8c7..00000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r c7d8bfff4c0a bin/proofgeneral ---- a/bin/proofgeneral Sat Sep 27 02:25:15 2014 +0100 -+++ b/bin/proofgeneral Sat Sep 27 02:28:16 2014 +0100 -@@ -73,11 +73,7 @@ - - # Try to find Proof General directory - if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then -- # default relative to this script, otherwise PGHOMEDEFAULT -- MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`" -- if [ -d "$MYDIR/generic" ]; then -- PGHOME="$MYDIR" -- elif [ -d "$PGHOMEDEFAULT" ]; then -+ if [ -d "$PGHOMEDEFAULT" ]; then - PGHOME="$PGHOMEDEFAULT" - else - echo "Cannot find the Proof General lisp files: Set PGHOME or use --pghome." From 5413061d52367815130741257cb8b28c04651ad1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:43 +0100 Subject: [PATCH 241/283] emacs-packages: Remove quack from old emacs package infrastructure --- .../editors/emacs-modes/quack/default.nix | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/quack/default.nix diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix deleted file mode 100644 index 94cb3104ecc..00000000000 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ fetchurl, stdenv, emacs }: - -stdenv.mkDerivation { - name = "quack-0.39"; - - src = fetchurl { - # XXX: Upstream URL is not versioned, which might eventually break this. - url = "http://www.neilvandyke.org/quack/quack.el"; - sha256 = "1q5bsllxkibiddwp32306flqm8s3caffnpbqz5ka260avllp4jj5"; - }; - - buildInputs = [ emacs ]; - - dontUnpack = true; - dontConfigure = true; - installPhase = "true"; - - buildPhase = '' - emacsDir="$out/share/emacs/site-lisp" - - mkdir -p "$emacsDir" - cp -v "$src" "$emacsDir/quack.el" - emacs --batch -f batch-byte-compile "$emacsDir/quack.el" - ''; - - meta = { - description = "Enhanced Emacs support for editing and running Scheme code"; - homepage = http://www.neilvandyke.org/quack/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -} From 3e81a52ffb3e1cbd401de6f91754fd52b7d08a41 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:43 +0100 Subject: [PATCH 242/283] emacs-packages: Remove rainbow-delimiters from old emacs package infrastructure --- .../rainbow-delimiters/default.nix | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix deleted file mode 100644 index 2b4223cdc1f..00000000000 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, emacs}: - -let version = "1.3.13"; - -in stdenv.mkDerivation { - name = "emacs-rainbow-delimiters-${version}"; - - src = fetchurl { - url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; - sha256 = "075j3nsk4jm0rs5671n28c1wksrfbvpl9a4f89kzcd7sk1h6ncvl"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} From e7f24e0143a355791af8c471e7de54533a33d661 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:43 +0100 Subject: [PATCH 243/283] emacs-packages: Remove rudel from old emacs package infrastructure --- .../editors/emacs-modes/rudel/default.nix | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/rudel/default.nix diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix deleted file mode 100644 index 0031ffee4d4..00000000000 --- a/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl}: - -let - version = "0.2-4"; -in -stdenv.mkDerivation -{ - name = "rudel-${version}"; - src = fetchurl - { - url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz"; - sha256 = "68247bfb702d929877f6d098932e8b0ca45c573a3510187e1ccc43e5ea194f25"; - }; - - installPhase = '' - for n in . obby zeroconf jupiter; do - mkdir -p "$out/share/emacs/site-lisp/$n"; - cp $n/*.el "$out/share/emacs/site-lisp/$n/"; - done - install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf" - ''; - - meta = { - homepage = http://rudel.sourceforge.net/; - description = "A collaborative editing environment for GNU Emacs"; - license = "GPL"; - }; -} From 7385a605f0422d84f49f0a21456c8c102a8e9d81 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:44 +0100 Subject: [PATCH 244/283] emacs-packages: Remove s from old emacs package infrastructure --- .../editors/emacs-modes/s/default.nix | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/s/default.nix diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix deleted file mode 100644 index b818348939e..00000000000 --- a/pkgs/applications/editors/emacs-modes/s/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, emacs}: - -let version = "1.9.0"; - -in stdenv.mkDerivation { - name = "emacs-s-${version}"; - - src = fetchurl { - url = "https://github.com/magnars/s.el/archive/${version}.tar.gz"; - sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} From 63819cdbe79d817c8c579da2a04cb5ee98ff23c3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:44 +0100 Subject: [PATCH 245/283] emacs-packages: Remove sbt-mode from old emacs package infrastructure --- .../editors/emacs-modes/sbt-mode/default.nix | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/sbt-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix deleted file mode 100644 index 835cf8081af..00000000000 --- a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip }: - -stdenv.mkDerivation { - - name = "sbt-mode-2014-06-05"; - - src = fetchurl { - url = "https://github.com/hvesalai/sbt-mode/archive/676f22d9658989de401d299ed0250db9b911574d.zip"; - sha256 = "0b8qrr3yp48ggl757d3a6bz633mbf4zxqpcwsh47b1ckiwa3nb2h"; - }; - - buildInputs = [ unzip emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v *.el *.elc "$out/share/emacs/site-lisp/" - ''; - - meta = { - homepage = https://github.com/hvesalai/scala-mode2; - description = "An Emacs mode for editing Scala code"; - license = "permissive"; - }; -} From af26fea60e41f4045036cbbe8593796ee45832d6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:44 +0100 Subject: [PATCH 246/283] emacs-packages: Remove scala-mode from old emacs package infrastructure --- .../editors/emacs-modes/scala-mode/v1.nix | 30 ------------------- .../editors/emacs-modes/scala-mode/v2.nix | 24 --------------- 2 files changed, 54 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/scala-mode/v1.nix delete mode 100644 pkgs/applications/editors/emacs-modes/scala-mode/v2.nix diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix deleted file mode 100644 index 7867226ff80..00000000000 --- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchsvn, stdenv, emacs }: - -let revision = "17339"; in -stdenv.mkDerivation rec { - name = "scala-mode-r${revision}"; - - src = fetchsvn { - url = "http://lampsvn.epfl.ch/svn-repos/scala/scala-tool-support/trunk/src/emacs"; - rev = revision; - sha256 = "05g3xk2mxkqwdnyvxklnrdyhppkvhfs2fd21blhzbhf474cgqlyh"; - }; - - buildInputs = [ emacs ]; - - installPhase = - '' mkdir -p "$out/share/emacs/site-lisp" - cp -v *.el *.elc "$out/share/emacs/site-lisp" - ''; - - meta = { - description = "An Emacs mode for editing Scala code"; - - homepage = https://www.scala-lang.org/node/354; - - # non-copyleft, BSD-style - license = "permissive"; - - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix deleted file mode 100644 index 0a44deb8ced..00000000000 --- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip }: - -stdenv.mkDerivation { - - name = "scala-mode2-2014-07-01"; - - src = fetchurl { - url = "https://github.com/hvesalai/scala-mode2/archive/c154f1623f4696d26e1c88d19170e67bf6825837.zip"; - sha256 = "0im2ajb1iagjldh52j8wz4yby68rs3h7shrdf1pqy5ds7s4fa8cc"; - }; - - buildInputs = [ unzip emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v *.el *.elc "$out/share/emacs/site-lisp/" - ''; - - meta = { - homepage = https://github.com/hvesalai/scala-mode2; - description = "An Emacs mode for editing Scala code"; - license = "permissive"; - }; -} From 8a6932bc3d4fcf9e3c929373068a4fc831a4e1a2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:44 +0100 Subject: [PATCH 247/283] emacs-packages: Remove tuareg from old emacs package infrastructure --- .../editors/emacs-modes/tuareg/default.nix | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/tuareg/default.nix diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix deleted file mode 100644 index be03938f8a5..00000000000 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchzip, emacs }: - -# this package installs the emacs-mode which -# resides in the ocaml compiler sources. - -let version = "2.0.9"; - -in stdenv.mkDerivation { - name = "tuareg-mode-${version}"; - src = fetchzip { - url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; - sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp *.el *.elc "$out/share/emacs/site-lisp" - ''; - - meta = { - homepage = https://github.com/ocaml/tuareg; - description = "OCaml mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; - }; -} From 38edd7b05a9f173094436162c76c3c931bdc4c4d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:44 +0100 Subject: [PATCH 248/283] emacs-packages: Remove writegood from old emacs package infrastructure --- .../editors/emacs-modes/writegood/default.nix | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/writegood/default.nix diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix deleted file mode 100644 index 6d0631a4cb8..00000000000 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, emacs}: - -let version = "2.0.2"; - -in stdenv.mkDerivation { - name = "writegood-mode-${version}"; - src = fetchurl { - url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz"; - sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs minor mode that aids in finding common writing problems"; - homepage = https://github.com/bnbeckwith/writegood-mode; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.pSub ]; - license = stdenv.lib.licenses.gpl3; - }; -} From 53d805245aabb2d52825aff2e1460701dc693596 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Aug 2019 17:02:45 +0100 Subject: [PATCH 249/283] emacs-packages: Remove xml-rpc from old emacs package infrastructure --- .../editors/emacs-modes/xml-rpc/default.nix | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/xml-rpc/default.nix diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix deleted file mode 100644 index 661430516b7..00000000000 --- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation rec { - name = "xml-rpc-1.6.8"; - - src = fetchurl { - url = https://launchpadlibrarian.net/40270196/xml-rpc.el; - sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src xml-rpc.el - emacs --batch -f batch-byte-compile xml-rpc.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install xml-rpc.el* $out/share/emacs/site-lisp - ''; - - meta = { - description = "Elisp implementation of clientside XML-RPC"; - homepage = https://launchpad.net/xml-rpc-el; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} From b3d6dd59a6c38d749e14d3cac489cb7e58abbb01 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2019 16:32:52 +0100 Subject: [PATCH 250/283] emacs-packages: Add backwards compatible aliases I want to add that I'm personally not a fan of this and I think we should eventually drop these aliases to closely match the eco-system rather than relying on some ad-hoc names created years ago. --- .../editors/emacs-modes/manual-packages.nix | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 34b81cc8329..92c9f96ed70 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -152,12 +152,47 @@ cua = callPackage ./cua { }; emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { }; emacsSessionManagement = callPackage ./session-management-for-emacs { }; - hsc3Mode = callPackage ./hsc3 { }; + hsc3-mode = callPackage ./hsc3 { }; hol_light_mode = callPackage ./hol_light { }; ido-ubiquitous = callPackage ./ido-ubiquitous { }; - ocamlMode = callPackage ./ocaml { }; - prologMode = callPackage ./prolog { }; + ocaml-mode = callPackage ./ocaml { }; + prolog-mode = callPackage ./prolog { }; rectMark = callPackage ./rect-mark { }; sunriseCommander = callPackage ./sunrise-commander { }; + # Legacy aliases, these try to mostly map to melpa stable because it's + # closer to the old outdated package infra. + # + # Ideally this should be dropped some time during/after 20.03 + bbdb3 = self.melpaStablePackages.bbdb; + ocamlMode = self.ocaml-mode; + jade = self.jade-mode; + # scalaMode2 = null; # No clear mapping as of now + flymakeCursor = self.melpaStablePackages.flymake-cursor; + cryptol = self.melpaStablePackages.cryptol-mode; + maudeMode = self.maude-mode; + phpMode = self.melpaStablePackages.php-mode; + idris = self.melpaStablePackages.idris-mode; + rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters; + colorTheme = self.color-theme; + sbtMode = self.melpaStablePackages.sbt-mode; + markdownMode = self.melpaStablePackages.markdown-mode; + scalaMode1 = self.melpaStablePackages.scala-mode; + prologMode = self.prolog-mode; + hsc3Mode = self.hsc3-mode; + graphvizDot = self.melpaStablePackages.graphviz-dot-mode; + proofgeneral_HEAD = self.proof-general; + proofgeneral = self.melpaStablePackages.proof-general; + haskellMode = self.melpaStablePackages.haskell-mode; + writeGood = self.melpaStablePackages.writegood-mode; + erlangMode = self.melpaStablePackages.erlang; + d = self.melpaStablePackages.d-mode; + autoComplete = self.melpaStablePackages.auto-complete; + tuaregMode = self.melpaStablePackages.tuareg; + structuredHaskellMode = self.melpaStablePackages.shm; + xmlRpc = self.melpaStablePackages.xml-rpc; + emacsw3m = self.w3m; + loremIpsum = self.lorem-ipsum; + js2 = self.melpaStablePackages.js2-mode; + } From a66012b3ec81295779ecbaa2d0223d5e09f0b749 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 30 Aug 2019 17:49:37 +0200 Subject: [PATCH 251/283] gitRepo: 1.13.4 -> 1.13.5 --- pkgs/applications/version-management/git-repo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 2c427bb1824..bda811353f6 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "git-repo-${version}"; - version = "1.13.4"; + pname = "git-repo"; + version = "1.13.5"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0p55mx1ry0r3bb8nja09cfpiv1jjxf98r41vrqba1b5hm8hbzfhj"; + sha256 = "0p9qzgdp88jzzl2zc6c263iww3phcqkyn02yvavhdgii926gi34q"; }; nativeBuildInputs = [ makeWrapper ]; From 6b87772ca4a0b7d8448365b4f1c1a08a904fb3e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Aug 2019 17:55:59 +0200 Subject: [PATCH 252/283] nixos/mailman: don't reserve a static uid in the system Any system uid will do, so we let the system allocate one for us. The 'mailman' group is gone entirely since we don't need it. Users who wish to run the 'mailman' administration utility can do so via 'sudo': $ sudo -u mailman mailman info Also, simplify the syntax of our user.users entry to rely on an attribute set rather than a list. --- nixos/modules/misc/ids.nix | 4 ++-- nixos/modules/services/mail/mailman.nix | 14 ++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index efd8544d6a2..ac6af1ce8b7 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -340,7 +340,7 @@ cockroachdb = 313; zoneminder = 314; paperless = 315; - mailman = 316; + #mailman = 316; # removed 2019-08-30 # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -641,7 +641,7 @@ cockroachdb = 313; zoneminder = 314; paperless = 315; - mailman = 316; + #mailman = 316; # removed 2019-08-30 # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index cae59cb52cc..f4d635139fa 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -76,16 +76,7 @@ in { } ]; - users.users = singleton { - name = "mailman"; - group = "mailman"; - uid = config.ids.uids.mailman; - }; - - users.groups = singleton { - name = "mailman"; - gid = config.ids.gids.mailman; - }; + users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; }; environment = { systemPackages = [ mailmanExe ]; @@ -105,10 +96,9 @@ in { ExecStart = "${mailmanExe}/bin/mailman start"; ExecStop = "${mailmanExe}/bin/mailman stop"; User = "mailman"; - Group = "mailman"; Type = "forking"; StateDirectory = "mailman"; - StateDirectoryMode = "0750"; + StateDirectoryMode = "0700"; RuntimeDirectory = "mailman"; PIDFile = "/run/mailman/master.pid"; }; From 67fbc4d060a22e94c16a14ba6ba3bb4588a0b715 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 30 Aug 2019 12:13:57 -0400 Subject: [PATCH 253/283] plank: 0.11.4 -> 0.11.89 --- pkgs/applications/misc/plank/default.nix | 42 +++++++++++++++++++----- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index d5a071fcb54..10c8a03fa0a 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -1,21 +1,43 @@ -{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 -, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 -, bamf, gdk-pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee -, wrapGAppsHook, autoreconfHook, pantheon }: +{ stdenv +, fetchurl +, vala +, atk +, cairo +, glib +, gnome3 +, gtk3 +, libwnck3 +, libX11 +, libXfixes +, libXi +, pango +, gettext +, pkgconfig +, libxml2 +, bamf +, gdk-pixbuf +, libdbusmenu-gtk3 +, file +, gnome-menus +, libgee +, wrapGAppsHook +, autoreconfHook +, pantheon +}: stdenv.mkDerivation rec { pname = "plank"; - version = "0.11.4"; + version = "0.11.89"; src = fetchurl { url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz"; - sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8"; + sha256 = "17cxlmy7n13jp1v8i4abxyx9hylzb39andhz3mk41ggzmrpa8qm6"; }; nativeBuildInputs = [ autoreconfHook + gettext gnome3.gnome-common - intltool libxml2 # xmllint pkgconfig vala @@ -47,7 +69,9 @@ stdenv.mkDerivation rec { ]; # Make plank's application launcher hidden in Pantheon - patches = [ ./hide-in-pantheon.patch ]; + patches = [ + ./hide-in-pantheon.patch + ]; postPatch = '' substituteInPlace ./configure \ @@ -56,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Elegant, simple, clean dock"; - homepage = https://launchpad.net/plank; + homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; From 9292bc58c6a601f3618077583398a807d30b6a75 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 30 Aug 2019 17:59:22 +0200 Subject: [PATCH 254/283] androidStudioPackages.{dev,canary}: 3.6.0.8 -> 3.6.0.9 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4b9e2f40950..9f7997860c6 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.8"; # "Android Studio 3.6 Canary 8" - build = "192.5825043"; - sha256Hash = "1nh8p880pz3x7hlwa3inkr9qkd95amkg0sv4f0m7bb70k9v5mnvv"; + version = "3.6.0.9"; # "Android Studio 3.6 Canary 9" + build = "192.5830636"; + sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p"; }; in rec { # Attributes are named by their corresponding release channels From d20d6034bd1a50c97d19030d2625dd12d72a3287 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2019 17:21:16 +0100 Subject: [PATCH 255/283] CODEOWNERS: Add myself as owner for emacs --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1b3acbf6f7a..58834f4597e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -145,3 +145,8 @@ /nixos/modules/services/mail/postfix.nix @peti /nixos/modules/services/networking/bind.nix @peti /nixos/modules/services/mail/rspamd.nix @peti + +# Emacs +/pkgs/applications/editors/emacs-modes @adisbladis +/pkgs/applications/editors/emacs @adisbladis +/pkgs/top-level/emacs-packages.nix @adisbladis From 260314e9d74e2c57452f3279fad9461f72f90f33 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 30 Aug 2019 09:32:30 -0700 Subject: [PATCH 256/283] filezilla: 3.43.0 -> 3.44.2 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 530671e6173..91002e6f75e 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.43.0"; + version = "3.44.2"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "13i505y34b6lg7knzznf8812d9nwpnbf3hidpq58cbv8c31m5rkg"; + sha256 = "1dny16ybzml6py1y8vprylqq1xc08221w5xcwcmygkjrb0820kax"; }; configureFlags = [ From eedf3dc6e28ddc6b8315ea8a4b5dd0d46b09f3a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Aug 2019 18:42:28 +0200 Subject: [PATCH 257/283] nixos/mailman: decouple the mailman module from the postfix module https://github.com/NixOS/nixpkgs/pull/67708#discussion_r319579987 suggested that simply appending the necessary maps to the appropriate attributes in services.postfix.config gets the job done; we don't special support in the postfix module to accomplish that. --- nixos/modules/services/mail/mailman.nix | 11 ++++++++--- nixos/modules/services/mail/postfix.nix | 11 +++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index f4d635139fa..11dd5cb48db 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -83,9 +83,14 @@ in { etc."mailman.cfg".text = mailmanCfg; }; - services.postfix.config = { - # Mailman uses recipient delimiters, so we don't need special handling. - owner_request_special = "no"; + services.postfix = { + relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ]; + config = { + transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; + local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; + # Mailman uses recipient delimiters, so we don't need special handling. + owner_request_special = "no"; + }; }; systemd.services.mailman = { diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index bcf90778346..2b08ab1e6aa 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -11,10 +11,9 @@ let haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != ""; - haveTransport = cfg.transport != "" || config.services.mailman.enable; + haveTransport = cfg.transport != ""; haveVirtual = cfg.virtual != ""; - haveLocalRecipients = cfg.localRecipients != null || config.services.mailman.enable; - haveRelayDomains = cfg.relayDomains != null || config.services.mailman.enable; + haveLocalRecipients = cfg.localRecipients != null; clientAccess = optional (cfg.dnsBlacklistOverrides != "") @@ -753,12 +752,12 @@ in // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; } // optionalAttrs (cfg.origin != "") { myorigin = cfg.origin; } // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; } - // optionalAttrs haveRelayDomains { relay_domains = optionals (cfg.relayDomains != null) cfg.relayDomains ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_domains"; } + // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; } // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; } // optionalAttrs haveAliases { alias_maps = [ "${cfg.aliasMapType}:/etc/postfix/aliases" ]; } - // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ] ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; } + // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ]; } // optionalAttrs haveVirtual { virtual_alias_maps = [ "${cfg.virtualMapType}:/etc/postfix/virtual" ]; } - // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps" ++ optional config.services.mailman.enable "hash:/var/lib/mailman/data/postfix_lmtp"; } + // optionalAttrs haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps"; } // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } // optionalAttrs cfg.useSrs { sender_canonical_maps = [ "tcp:127.0.0.1:10001" ]; From c11fd45c244b24897e8e111b07c7cbce911255f1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 24 Aug 2019 12:00:18 +0300 Subject: [PATCH 258/283] uq: init at 2018-05-27 --- pkgs/misc/uq/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100755 pkgs/misc/uq/default.nix diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix new file mode 100755 index 00000000000..9dcfae41ea8 --- /dev/null +++ b/pkgs/misc/uq/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "uq"; + version = "unstable-2018-05-27"; + + src = fetchFromGitHub { + owner = "lostutils"; + repo = "uq"; + rev = "118bc2f3b1cf292afdffbc1cb4415d150b323165"; + sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; + }; + + cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w"; + + meta = with lib; { + description = "A simple, user-friendly alternative to sort | uniq"; + homepage = "https://github.com/lostutils/uq"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c71abe5e309..6b192e0431f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6654,6 +6654,8 @@ in upx = callPackage ../tools/compression/upx { }; + uq = callPackage ../misc/uq { }; + uqmi = callPackage ../tools/networking/uqmi { }; uriparser = callPackage ../development/libraries/uriparser {}; From ebce65658f17f675757adca077903f54a56c8982 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 30 Aug 2019 19:29:59 +0200 Subject: [PATCH 259/283] nix: Reduce closure size by 48 MiB --- pkgs/tools/package-management/nix/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 58662f4c045..fb6fd2513ba 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -64,7 +64,12 @@ common = # https://github.com/NixOS/nixpkgs/issues/45462 if is20 then '' mkdir -p $out/lib - cp ${boost}/lib/libboost_context* $out/lib + cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib + rm -f $out/lib/*.a + ${lib.optionalString stdenv.isLinux '' + chmod u+w $out/lib/*.so.* + patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + ''} '' else '' configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") ''; From 4388f7709a8770f99c9f103354b8054da4d2652d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 30 Aug 2019 20:00:16 +0200 Subject: [PATCH 260/283] nixFlakes: 2.3pre20190829_ebc4dae -> 2.3pre20190830_04np4n6 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index fb6fd2513ba..574f95f82bb 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -200,12 +200,12 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre20190829_ebc4dae"; + suffix = "pre20190830_04np4n6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ebc4dae51761cb54c1db28cf4d328d3f2f55b758"; - hash = "sha256-yfp56L7lu0DIhskzxooF/26T9d4ufl5/k5LlXMI0PSM="; + rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108"; + hash = "sha256-09ZHwpxf9pRDacCSGTHYx+fnKYgxKx8G37Jqb4wl1xI="; }; fromGit = true; From e594088ae872801cff534cc20f8e30582b96c79f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 30 Aug 2019 11:02:47 -0700 Subject: [PATCH 261/283] exempi: 2.4.5 -> 2.5.1 --- pkgs/development/libraries/exempi/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 3bc5270f053..22c812ba4c2 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,24 +1,14 @@ { stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.5"; + pname = "exempi"; + version = "2.5.1"; src = fetchurl { - url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2"; + url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; - patches = [ - # CVE-2018-12648 - # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9 - # remove with exempi > 2.4.5 - (fetchpatch { - name = "CVE-2018-12648.patch"; - url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch; - sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q"; - }) - ]; - configureFlags = [ "--with-boost=${boost.dev}" ]; From 7e29ce8a774ecf7831820feb3c82e69bf67c1fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 30 Aug 2019 20:59:44 +0200 Subject: [PATCH 262/283] maturin: 0.6.1 -> 0.7.0 pyo3-pack has been renamed to maturin version 0.7.0. Other larger changes are: - Mixed rust/python layout - Added PEP 517 support - Support settings all applicable fields from the python core metadata specification in Cargo.toml --- .../tools/rust/{pyo3-pack => maturin}/default.nix | 12 ++++++------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/development/tools/rust/{pyo3-pack => maturin}/default.nix (72%) diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/maturin/default.nix similarity index 72% rename from pkgs/development/tools/rust/pyo3-pack/default.nix rename to pkgs/development/tools/rust/maturin/default.nix index a17d50262a0..4b07129ae0e 100644 --- a/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -4,17 +4,17 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { - name = "pyo3-pack-${version}"; - version = "0.6.1"; + name = "maturin-${version}"; + version = "0.7.0"; src = fetchFromGitHub { owner = "PyO3"; - repo = "pyo3-pack"; + repo = "maturin"; rev = "v${version}"; - sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn"; + sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39"; }; - cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih"; + cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj"; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +27,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Build and publish crates with pyo3 bindings as python packages"; - homepage = https://github.com/PyO3/pyo3-pack; + homepage = https://github.com/PyO3/maturin; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a4169605a6..f51ba3fbaf1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -285,6 +285,7 @@ mapAliases ({ ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 + pyo3-pack = maturin; pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qt_gstreamer = qt-gstreamer; # added 2017-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c3af89bc8d..256b2f28e11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8355,7 +8355,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; + maturin = callPackage ../development/tools/rust/maturin { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; From 722940fcdcfeb99787377a15be55d2e0b34c4822 Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 30 Aug 2019 19:25:55 +0000 Subject: [PATCH 263/283] nixos/release-notes: fix indentation --- nixos/doc/manual/release-notes/rl-1909.xml | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 002bb371168..a211a8dfb86 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -564,27 +564,27 @@ to "core". - - - systemd.packages option now also supports generators and - shutdown scripts. Old systemd.generator-packages option has - been removed. - - - - - The rmilter package was removed with associated module and options due deprecation by upstream developer. - Use rspamd in proxy mode instead. - - - - - systemd cgroup accounting via the - systemd.enableCgroupAccounting - option is now enabled by default. It now also enables the more recent Block IO and IP accounting - features. - - + + + systemd.packages option now also supports generators and + shutdown scripts. Old systemd.generator-packages option has + been removed. + + + + + The rmilter package was removed with associated module and options due deprecation by upstream developer. + Use rspamd in proxy mode instead. + + + + + systemd cgroup accounting via the + systemd.enableCgroupAccounting + option is now enabled by default. It now also enables the more recent Block IO and IP accounting + features. + + From 027b117feee14e0c89c88e16a336307ffc742de2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 28 Aug 2019 09:47:17 +0200 Subject: [PATCH 264/283] pigeon: init at 20160310 --- pkgs/development/tools/pigeon/default.nix | 22 ++++++++ pkgs/development/tools/pigeon/deps.nix | 66 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 91 insertions(+) create mode 100644 pkgs/development/tools/pigeon/default.nix create mode 100644 pkgs/development/tools/pigeon/deps.nix diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/development/tools/pigeon/default.nix new file mode 100644 index 00000000000..ae543533059 --- /dev/null +++ b/pkgs/development/tools/pigeon/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage { + pname = "pigeon"; + version = "20190810-f3db42a662"; + + goPackagePath = "github.com/mna/pigeon"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "mna"; + repo = "pigeon"; + rev = "f3db42a662eded7550fc7cd11605d05311dfa30f"; + sha256 = "1n0zqidwbqqfslrirpbqw14ylgiry6ggcp9ll4h8rf1chqwk6dhv"; + }; + + meta = { + homepage = "https://github.com/mna/pigeon"; + description = "A PEG parser generator for Go"; + maintainers = with lib.maintainers; [ zimbatm ]; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/tools/pigeon/deps.nix b/pkgs/development/tools/pigeon/deps.nix new file mode 100644 index 00000000000..d836dc43c7c --- /dev/null +++ b/pkgs/development/tools/pigeon/deps.nix @@ -0,0 +1,66 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + 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 = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + 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 = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "b29f5f60c37a"; + sha256 = "118rvb59hc1fykbmif4008rbxw1p0dblc8dxkq96yaapd6p0vbpn"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d290cb592e1..a8e9b52550b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24888,4 +24888,7 @@ in uhubctl = callPackage ../tools/misc/uhubctl {}; kodelife = callPackage ../applications/graphics/kodelife {}; + + pigeon = callPackage ../development/tools/pigeon {}; + } From 792bb4f7f6952204eaa1d5341e5743bdb159ef96 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 28 Aug 2019 10:07:11 +0200 Subject: [PATCH 265/283] verifpal: init at 0.2 --- pkgs/tools/security/verifpal/default.nix | 38 ++++++++++++++++++++++++ pkgs/tools/security/verifpal/deps.nix | 12 ++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 52 insertions(+) create mode 100644 pkgs/tools/security/verifpal/default.nix create mode 100644 pkgs/tools/security/verifpal/deps.nix diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix new file mode 100644 index 00000000000..3b72cf3bd53 --- /dev/null +++ b/pkgs/tools/security/verifpal/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, buildGoPackage, pigeon }: +buildGoPackage rec { + pname = "verifpal"; + version = "0.2"; + + goPackagePath = "github.com/SymbolicSoft/verifpal"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "SymbolicSoft"; + repo = pname; + rev = version; + sha256 = "08a0xvgg94k6vq91ylvgi97kpkjbw0rw172v2dzwl2rfpzkigk1r"; + }; + + postPatch = '' + sed -e 's|/bin/echo |echo |g' -i Makefile + ''; + + buildInputs = [ pigeon ]; + + buildPhase = '' + make -C go/src/$goPackagePath parser linux + ''; + + installPhase = '' + mkdir -p $bin/bin + cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/ + ''; + + meta = { + homepage = "https://verifpal.com/"; + description = "Cryptographic protocol analysis for students and engineers"; + maintainers = with lib.maintainers; [ zimbatm ]; + license = with lib.licenses; [ gpl3 ]; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/tools/security/verifpal/deps.nix b/pkgs/tools/security/verifpal/deps.nix new file mode 100644 index 00000000000..aaa4269416a --- /dev/null +++ b/pkgs/tools/security/verifpal/deps.nix @@ -0,0 +1,12 @@ +# 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"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8e9b52550b..f986c32c717 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24891,4 +24891,6 @@ in pigeon = callPackage ../development/tools/pigeon {}; + verifpal = callPackage ../tools/security/verifpal {}; + } From 3c6d4d7e06b5145f067b68af66e804a1029b3dde Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 30 Aug 2019 22:52:31 +0200 Subject: [PATCH 266/283] gitRepo: 1.13.5 -> 1.13.5.1 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index bda811353f6..b26548ebe99 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.5"; + version = "1.13.5.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0p9qzgdp88jzzl2zc6c263iww3phcqkyn02yvavhdgii926gi34q"; + sha256 = "13rp0fq76a6qlw60pnipkgfng25i0ygyk66y30jv7hy8ip4aa92n"; }; nativeBuildInputs = [ makeWrapper ]; From 71846dfceb1a90bf9d2eea655763856c46c7e8ea Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2019 22:11:24 +0100 Subject: [PATCH 267/283] emacs-packages: Add update script that fetches from overlay --- .../editors/emacs-modes/update-from-overlay | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 pkgs/applications/editors/emacs-modes/update-from-overlay diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay new file mode 100755 index 00000000000..26d2482e7ae --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl nix +set -euxo pipefail + +# This script piggybacks on the automatic code generation done by the nix-community emacs overlay +# You can use this to avoid running lengthy code generation jobs locally + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix +nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "elpa-packages: $(date --iso)" -- elpa-generated.nix + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "melpa-packages: $(date --iso)" -- recipes-archive-melpa.json From 347a0c25f370f3383072229d95de4fa970939bf3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2019 22:13:01 +0100 Subject: [PATCH 268/283] elpa-packages: 2019-08-30 --- .../editors/emacs-modes/elpa-generated.nix | 54 +++++-------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 31e87df6d85..7737034973a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -621,21 +621,6 @@ license = lib.licenses.free; }; }) {}; - counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }: - elpaBuild { - pname = "counsel-ebdb"; - ename = "counsel-ebdb"; - version = "1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el"; - sha256 = "0p919gq871rxlrn6lpjbwws7h6i2gc9vgcxzj8bzgz8xk5hq9mis"; - }; - packageRequires = [ ebdb ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/counsel-ebdb.html"; - license = lib.licenses.free; - }; - }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -1252,10 +1237,10 @@ elpaBuild { pname = "frog-menu"; ename = "frog-menu"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.9.el"; - sha256 = "1gjhypsafpqybcbwi49qi1g419hcq9qv4p940ybspydg9gqk3gmp"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el"; + sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -1470,21 +1455,6 @@ license = lib.licenses.free; }; }) {}; - helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }: - elpaBuild { - pname = "helm-ebdb"; - ename = "helm-ebdb"; - version = "1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/helm-ebdb-1.el"; - sha256 = "17gpna0hywxnhfwc9zsm2r35mskyfi416qqmmdba26r4zmpb9r63"; - }; - packageRequires = [ ebdb helm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/helm-ebdb.html"; - license = lib.licenses.free; - }; - }) {}; highlight-escape-sequences = callPackage ({ elpaBuild , fetchurl , lib }: @@ -2415,10 +2385,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.2.4"; + version = "0.2.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.2.4.tar"; - sha256 = "0n6gj22w0llns3kx5hd69imhlrnlxx74zvhz7qikfx60669c5n20"; + url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar"; + sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl"; }; packageRequires = [ emacs ]; meta = { @@ -3181,10 +3151,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.2.1"; + version = "2.4.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.2.1.tar"; - sha256 = "139y05b2m715zryxqw7k438cc137mziz2k5nbzrrahddfz0i3cf9"; + url = "https://elpa.gnu.org/packages/tramp-2.4.2.2.tar"; + sha256 = "0bjfnxxyn8xgw10ybnjrza2gfwqifa3q7rh0bp6pidlhg45718p8"; }; packageRequires = [ emacs ]; meta = { @@ -3575,10 +3545,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.2.tar"; - sha256 = "09rpjl3z6xzap0lbrjs9hf2nspwc5avvx75ah3aimgvizrf2kyp0"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.3.tar"; + sha256 = "1vljnhi35vix30xch9mziczg56ss1r615yn2pgdcw8wa8sm14crw"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { From 52be1a3de07163b8c418f9b89a9d89aef38ae629 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2019 22:13:16 +0100 Subject: [PATCH 269/283] melpa-packages: 2019-08-30 --- .../emacs-modes/recipes-archive-melpa.json | 2976 ++++++++++------- 1 file changed, 1826 insertions(+), 1150 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 00bcb16b31b..def54a99e68 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,11 +31,11 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20190801, - 902 + 20190819, + 1232 ], - "commit": "129585c4096e78f46b741c7729915f666bfee501", - "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889" + "commit": "9d195764bfd1f2da7dc50ed73e70f3e5ac8610f5", + "sha256": "1x99ifgsxb3xn18hihral1qc6c30w824blqjhr9kpx4shh42g9f5" }, "stable": { "version": [ @@ -961,22 +961,22 @@ "auto-complete", "yasnippet" ], - "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b", - "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95", - "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" } }, { @@ -987,8 +987,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20190601, - 622 + 20190816, + 548 ], "deps": [ "dash", @@ -998,14 +998,14 @@ "s", "xcscope" ], - "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b", - "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], "deps": [ "dash", @@ -1015,8 +1015,8 @@ "s", "xcscope" ], - "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95", - "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" } }, { @@ -1065,8 +1065,8 @@ "auto-complete", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -1812,14 +1812,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20190218, - 2331 + 20190828, + 1828 ], "deps": [ "cl-lib" ], - "commit": "3803f24020ef0a656dc5345713c4964073aec9a8", - "sha256": "0dbg4lmzq0r7pvqx0wqxdcnmqz76nk9sdbwg276cmflqj9m0q7z1" + "commit": "c28246ba09d53e32cd9d8cafb1830f50387d9985", + "sha256": "19qklr4wqy55cb2133qlnrhf9yggsf096l14glw4jwpvx3cn61dd" }, "stable": { "version": [ @@ -2136,16 +2136,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20190607, - 1635 + 20190816, + 2205 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "ee1326aa8f1a0146ea10dc6f91d0a72584fa8b18", - "sha256": "1h7b606wcmasqxcfbgxfq1m06zns9yi1vi3smp1qgj5rpkrlhxz0" + "commit": "95a735e6947b0d09dbf9b9a944a21e5f5c1e6ee1", + "sha256": "0dqk6jnmfqhxcy4hd9a09632c9gfl7hg4vksp6p0k6wrz9yx6qsf" }, "stable": { "version": [ @@ -2854,10 +2854,10 @@ }, { "ename": "ansible-doc", - "commit": "1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9", - "sha256": "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "1gn334v5k1i3wsh1i53vnjj2y7kv4vba9yiwgiwz0pn7wd26wk5s", "fetcher": "github", - "repo": "lunaryorn/ansible-doc.el", + "repo": "emacsorphanage/ansible-doc", "unstable": { "version": [ 20160924, @@ -3325,11 +3325,11 @@ "repo": "ukaszg/aria2", "unstable": { "version": [ - 20141107, - 2317 + 20190816, + 25 ], - "commit": "7a944c5100812269369225af7aa9580fedab175f", - "sha256": "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji" + "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261", + "sha256": "0hsmjmgbsvdim1vxzh0qh41f9vmpsh8rlsy2h508ydw82rpc2q6f" } }, { @@ -3764,11 +3764,11 @@ "repo": "DamienCassou/auth-password-store", "unstable": { "version": [ - 20190812, - 936 + 20190813, + 1026 ], - "commit": "2039468bb800d676ff02a76c8fabda168696b564", - "sha256": "07q7hjk40rz0cji1ygmybkwn6pm86m8fzkisdv920qpi6i2jhgvz" + "commit": "847a1f54ed48856b4dfaaa184583ef2c84173edf", + "sha256": "0g48z5w6n3c54zqfpx65dfyl9jqbl15idvbb1hhw2pd9f9r8fykk" }, "stable": { "version": [ @@ -4382,14 +4382,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20190809, - 735 + 20190821, + 209 ], "deps": [ "f" ], - "commit": "4d7aeeeff339683a5d4eed05de357058a11f2e02", - "sha256": "10zbillf66bnhni08x159w4nrd08x8zsagam3c7c7555p1ccf5rk" + "commit": "b589d7c8653204fe07b3355a51d5b622ac6a647a", + "sha256": "10ini7q91gbkvmk6j7fcybgdv5jrhfpk6dfwyl2vcb1nlkxfbnzc" } }, { @@ -4583,8 +4583,8 @@ 20190331, 2230 ], - "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", - "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" + "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", + "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" } }, { @@ -4690,14 +4690,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20190630, - 1538 + 20190828, + 951 ], "deps": [ "cl-lib" ], - "commit": "66886e265cf41c6061dc70440eb5b61fad8f48e0", - "sha256": "101qbj6cx3358r1hr0jj8y1bsz24ci5qbc8k4lcw35llcsdvaivw" + "commit": "034de4c0e900717ebcb6e19a973cf66beea54420", + "sha256": "0ssvnbvmdvjqpdswn68lwv2xi8mdfx8iyvs38mqc45f4502ahbjx" }, "stable": { "version": [ @@ -4961,11 +4961,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20180629, - 2159 + 20190821, + 1808 ], - "commit": "096e632bf100d318754d6c961c90ebb0ef29dce5", - "sha256": "0w9ng4rhsawcf96mnpy71h50j4mankmvjnfknxlmwiwlmx4sp0f1" + "commit": "5a7a9b70f368fc77bac2c9c2d10dee4ad9f03987", + "sha256": "0sbmvyf6y73c0rw5yi6rgri29qidr1hpwqlgdass9rrzdnq5i3zg" } }, { @@ -5081,6 +5081,21 @@ "sha256": "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j" } }, + { + "ename": "baidu-translate", + "commit": "c9cdf13f64a1de8c57dcb90229da0f62a8e14e7a", + "sha256": "0m8pqnp57bmk41wij5a0dcilg09p992q5413llfac41b6biqf2yd", + "fetcher": "github", + "repo": "liShiZhensPi/baidu-translate", + "unstable": { + "version": [ + 20190817, + 1318 + ], + "commit": "b04a74d09ff5e3fbefd1b39b2abe79a9e272321a", + "sha256": "0qja8xw2sk2wn7w6qa5zj2i0j5c8a7cnldrag99ip2b5m02f1z4l" + } + }, { "ename": "bang", "commit": "d9830cce42339243091f4463490954a8a955c65f", @@ -5089,20 +5104,20 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20190727, - 2122 + 20190819, + 1339 ], - "commit": "55f3e2a7fc240bf7754dc3de47514095c76f89be", - "sha256": "1mcyvwzbbghz3k9ww0iml55awkkndk57bdvl6apcljwgjqd6rkrb" + "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", + "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" }, "stable": { "version": [ + 1, 0, - 2, - 0 + 1 ], - "commit": "253d4bc87ec6beb12e5c6f5569a354907adb8679", - "sha256": "0gjzzqj46fc2ifzrp33cy4q0wbqdjmwmnc6mq042n1imdg5s0hg3" + "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", + "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" } }, { @@ -5204,11 +5219,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20190516, - 1854 + 20190820, + 1804 ], - "commit": "61592a1ce11efdff1d18bb7675c651a8f914c10d", - "sha256": "09chkvcwy12h24wlb92hjyanrsfc1nc735h8bpi0ffy1i8lxmlfm" + "commit": "504dd26b1de326ec03d2c45f2d2db1ad59481adf", + "sha256": "041zrjlc0n3l1r8gyd78i14jkl2mf3pfsk37malmsllf3067ambz" }, "stable": { "version": [ @@ -5495,26 +5510,26 @@ "repo": "unhammer/bbdb2erc", "unstable": { "version": [ - 20170221, - 1354 + 20190822, + 907 ], "deps": [ "bbdb" ], - "commit": "15db2bd29df0f6ee32c499fdeffb960b6a7f97a0", - "sha256": "0jlm6qffhh84vy5wmkxmsm5i4dp87cfh7zr5kvrw72zyww986kn4" + "commit": "40b89e961762af3e7ade3a1844a9fbcd4084ac65", + "sha256": "1faa32ya515rkx5pwz6bsav0ffyajq8vq8d3vzn9j81d9in2rh5j" }, "stable": { "version": [ 0, 1, - 3 + 5 ], "deps": [ "bbdb" ], - "commit": "f39a36351e1e6f1105c9e32970e7502b77b0dbcd", - "sha256": "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs" + "commit": "40b89e961762af3e7ade3a1844a9fbcd4084ac65", + "sha256": "1faa32ya515rkx5pwz6bsav0ffyajq8vq8d3vzn9j81d9in2rh5j" } }, { @@ -5932,8 +5947,8 @@ "a", "pdf-tools" ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -6680,29 +6695,29 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20190802, - 959 + 20190828, + 655 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "a1df9a6d8d01ead25583ec086de71e3d5840eba9", - "sha256": "0ak04sh49zkgz66hbgwvjmdxnxs4zsx1aw5yx79r0fd5rpxscxfi" + "commit": "623174d015d4ba867e4decf0fcd439b51262f0a9", + "sha256": "19qm2i4pba9kbaw70cdchvmv9jgs2vxnlrz9jqpcn864z3k887iw" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "d9f0545708bbbbe3df23b2b91cdd2824beb0df56", - "sha256": "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8" + "commit": "270ae67b3136ac355d2aed5b4690ae28edaf7c29", + "sha256": "1ss9bjs34q41pa0g0nbdzd8fwpjcbd2239rdlx5aykfv9v0b8j77" } }, { @@ -7160,15 +7175,15 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20190622, - 317 + 20190815, + 502 ], "deps": [ "choice-program", "dash" ], - "commit": "e6b896aca7f62a6587b593c500b31624d4414eca", - "sha256": "10mkss1dmnx1qzgra4xf1jl7gjv61rjdrszkcwwnhf65wa2pjhbk" + "commit": "47852b908a0d9a059e9f8cd7797229ecf6259b8c", + "sha256": "1zxlw2kkkfa0pgxzk7qcjxy77g0r3grnnv4sa6zjhmh9kh7jgf75" }, "stable": { "version": [ @@ -7580,11 +7595,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20181202, - 1607 + 20190828, + 2027 ], - "commit": "810fa6fb8dab06610dbf2b5ccbc64b4d0ecc7485", - "sha256": "0dckgcyzsav6ld78bcyrrygy1cz1jvqgav6vy8f6klpmk3r8xrl1" + "commit": "9d172a74373916f571f6fe3292bdc66cd3f28779", + "sha256": "10xm856x58zgki2d9gr4rqqlkd3f8pl24z657qa7d3lkzs2av9a2" }, "stable": { "version": [ @@ -8026,8 +8041,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20190709, - 444 + 20190828, + 2340 ], "deps": [ "anaconda-mode", @@ -8036,8 +8051,8 @@ "ivy", "tree-mode" ], - "commit": "ef4845e7bd8ae577f9b919b6a74380493bca5de8", - "sha256": "1sypqnlwsv5gmrvcfz7dgfc81b24672njjw2va3yycvpv68pbii7" + "commit": "8ccb0323651155e3407ee5649b1a0355fd70ffe2", + "sha256": "0xflaqv88saq6i2wdggrwh06i9svp7v5070rmd860wg1pwi0qm81" }, "stable": { "version": [ @@ -8137,30 +8152,30 @@ "repo": "kisaragi-hiu/cangjie.el", "unstable": { "version": [ - 20190322, - 1134 + 20190829, + 1530 ], "deps": [ "dash", "f", "s" ], - "commit": "f4dcb691e3bda6971cb89b07f368dd285179a8ff", - "sha256": "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2" + "commit": "b34a28dd06bd95a16b655f1917227925975314bc", + "sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1" }, "stable": { "version": [ 0, 7, - 2 + 4 ], "deps": [ "dash", "f", "s" ], - "commit": "f4dcb691e3bda6971cb89b07f368dd285179a8ff", - "sha256": "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2" + "commit": "b34a28dd06bd95a16b655f1917227925975314bc", + "sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1" } }, { @@ -8204,15 +8219,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20190729, - 708 + 20190816, + 1046 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "626fd89986eab229e2fe36b38ac60697ed7a805b", - "sha256": "0aa57v2gxmj67i7dlqhg934nj023ldfn32pzjs2hnqnq3w3srnfv" + "commit": "f70b060c97f0df6ec6487968dfdfae8ec97a080f", + "sha256": "1qaz6m34j4khw27nkb8yfcy1iprcldbl7jjwzsljw1i2yfc1xqj0" }, "stable": { "version": [ @@ -8803,8 +8818,8 @@ 20171115, 2108 ], - "commit": "2a473e3acb297086c988a84972ab37f77fabaaa9", - "sha256": "0piak5l66al28xg9m7ypv83l12q3v9fcndvnnarqvpmh5db1alp1" + "commit": "35d777b0fd54b574b42cf61c202bf077ed986e8f", + "sha256": "1p63w0i71vsysdp05mh05pvbpmhdvbjmiv3zgfdsim9k55lbn5pz" }, "stable": { "version": [ @@ -9335,14 +9350,14 @@ "repo": "SavchenkoValeriy/emacs-chocolate-theme", "unstable": { "version": [ - 20190811, - 1414 + 20190818, + 756 ], "deps": [ "autothemer" ], - "commit": "7b005d9ef522ccde84fc9488fa6ea3cc429f9c48", - "sha256": "176f7gcpzzsr74cspcm0f44bxpb8a4244zzljlqfpksfg8qpf23d" + "commit": "7de46341adcc7a5eaafcddc0d3a9d63274f5e9c7", + "sha256": "0s61lx5vhx01xzzqxy0blz6jxvljb8qjj3567nz17pwwdfcskc5v" } }, { @@ -9353,14 +9368,11 @@ "repo": "plandes/choice-program", "unstable": { "version": [ - 20190721, - 1854 + 20190817, + 2153 ], - "deps": [ - "cl-lib" - ], - "commit": "215e8ab6acc47f240b12bd11ab387da7f5de885d", - "sha256": "14sp47l7j7sv3bsrnwzqz6mzn3wwv4s75r5my6vjh39pn0qshfh1" + "commit": "583242445e7890a12bb674b43244bf27c84d91f6", + "sha256": "08pbh4z3xbpk62a2m6shdpw2g44158di8pb9rjszfcpd5m6m2lf2" }, "stable": { "version": [ @@ -9445,8 +9457,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20190811, - 1423 + 20190829, + 613 ], "deps": [ "clojure-mode", @@ -9457,8 +9469,8 @@ "sesman", "spinner" ], - "commit": "31f83dfadbf0d180a6273f8b19429e12bc23ef3a", - "sha256": "0bwjg4fgn9l9xjk4q7mkn56nlvygfjg5hzfdy3hy2k6a2w4s9ka0" + "commit": "f350c7431330ca7cd2f01a1fddefbb637d3e3493", + "sha256": "0zvk6kcs1v6gfv7d48inqqa7hwn5aghhkmycn0wdiarkcdhagjmi" }, "stable": { "version": [ @@ -9534,15 +9546,15 @@ "repo": "clojure-emacs/cider-hydra", "unstable": { "version": [ - 20181015, - 727 + 20190816, + 1121 ], "deps": [ "cider", "hydra" ], - "commit": "5956c3909cd9beae11f64973e4f0d830cea7860d", - "sha256": "1hnari85c4y5sc8cdv2idkg2qv058crz54xdidnphr1wgw5zhvpk" + "commit": "c3b8a15d72dddfbc390ab6a454bd7e4c765a2c95", + "sha256": "0qrxja9bxx07m1ij8ly36sib901a6qhczgxsp4ap4wszy63lx93r" }, "stable": { "version": [ @@ -9803,8 +9815,8 @@ 20181130, 230 ], - "commit": "e205b96f944a4f312fd523804cbbaf00027a3c8b", - "sha256": "03xmpgpd4zw9x4shkz9aa744ifnwfblnq369qsp3r1awjacksrg3" + "commit": "f215866d7d7c52e84220cd541f40608a5b85abf0", + "sha256": "1k8x48cayanwajz81h5kfysqvnf58wrb9j4f9rbaqzg2nrnqw5sm" }, "stable": { "version": [ @@ -9833,6 +9845,24 @@ "sha256": "0w6pd47pfs8jna076xjz0xz1f7bxdgvyglpllkm62fifiy2n994l" } }, + { + "ename": "clang-format+", + "commit": "9ee8e3de203fb3259202bf847f020259a7f07a74", + "sha256": "0r9n962q0nq8x3r4vyrdfmw74wsvxw7lxizvklxcsm421qpnzyfa", + "fetcher": "github", + "repo": "SavchenkoValeriy/emacs-clang-format-plus", + "unstable": { + "version": [ + 20190824, + 2216 + ], + "deps": [ + "clang-format" + ], + "commit": "ddd4bfe1a13c2fd494ce339a320a51124c1d2f68", + "sha256": "0y97f86qnpcscwj41icb4i6j40qhvpkyhg529hwibpf6f53j7ckl" + } + }, { "ename": "clean-aindent-mode", "commit": "ee9dac7c10e652f026643620418dfea9237a0d23", @@ -10388,11 +10418,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20190811, - 1842 + 20190826, + 2117 ], - "commit": "195ef1d55cf0e9aa25a257c93f1cff5ecf807374", - "sha256": "011f7x1qdjpz9vz76nd743fzlk2lp696286x2q3gmdhrmg7h3csc" + "commit": "9422a25a1d7e73176b0c8b81cf4be1f722d6304a", + "sha256": "085kj8wzm21fdli0ycdj117306pc9j0a6r17w9kzy7ckzax54zc6" } }, { @@ -10526,8 +10556,8 @@ 20190710, 1319 ], - "commit": "7d194f7d8331a127e0b2b921dc6bc0abfe21a0f5", - "sha256": "0gqpm4cgcx176kamgx8p3vxxf9r41ckxy20gdw153fqbba2prsip" + "commit": "c0d21d763b13e280ccf7a387ba690650db014646", + "sha256": "072m458y9sazjmp7z0i1c3wppnwqry1lb2crf6k0v9fk3l78zknz" }, "stable": { "version": [ @@ -11021,11 +11051,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20190809, - 1314 + 20190826, + 1340 ], - "commit": "025cda606860800fe32a81e25e81e18e2d841069", - "sha256": "0c6ibf29gxnm53q1xsrnfcl8r93apqpcljgj4m9knzswizxb2mqs" + "commit": "2ef60a4de1d0973e53e97cc08db4c0a510a2669f", + "sha256": "1f0829zipvckcgnl5kv9msdpya8q67p72rlkg0hb6z5ik095n2yq" }, "stable": { "version": [ @@ -11407,11 +11437,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20190430, - 1852 + 20190821, + 658 ], - "commit": "ad6ff0eecca99dc5ac8b6a8a6174df7d2ad88ae7", - "sha256": "0cps5sl9iij1wrpcnhi7xqv58cqsrswhc8r7hj1c00w8288z978w" + "commit": "1120b56bd1154a17e4c0b950cbdba4c85be28e2a", + "sha256": "0pi6n1ggxb2i8x8f2wf1il8wcm6rd6ilvgbbh7ni95by1c987vbp" }, "stable": { "version": [ @@ -11601,14 +11631,14 @@ "repo": "randomphrase/company-c-headers", "unstable": { "version": [ - 20180814, - 1730 + 20190825, + 1631 ], "deps": [ "company" ], - "commit": "41331192b3961c8e3a51540678e1d11eaa346f03", - "sha256": "1hl14pv8splirzr9riak8m48ngxy1c6wa2q6ds6aq849zx9dafqh" + "commit": "5e676ab0c2f287c868b1e3931afd4c78895910cd", + "sha256": "18zyzhjnlbwblgqgr876ynrc7k736lg5s6bgxmxph7gymdz4fb4h" } }, { @@ -11924,6 +11954,25 @@ "sha256": "09zaaqi8587n1fv5pxnrdmdll319s8f66xkc41p51gcs2p7qa5w1" } }, + { + "ename": "company-fuzzy", + "commit": "3c3957d27d4208db45e7545f86ad1c25f53ec532", + "sha256": "0yxr0j3zdsf8xfy2mk4ybnjfv6g861772dshbd6v4p3q0pbhhhg6", + "fetcher": "github", + "repo": "elpa-host/company-fuzzy", + "unstable": { + "version": [ + 20190812, + 204 + ], + "deps": [ + "company", + "s" + ], + "commit": "a97f55b60f427e536e637898d12792154d134aab", + "sha256": "1iw1vk1pgdacvfh17n45kk98rxml3f6kxnijmpp7fzz4q07yiv7w" + } + }, { "ename": "company-ghc", "commit": "28f6a983444f796c81df7e5ee94d74c480b21298", @@ -12373,22 +12422,22 @@ "cl-lib", "company" ], - "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b", - "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95", - "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" } }, { @@ -12399,15 +12448,15 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190812, - 1454 + 20190823, + 1219 ], "deps": [ "company", "phpactor" ], - "commit": "01ced487c673e027332ecb99c444f819b05ab40b", - "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" + "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", + "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" }, "stable": { "version": [ @@ -12647,15 +12696,15 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20180730, - 338 + 20190821, + 449 ], "deps": [ "company", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -12829,8 +12878,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20190811, - 2013 + 20190829, + 1801 ], "deps": [ "cl-lib", @@ -12839,8 +12888,8 @@ "s", "unicode-escape" ], - "commit": "df5e5fbfdb2ac174c031b75576a059429c6fb3a3", - "sha256": "0vxj9dm7h082i4jj8h8nh164jgdyxqr2fdavn2biwxijmdykp63p" + "commit": "2cbfea20d342d1a259b27b99185c2d822aba3094", + "sha256": "06vndicjzm19hk5kb7sxs3ljf559wfnvql1hlpfqlhhgjhgsw17c" } }, { @@ -13584,14 +13633,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190809, - 1548 + 20190830, + 1557 ], "deps": [ "swiper" ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -13683,16 +13732,16 @@ "repo": "nathankot/counsel-dash", "unstable": { "version": [ - 20190510, - 708 + 20190823, + 1334 ], "deps": [ "cl-lib", "counsel", "dash-docs" ], - "commit": "5856b8766956428c183a2df911a05f845d014041", - "sha256": "1x0y6w5ivicckllznvljad42hgmbnilkrx9bz7rs4clr1baxzvyh" + "commit": "24d370be9e94e90d045c49967e19484b9903fce9", + "sha256": "18gp7hhgng271c7bh06k9p24zqic0f64j5cicivljmyk9c3nh7an" }, "stable": { "version": [ @@ -13725,8 +13774,8 @@ "counsel", "ivy" ], - "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8", - "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9" + "commit": "d7fcec59c4ba919b93018d4d61da0c154233c66b", + "sha256": "1pawczhhb7im1q314wsba9fwcks04kddg1vv8mcpiad237mf5dx4" }, "stable": { "version": [ @@ -13874,15 +13923,15 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20190724, - 1903 + 20190817, + 102 ], "deps": [ "counsel", "projectile" ], - "commit": "90d3792ab90559a9de6ad419dbfb2435a36a224d", - "sha256": "0m1rcmk9qnwr5zlsw8wzyvs3an1jqy5nvlm7lcsvzfkvzpn52ad0" + "commit": "fda7f0bad93a471fddf5fa01d6fdee5684e7f880", + "sha256": "097ksmy85lf9zfi6v2xz9bxl54l0il6v0ybj1305qg6g8xampbdw" }, "stable": { "version": [ @@ -13934,6 +13983,25 @@ "sha256": "0b5hykw3n96f0m50176hk639sbzdykhnp52xlp8g6l7p807x27w9" } }, + { + "ename": "counsel-test", + "commit": "5b21ac3eaacfff27ca4def04f6cf7b4888b7fcf4", + "sha256": "0604kmj0ydfps2si0wvgjw41x2ds7dmsd53x50219f65d4w44nqr", + "fetcher": "github", + "repo": "xmagpie/counsel-test", + "unstable": { + "version": [ + 20190819, + 1920 + ], + "deps": [ + "ivy", + "s" + ], + "commit": "7fc4e5d0d65c53edbcb4c25917bcf7faaea36ec7", + "sha256": "1xlcn99iizfv3wi701r6q176wicvpdsrz9k1jbyr65r6aw8am8fl" + } + }, { "ename": "counsel-tramp", "commit": "e1822b735b6bd533f658bd64ddccda29e19e9a5e", @@ -14396,11 +14464,11 @@ "repo": "emacs-pe/crontab-mode", "unstable": { "version": [ - 20190304, - 1423 + 20190827, + 1300 ], - "commit": "090ed61e919df6391df45a7645a0d8d5b0dae1cb", - "sha256": "1yz9vvh2x6s2y02n1z8aqgb40bxgs2s2mxmy1vmp2piffq81d09y" + "commit": "9acbb426c6bfb832e1e83f10fe01a8829452eb7e", + "sha256": "04wyngg5n5dr4ninfljl3n0gqx0pik5jbj6ny79bchrnxlh22f3k" } }, { @@ -15063,8 +15131,8 @@ 20190111, 2150 ], - "commit": "8cf109c0f19ad8c36b8a5368d138912495963387", - "sha256": "07wmv5hgi7db1cx6xrjsa8r337frm3cx38l1jglr9kf5qkw917q1" + "commit": "00c1dc96af0e44741dc777f96a2eb5769f572bb3", + "sha256": "0hkh3844kaawhqh90cqpskh9ifm6cs6i3d2bwkbrrjrkyig9qp38" }, "stable": { "version": [ @@ -15099,20 +15167,20 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20181205, - 607 + 20190826, + 2244 ], - "commit": "b5d936dfd4c1d0b68a0d911aadd4ba25df7af0e4", - "sha256": "0915kb9jcaixgindhj85fmykkhvj31ckp1yg6746fznwdgfrlifv" + "commit": "f3843276e235c6b633ba5367f78d74fe7c04e244", + "sha256": "066kjyvginjp2cqmdi8ybrr558074m8wqd0jrwsicn4dps3njvcn" }, "stable": { "version": [ 2, 0, - 9 + 10 ], - "commit": "98af62e67026fee1dda9155e1a463917fc83802e", - "sha256": "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj" + "commit": "b5d936dfd4c1d0b68a0d911aadd4ba25df7af0e4", + "sha256": "0915kb9jcaixgindhj85fmykkhvj31ckp1yg6746fznwdgfrlifv" } }, { @@ -15230,8 +15298,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20190629, - 652 + 20190826, + 1656 ], "deps": [ "company", @@ -15242,8 +15310,8 @@ "lcr", "s" ], - "commit": "8090286a5dd498de281ce1b1c14a47b9913198c8", - "sha256": "0yq03jk34if8qzxxbxvgszw0rly0l3k13rkc2msq0hx5j98z0yrj" + "commit": "a25ae9e5b5425cffdd88d498777e90ea8655fa37", + "sha256": "1ziw3snbs2z2cg8a3jbyjd48qkgrkzs4bh8lrbs0h2c87nzldvhd" }, "stable": { "version": [ @@ -15271,8 +15339,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20190810, - 1131 + 20190823, + 1240 ], "deps": [ "bui", @@ -15283,8 +15351,8 @@ "s", "tree-mode" ], - "commit": "f01c7d2a32ce04d6643771a6e4d38fd1fb3bfbe6", - "sha256": "1nv7h16wy60rhylbc5zd79i4mf5gy76j7h6qgq0jql607pqkrjxr" + "commit": "368a0ac922d03b6ad0d2d782823ef30b3072866a", + "sha256": "0zml4kskwz01myki3acbfrfqzgwyw1bsvppijmfi4d24jk04lydk" }, "stable": { "version": [ @@ -15470,11 +15538,11 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20190808, - 2226 + 20190827, + 2102 ], - "commit": "9b65aae8c79132275733ee4324948446c88a6b93", - "sha256": "0149axzm52f2j80qpcafb6db2knzrmp43ln0zcx4dj1qsrmq5mbj" + "commit": "04fcd649f19d49390079fbf2920a10bf37f6a634", + "sha256": "1rpdrq8w8vishjpakxvj20dgnnp2qksi1nrd0qllllb5sjyih56d" }, "stable": { "version": [ @@ -15492,6 +15560,42 @@ "sha256": "1qmdlwjmmqyyb65sqvfpygifai5m0llc815vp0jqwp8ldd8ls172" } }, + { + "ename": "dart-server", + "commit": "e798e4fbe5a1d1dbe08c9bfc5c54d32cfe4bde62", + "sha256": "1w7qxd78cnxycg34hxlcw8yda2ixkl683k7mxm20wfqyg5f46bxm", + "fetcher": "github", + "repo": "bradyt/dart-server", + "unstable": { + "version": [ + 20190817, + 1254 + ], + "deps": [ + "cl-lib", + "dash", + "flycheck", + "s" + ], + "commit": "aba838e8ee2f30309f366e8a91c17616549003ce", + "sha256": "0lwss1s1n2kfy0i8nwwfmz5fnw137zkhjs6zv81piniad6hrmn1l" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "cl-lib", + "dash", + "flycheck", + "s" + ], + "commit": "bbc66eb981d17046ab98584c950baf963ac5da61", + "sha256": "18my32ni61z9dbr8cfkx0cjk4pqhdcmmz3l1hh57vzysscdxldh5" + } + }, { "ename": "dash", "commit": "57eed8767c3e98614259c408dc0b5c54d3473883", @@ -15500,11 +15604,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20190424, - 1804 + 20190814, + 2006 ], - "commit": "77f3bf40c9c85386a50f2dab3dc950513f6f88bd", - "sha256": "1h1v12f94i4a4kbcqi3njlf60p8n0601pp3vyahg0k06ms2aj46i" + "commit": "11907f4592ff1813536366d54245d3ecf6b99198", + "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" }, "stable": { "version": [ @@ -15579,8 +15683,8 @@ "deps": [ "dash" ], - "commit": "77f3bf40c9c85386a50f2dab3dc950513f6f88bd", - "sha256": "1h1v12f94i4a4kbcqi3njlf60p8n0601pp3vyahg0k06ms2aj46i" + "commit": "11907f4592ff1813536366d54245d3ecf6b99198", + "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" }, "stable": { "version": [ @@ -15897,15 +16001,15 @@ "repo": "conao3/ddskk-posframe.el", "unstable": { "version": [ - 20190623, - 1529 + 20190816, + 1855 ], "deps": [ "ddskk", "posframe" ], - "commit": "3505204b7bb96872312055bdc8ee5fb419b247e3", - "sha256": "0gn0vfi2pi0wykl2p3cjck89aprw659fgfwn3jm4dc8baqidip4c" + "commit": "f062a2a2a0fb3746ba01a7f56d051adf4cf4c7d8", + "sha256": "1lkvbix25p5jlhz5164vnyfldq1fk7m10w6q7q4rm2plnmxfbv1y" }, "stable": { "version": [ @@ -15964,8 +16068,8 @@ 20181020, 1513 ], - "commit": "a499822afc2154ca83edf6a605ed22c5a932fa12", - "sha256": "0bfgh6v0q93lfd0q628r11jd45cys89z4874a19w61cb0mfpvks0" + "commit": "8ff1f5d73d5d56bee65e45e9d8ac4e75aa8b8e4c", + "sha256": "0hqxl0gi9csp2zfc65s01c3i6himh38fia46cn68i3hh5d6kb6qx" }, "stable": { "version": [ @@ -16281,11 +16385,11 @@ "repo": "howardabrams/demo-it", "unstable": { "version": [ - 20180404, - 332 + 20190828, + 26 ], - "commit": "2760d2eed88ef854ce489a5f77627aa641af12bf", - "sha256": "1acfpkdwx8pvfhsqa7dp1n4q3cz5vks7b4gj5nc9rgvlmkv10j5c" + "commit": "9cfa5c3f92a0dca7eebb1f1a2011643c9b009d26", + "sha256": "1fcmrhm6h0j7jjw6kijrcacv628fy80ssxn6h5bilwmw0r4c7wm6" } }, { @@ -17707,8 +17811,8 @@ 20181225, 2206 ], - "commit": "74f520e8e8064d5e3f4cb33149f840fe59839c38", - "sha256": "1rj4qw34rzc085d1sra0hnc01dkj1xaxd1xyds45mxh41407zzfl" + "commit": "689ea9f3d702529a5b5ac2493e28eefca65c7abb", + "sha256": "0na9kkx2rjakgxq416cr2wjdggzf4ycki7jj7ywpra966zldf84s" }, "stable": { "version": [ @@ -18324,8 +18428,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20190812, - 1155 + 20190813, + 1431 ], "deps": [ "dash", @@ -18335,8 +18439,8 @@ "s", "tablist" ], - "commit": "55635cb15b1dc3945174de04f4bab22129e675e8", - "sha256": "0wv36b7w5cya6yr0phvg8ws3kc138ya1b4vimjf6chzhx3r6mhy7" + "commit": "fe74a499ce3246fb9a7d72e6931864b94ce5261d", + "sha256": "1prxz9fy9ca6lrv3qff408igxc1hic2laz528ba9mzyr5bc9qsq0" }, "stable": { "version": [ @@ -18599,16 +18703,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20190812, - 1448 + 20190830, + 1605 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "a6145d435ae380dbbff4d148e3c200b89a60d010", - "sha256": "0mny8zz3l4bqgbshmfgrf5y7zn0jkgawfgzn189bw68x87i8fwp3" + "commit": "b433d87f428061cc7477b444b7dc9101e575095d", + "sha256": "0k0kdr7alxwz0zf14zz92zhacza8izzc38117x4zcixx3yrsspnx" }, "stable": { "version": [ @@ -18633,14 +18737,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20190812, - 2115 + 20190821, + 2117 ], "deps": [ "cl-lib" ], - "commit": "ae18b84e01496c4ebd572cad00a89516af089a94", - "sha256": "0zcsk2z5z0hh9plbig4ba1ywzbdy0mar1jfm0c5mi46vl0vb29i7" + "commit": "470dd52ec4761a0b2c1f2c0309233e1fba04e598", + "sha256": "1wj9f7rxr2330fqgwsaqhz5mp1247a1x3a7zr6jdnr6h819ji74p" }, "stable": { "version": [ @@ -18816,14 +18920,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20181022, - 8 + 20190824, + 2314 ], "deps": [ "debian-el" ], - "commit": "a80f8ac5d81720cce90cf3bc5fbb45d50b1953d7", - "sha256": "0358c6gvyb85zr5r79ar3q46c83gz39rawyhgcg1h1hqxgj6a2lx" + "commit": "aafb047e03c642e6ae4740a7fbc0a789e0ec1291", + "sha256": "1sfan4pil51jrc0b6fxf5vjyrif0dx1xmx92yhgwap684kpsarv4" }, "stable": { "version": [ @@ -19252,17 +19356,17 @@ 20190808, 345 ], - "commit": "0f9863467c7a2dbacc41e62adc858765474c4ff0", - "sha256": "0ddhg3qbs4z6wkc680m5vmp2q6wdjs863h375rl1k114z4qdwn4z" + "commit": "823a3c66d11b30333f511c03348bd4714e736f46", + "sha256": "1fdca3rk599xfq02cihk30p29v4ng3hn3dvdzq5l90kfigpanaz9" }, "stable": { "version": [ 1, 11, - 1 + 3 ], - "commit": "2f40f29f8eab3f7ae044f1c522f3e34036a16d9d", - "sha256": "1ax0lf7h191l772s0pr2xyy1kxpzjalm44ck265jihiga07dk0m5" + "commit": "1fb491280dbe7e3bc7c00bb75ca837edc538333b", + "sha256": "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr" } }, { @@ -20020,8 +20124,8 @@ "repo": "ecukes/ecukes", "unstable": { "version": [ - 20190731, - 1558 + 20190822, + 2127 ], "deps": [ "ansi", @@ -20031,8 +20135,8 @@ "f", "s" ], - "commit": "73f1b07dace22eff692568b9d29f9755d4138f30", - "sha256": "0w6ja73a3gnpnf58v3dmk04sb22gnwxdsn3wpvp5hlhsvkxrar6j" + "commit": "d835ce619a8f0057a133c08060af4b026e1c9359", + "sha256": "1iqrb6lmvmsfk1g6hcc304b091nv3x7f5pv7zpn87kvvw7xw6lqg" }, "stable": { "version": [ @@ -20617,6 +20721,30 @@ "sha256": "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1" } }, + { + "ename": "edwina", + "commit": "050188e81b045bdadf722db552a42864121d9b81", + "sha256": "1581cwgfnrlcmbmrnfj57w9hb9jx9sinz6zw6zy2yk7g1r9vgbzl", + "fetcher": "github", + "repo": "ajgrf/edwina", + "unstable": { + "version": [ + 20190821, + 1850 + ], + "commit": "8d6f7ce117c622e19576888fbff9145615683815", + "sha256": "12rvmr8r85k9hfgbz2qwp0ryvy4qdarr82hq16ilppq5vlkiar02" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "cc0a039a400e8ef07b0d96d2169f1407e0af107a", + "sha256": "0l8w5f4bkqzb8pglvh516q91s6lvc1s1lfilxc9h881vl3934y7l" + } + }, { "ename": "efire", "commit": "4150455d424326667390f72f6edd22b274d9fa01", @@ -20729,17 +20857,17 @@ 20190714, 236 ], - "commit": "ba135b498cfa92e60634c4318fa0073bd60ba230", - "sha256": "1fxnvrqxdyqr7d88fdvr8hiwfrc3nrxddg6zpbqjw2jc3ijmzq0p" + "commit": "9fbaf81114ffd3550801457257c983a077a7e17e", + "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5" }, "stable": { "version": [ 3, 9, - 0 + 1 ], - "commit": "6ddf45cb589c6a191df21f8debb3a6b8d0fa41ee", - "sha256": "1krkba41vczhghz31dww1dw41r1l2h3di5564pqhs6c00shmds01" + "commit": "9fbaf81114ffd3550801457257c983a077a7e17e", + "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5" } }, { @@ -20750,15 +20878,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20190812, - 2013 + 20190819, + 9 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "6a7ce6634fcf79853a6bd89cf1c81bad2ac25540", - "sha256": "0qxkpn4mx2xjp98gwps0wric7c8c2g1ixdjy4jypya6alyc5b28x" + "commit": "7a70c977fdb6a16182d375993edd528653a2cb5d", + "sha256": "0s48k733nyk21h22c98ckch0kcki3snn1dw5ymqx2n9gl0w18gkh" }, "stable": { "version": [ @@ -20843,8 +20971,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20190812, - 1512 + 20190813, + 2156 ], "deps": [ "auto-complete", @@ -20857,8 +20985,8 @@ "skewer-mode", "websocket" ], - "commit": "52f304d038019f3eed6e1afbccc31878e161183a", - "sha256": "0wds8xddp4v1i4rimzp5gva2v5wvhx4hdjhxl6m7lih95vlpnq6v" + "commit": "a2872eff6c18a0706c531e9316c792a9fb99826f", + "sha256": "0i182ic59wnhqmik15qsqjsqza5fn67qw18i5gvvj7dsn3v05vac" }, "stable": { "version": [ @@ -20931,8 +21059,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20190812, - 2255 + 20190828, + 919 ], "deps": [ "auto-complete", @@ -20941,8 +21069,8 @@ "direx", "spinner" ], - "commit": "524a00d23c60c4718e39f4b963086fcc497afc25", - "sha256": "0qw12rk3cw1f2i0s2fm5630w5dnn6z0f1fxif1lrkky4yjp9ybxi" + "commit": "5a2b3580e362841f51d262eeeeaa396fcceb4fe9", + "sha256": "1xgppkabl2lwfqrgylab25v4pqfkhfxy780hlmsys1yha2r1167l" }, "stable": { "version": [ @@ -21383,15 +21511,16 @@ "repo": "DamienCassou/elcouch", "unstable": { "version": [ - 20180809, - 936 + 20190820, + 1641 ], "deps": [ "json-mode", - "libelcouch" + "libelcouch", + "navigel" ], - "commit": "ae9b6261c5167d538914bfdbc4d34a36e50b5bc2", - "sha256": "0z9ypk2f0q38cxq6fb53kbi0flq7bi09yhzs5mkd65kxgcsicl43" + "commit": "8e1b7ddec91ae863c3951776a0fcbfead8ca7a80", + "sha256": "07psfjynphzpm5jgajf31cigs5jyj8qnq491xrk88jvxm63sq55c" }, "stable": { "version": [ @@ -21596,20 +21725,20 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190809, - 1358 + 20190824, + 1213 ], - "commit": "87433438e10d851d57d76bea4403cbde936647e9", - "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" }, "stable": { "version": [ 3, - 1, + 2, 0 ], - "commit": "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e", - "sha256": "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" } }, { @@ -21697,28 +21826,28 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20180829, - 1716 + 20190824, + 1213 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "87433438e10d851d57d76bea4403cbde936647e9", - "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" }, "stable": { "version": [ 3, - 1, + 2, 0 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e", - "sha256": "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" } }, { @@ -21807,20 +21936,20 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20190720, - 1301 + 20190816, + 421 ], - "commit": "8a517e8457c42735538c38555c6ac799f33855ef", - "sha256": "1wrq69sqkzkmlfrjci7wiwlfsnpwmc100hhg9a419w121kljsabc" + "commit": "628ade09bf24331003f7f69a3ebfa57da09288c0", + "sha256": "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66" }, "stable": { "version": [ 2019, - 7, - 20 + 8, + 16 ], - "commit": "8a517e8457c42735538c38555c6ac799f33855ef", - "sha256": "1wrq69sqkzkmlfrjci7wiwlfsnpwmc100hhg9a419w121kljsabc" + "commit": "628ade09bf24331003f7f69a3ebfa57da09288c0", + "sha256": "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66" } }, { @@ -21954,8 +22083,8 @@ "deps": [ "cl-lib" ], - "commit": "34938422929800839e2f935aca890cd4a229ca99", - "sha256": "00v8iqlf6pk8a0656s14jd0gv5msqy6q2af15q21f2nl4j0gl9qj" + "commit": "be36d66b4781eab7218bff419f3ec79573bbd15c", + "sha256": "0q0nisc0k4dl67n8c1068g32z8a642dawmq1h9licad71c42s95p" }, "stable": { "version": [ @@ -22037,15 +22166,15 @@ "repo": "walseb/ellocate", "unstable": { "version": [ - 20190811, - 1123 + 20190819, + 211 ], "deps": [ "f", "s" ], - "commit": "10845fc5722d833f20944ecc5586b429974e383b", - "sha256": "01wy71gdkiwglbndc96jx3hm0w6pia18cr76810hffrfkbsywgd8" + "commit": "f5b222777d063d8ba3c851dcd9a132d6f74fbe08", + "sha256": "18cxqsxsgks7s31gmx9azsv26wdb979d24ypy44rhrwc5r4yk292" } }, { @@ -22056,8 +22185,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20190222, - 2125 + 20190815, + 555 ], "deps": [ "dash", @@ -22067,8 +22196,8 @@ "s", "seq" ], - "commit": "b59b66a5369816c3a6d47b3702b9007431b7b4cf", - "sha256": "13y4xhf4czir4fdl36lk9zhn6292x0lbxhdywpq55fy9ivz4pk6q" + "commit": "834fb5037424c47155518ed27537ef7ad6addcc5", + "sha256": "1jqp9n28xgxbp1xfqw1vpv9h5q41xirxcfj9257p2gvk1lg1w7jr" }, "stable": { "version": [ @@ -22126,28 +22255,28 @@ "repo": "Silex/elmacro", "unstable": { "version": [ - 20180628, - 1411 + 20190823, + 1308 ], "deps": [ "dash", "s" ], - "commit": "89b9b0feabafd01fee48111d67131c4c9b5fed9a", - "sha256": "06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha" + "commit": "5bf9ba6009226b95e5ba0f50489ccced475753e3", + "sha256": "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "dash", "s" ], - "commit": "9ed19a362b63d9c7436a78feb91bc694194cfefe", - "sha256": "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9" + "commit": "5bf9ba6009226b95e5ba0f50489ccced475753e3", + "sha256": "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a" } }, { @@ -22338,20 +22467,20 @@ "repo": "tgvaughan/elpher", "unstable": { "version": [ - 20190710, - 755 + 20190816, + 1414 ], - "commit": "f0b76ab6fa09b0e29ff68ff72a7d5c73dcca6adb", - "sha256": "0aryai4m2ngffgwbr3dvi27jqcdnzj48w7f54wh5lr703wjmqpig" + "commit": "40ec805063c480dfdc01c8328be12f7c8f823c9c", + "sha256": "0g36b7pil5vihwx2v55ga82k9l31wl3w0ba0s3af27wh058zz7bq" }, "stable": { "version": [ 1, 4, - 6 + 7 ], - "commit": "0e8eb2e0c919a07aa5db733d02e7669ccfb4276d", - "sha256": "07xansmhn4l0b9ghzf56vyx8cqg0q01aq3pz5ikx2i19v5f0rc66" + "commit": "e5471b9460610b3c3af3842c6ac009bcbf70ecac", + "sha256": "1sf91x2spk7nkpnn7ss2vkjfzvxw83z3pw7nyvra45gvq11vmy3c" } }, { @@ -22454,8 +22583,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20190331, - 1558 + 20190825, + 1513 ], "deps": [ "cl-lib", @@ -22463,8 +22592,8 @@ "f", "trinary" ], - "commit": "eb88fb357e14777cf4ae71054791d1482aaeef29", - "sha256": "0lh30zm5k7x7sq6yyzf91f5ajp71bi0nqqb0f6ns25bjpc6vz45l" + "commit": "fa12fcfa37f399b56c8b45323e03c3328ae4fde3", + "sha256": "0aphgjzxm4qhpp5rc72mx7d6n7mfm1ah7gn5064j7kzdi630msjn" } }, { @@ -23155,14 +23284,14 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20190620, - 1526 + 20190827, + 1610 ], "deps": [ "cl-lib" ], - "commit": "e70459caaadeb715116abb45ddf5e98921d46c14", - "sha256": "1b5krxc55ac5jsvbsikczh1shl5jgra58b306lhhsidmbmlisyx6" + "commit": "f209b44c76f4a8532783909384ae7492b8d9b6e7", + "sha256": "1m68vpsbkcmnlj35h31qikifvah8b9gazwk5yv4wafabpg3bdav2" }, "stable": { "version": [ @@ -24472,8 +24601,8 @@ 20190404, 928 ], - "commit": "65449e9e54fd765abdbe546590e4da044f36c2a4", - "sha256": "0yj4vfpz6vjxsraiab45c4lw313yd7c88sa10fsr974h0wfp9rnv" + "commit": "a56c1dc1fb996040ab192b0c96dc32e5ebf47a06", + "sha256": "1dm7l2kizbg3d878b16hca5qyfaf2yvskhwlc3h2kldchw4xgrby" }, "stable": { "version": [ @@ -25069,14 +25198,14 @@ "repo": "xuchunyang/eshell-z", "unstable": { "version": [ - 20170117, - 438 + 20190823, + 2341 ], "deps": [ "cl-lib" ], - "commit": "c9334cbc1552234df3437f35d98e32f4d18446b8", - "sha256": "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh" + "commit": "ee30761bd368df5f2e55c744ccc44089c7a46b6d", + "sha256": "0ywwvm1xx0p2iqzqmbb908147l8zlyf7gqsz0mgrzj0amqx1rhg2" }, "stable": { "version": [ @@ -25273,14 +25402,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20190809, - 1459 + 20190814, + 1054 ], "deps": [ "julia-mode" ], - "commit": "d625e9ccdb612812b90fe427563db4b910da7159", - "sha256": "0fnfcxlngc7rwnkhs1fwir1ax7hi9qhl7zlalbl5m7yfly84dl4p" + "commit": "5b12e56a52144b2393858236e56e1c5ea828b753", + "sha256": "0gcz8r7mdjmrcrisqr1w4pmnyj4m76fc1qg773y2b1majkdv7rbj" }, "stable": { "version": [ @@ -25913,15 +26042,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20190807, - 214 + 20190828, + 2159 ], "deps": [ "cl-lib", "evil" ], - "commit": "d226a50061a5033846ae819472e3c86fb54cc5f1", - "sha256": "155ajm7h9wpjg9ca60a4ib5fyp1sk4i54m5825595n43laqyd5p9" + "commit": "da75a170ea5485b7c0083624ca4e6cacc6aaa028", + "sha256": "1s4sr8lfdd2k11588gzylwbwmyigs29jfmvv9h0mjmixhaz85z1w" }, "stable": { "version": [ @@ -26759,6 +26888,24 @@ "sha256": "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7" } }, + { + "ename": "evil-owl", + "commit": "306209c3e3669b962dfd0abf649865164ed8bba3", + "sha256": "1629ca2n3i6nk1vsxfn9rnzdy40kmiy18hqa4dw9v56jb9p47xh5", + "fetcher": "github", + "repo": "mamapanda/evil-owl", + "unstable": { + "version": [ + 20190828, + 435 + ], + "deps": [ + "evil" + ], + "commit": "24c5f43df375194386344e69bc720ea3986c9510", + "sha256": "0bqzch14whlmrcasakah3psrzswvkzd7mmi8hx5s64kfp29wbdhi" + } + }, { "ename": "evil-paredit", "commit": "88db86e1351410bcff6f3ed80681946afcec9959", @@ -26934,14 +27081,26 @@ "repo": "porras/evil-ruby-text-objects", "unstable": { "version": [ - 20190729, - 1653 + 20190821, + 1527 ], "deps": [ "evil" ], - "commit": "781f134d9484481b0b4ad32f9cfe90dc00219902", - "sha256": "00ybb6y5lnfsk44cy6dks46n2cl1ms4010vfqqrji64i19wd1riq" + "commit": "0ddc4c256a0c778fa65d75b707f20df874e5b5fa", + "sha256": "1ppwcyfy5dssswfzd16i1rx14si5r80mdvrnfwaf9jr3c2ws23lg" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "evil" + ], + "commit": "93cfc5ae3da0ffb19319e301734c51ecb43506b5", + "sha256": "0jizvchrisrdc7bl6xfc59axyjz1dmr6hi36jyv1bdwyayj2ifqi" } }, { @@ -27363,14 +27522,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20190810, - 2054 + 20190818, + 2331 ], "deps": [ "evil" ], - "commit": "b1c64532ad754591c472e0615a10c9a9f8ad3df0", - "sha256": "0d7ijy067rb6wf1hzyyrk1nqh891b95fs0f39lbgawc0hkqk9bzw" + "commit": "4eec121e2abc0dd8f32b3d7cbdbf676302c4904a", + "sha256": "0hqrw3jda7qci0f3xqc35x0dhc2hrkd8fddwvlgicdj628wsm7ng" } }, { @@ -27572,11 +27731,11 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190807, - 240 + 20190828, + 1542 ], - "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", - "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" + "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", + "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" } }, { @@ -27587,14 +27746,14 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190807, - 240 + 20190825, + 335 ], "deps": [ "ewal" ], - "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", - "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" + "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", + "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" } }, { @@ -27605,15 +27764,15 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190720, - 829 + 20190828, + 1542 ], "deps": [ "ewal", "spacemacs-theme" ], - "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", - "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" + "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", + "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" } }, { @@ -28017,6 +28176,36 @@ "sha256": "1h8h7v1cwbqbdk168vqz8ndb4zgxlkx28dyy0b315vib226vkxq6" } }, + { + "ename": "exwm-mff", + "commit": "78f94ec4d5f83020003cbdb7b954213dfb0f242b", + "sha256": "10qjdhdkvyavjl43cyq9czvfbx8s0riiby0fss6v0snxdhg4qysd", + "fetcher": "github", + "repo": "ieure/exwm-mff", + "unstable": { + "version": [ + 20190810, + 1744 + ], + "deps": [ + "exwm" + ], + "commit": "a6a4b3dda01cbcf411fc2824981eaa9e85199a52", + "sha256": "1f4yr4q5dayxmyvrdxbbviks6l02amqhgfa97k7cz9rwscsavg6c" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "deps": [ + "exwm" + ], + "commit": "74a05bb1cc9444bb57d7a5361a15ec38deb4295a", + "sha256": "128j1xqg1k2z0lp7ivnszx8aai8y0zg182n1fhwc3iryrz52fn5q" + } + }, { "ename": "exwm-surf", "commit": "4fc27fae2b58c7af87dadba9217cc05f8ab4890c", @@ -28085,26 +28274,26 @@ "repo": "wasamasa/eyebrowse", "unstable": { "version": [ - 20190322, - 933 + 20190827, + 1828 ], "deps": [ "dash" ], - "commit": "52e160997a1c4b1d463e8b9cc2ba3e27408c2a89", - "sha256": "0y2n08ykfc3hga5m969syysa2r4h3d2i1xfi0jjhpw3h7qrisbw8" + "commit": "d75e37a048718d6981c366c431b93ccbe884f356", + "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7" }, "stable": { "version": [ 0, 7, - 7 + 8 ], "deps": [ "dash" ], - "commit": "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5", - "sha256": "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq" + "commit": "d75e37a048718d6981c366c431b93ccbe884f356", + "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7" } }, { @@ -28271,6 +28460,36 @@ "sha256": "0nq36h6kwyi2sv1fklm42spfkllm6jlz0alh2qlpgy4ixq5sp2pv" } }, + { + "ename": "face-shift", + "commit": "e55d2d30525602726c3c63025f5fce671efac416", + "sha256": "1y0m6yv64q76x6i2r5npn97c2axsy2k7b3m58zxh8p7c5lpwjdpa", + "fetcher": "git", + "url": "https://git.sr.ht/~zge/face-shift", + "unstable": { + "version": [ + 20190818, + 1551 + ], + "deps": [ + "cl-lib" + ], + "commit": "8dd6fb5f6277d3a594654aeb3e6a7b7b5581656a", + "sha256": "003k8i18s782zf1g0c9wi8p9lyk0viz76dah8hd3y622hmx8sdlb" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "347e9a1c801c80be546fbf3be808f8245fb049d8", + "sha256": "0lkrbbhgv2a101rsf78ik27ni66spml3z9ljsajwjwhv3hvky0rq" + } + }, { "ename": "faceup", "commit": "a10bf2928b93c3908e89ca8ad9649bb468ebca05", @@ -28321,11 +28540,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20190711, - 1511 + 20190821, + 1918 ], - "commit": "49710f7bf8bebf6cd82e67f0ca3a718cff3b504d", - "sha256": "0ba1ayc1ccs1ygr66zpihm4wmnrhbvb48rrhha6lidyvmbxrxsa6" + "commit": "c88ed079add4e2c39401dda9fdeef96ea4ddb13c", + "sha256": "1a0ff8xmkkhiwj5809vrxfaj4mkdcvwyw8m656l6iidijskqnmh6" }, "stable": { "version": [ @@ -28373,10 +28592,10 @@ }, { "ename": "fancy-battery", - "commit": "eae3af4145c534992d1c1ee5bb6420651c7c5d82", - "sha256": "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "09qlkij9lbkaq46yb1860nkfiqpcn0h67zmm9lyz28475686759j", "fetcher": "github", - "repo": "lunaryorn/fancy-battery.el", + "repo": "emacsorphanage/fancy-battery", "unstable": { "version": [ 20150101, @@ -28650,11 +28869,11 @@ "repo": "tautologyclub/feebleline", "unstable": { "version": [ - 20190711, - 713 + 20190822, + 1401 ], - "commit": "fe971abb6e0142513a8c6e453e9d3b2eac6a3f08", - "sha256": "0zisc4sf2fi0fspfzkvs8crlrvzrzrc72b379p5ngv53hmdmvkhy" + "commit": "b2f2db25cac77817bf0c49ea2cea6383556faea0", + "sha256": "0f2nynx9sib29qi3zkfkgxlcfrwz607pgg6qvvk4nnads033p1yn" } }, { @@ -29576,15 +29795,15 @@ "repo": "Fuco1/flow-js2-mode", "unstable": { "version": [ - 20190627, - 1240 + 20190814, + 1402 ], "deps": [ "flow-minor-mode", "js2-mode" ], - "commit": "c7a300d7fbe5d14b55deed11e31175ea3237c85d", - "sha256": "0x00472q6vz9i1zc9wplqcjis0xdn7a58jbggzvns9fbnva5b7pl" + "commit": "bfb23b73d47ea9902bcdc13b48511b23d704fd22", + "sha256": "1pz2mhavs0jbfq8qswzvz3fz7nw7glcysybjyng9i0463vr8cwc9" } }, { @@ -29796,8 +30015,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20190807, - 813 + 20190828, + 1147 ], "deps": [ "dash", @@ -29805,8 +30024,8 @@ "pkg-info", "seq" ], - "commit": "37c1f9d65c4a16c58aff9f2fa210ccf070a97c86", - "sha256": "1yqrb7r6ykjzmflk3259xpasmz2xgxxazvvhhjcy36krhwwj825x" + "commit": "ea176a4f6bfebd70b71a8a5e2988b49e1a58fe52", + "sha256": "0ys9cvhbxxq51sipk6ay13jcahgcbv869bxlhivdpjj7gmhzj5db" }, "stable": { "version": [ @@ -30109,8 +30328,8 @@ "flycheck", "let-alist" ], - "commit": "1dc8fdd691bcf950e95a0f00b71b53854923543e", - "sha256": "12abxdr75rjf9qas3q0wk220l3413cmddj45habz2ml9a9f7i41y" + "commit": "4c5d0c723bd564d632a4b93046679ed19d0e49d9", + "sha256": "17g5z02gjpyb5nwgwwcc0lxzd4l2jg0q2bndbxscsf5iw41p0irq" }, "stable": { "version": [ @@ -30662,25 +30881,25 @@ "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20190801, - 1813 + 20190817, + 935 ], "deps": [ "flycheck" ], - "commit": "0ca2659c18f1e7e4963afbff8dcb9e5fef238f3b", - "sha256": "056hs0abyisqh9wsnykj1y05rw8qn8n6j1wgijy2k97yvg3rq7x3" + "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0", + "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "flycheck" ], - "commit": "8ba9d41dad0c9c96760614ce7594ceb823f560de", - "sha256": "1l2n3vi7krd61bgwj7dg7qpkccimwfx3m0946fmxgrp0k6q41fn0" + "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0", + "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv" } }, { @@ -30735,8 +30954,8 @@ "dash", "flycheck" ], - "commit": "eab1fc184854341a56154623a131cab6ff0ce18c", - "sha256": "0prmrix9a95zr39ybajp7fha03wknxyhrf1kfxsms1brxsc8bqim" + "commit": "8248ebaf8376ee5e37ff47c814a291550a7bdcf2", + "sha256": "1al9kyj7n0cjc4s1m41389bzvvrckg28598v506zd5hqvaiynsp0" }, "stable": { "version": [ @@ -30968,8 +31187,8 @@ "deps": [ "flycheck" ], - "commit": "8d7f52a4c7f80ca396ef0fc6c7d8e9f005778dfc", - "sha256": "0m5zhyzrh4lx7vzwdgdwcfkipdvi3y8kavhckbd7vd9zwx539ij1" + "commit": "0fdb067ebbcc8bc1a3f9d2109e341049516b71da", + "sha256": "1p7sns041iqsnmmhkcx2651plz3wrb2nr3s78w2pd7kagx5hwksb" }, "stable": { "version": [ @@ -31247,8 +31466,8 @@ "flycheck", "package-lint" ], - "commit": "6d99248b45eea1e5236062f38e524230efdb1a84", - "sha256": "00wyi2adiv9cb3x8bid2fhg3cjqlkc7z70i18vldbpmrpppjg4x5" + "commit": "31fe5d9731f30d076f14392401b3b101c9ca2260", + "sha256": "1j2jk11cag1scy4cid89lcvjspanhpamazqggksaaadg9b71ay04" }, "stable": { "version": [ @@ -31582,8 +31801,8 @@ "flycheck", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -32176,11 +32395,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20190720, - 1501 + 20190828, + 128 ], - "commit": "5624f61c782c91710014620ebbaadab44a7e2b1f", - "sha256": "113hbdsgp950safyry3a2bpml3h2jjhypmfyjjyj3fibiigx9fmi" + "commit": "86268e1faf904bc8844dea313fe1bdaf02398ae9", + "sha256": "1xsj29z0qmijdb97cpy11dmqw8536amdz76664yzzn5gzin12fw7" }, "stable": { "version": [ @@ -33376,11 +33595,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20190124, - 1828 + 20190829, + 1514 ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -33457,8 +33676,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20190809, - 1808 + 20190820, + 826 ], "deps": [ "closql", @@ -33470,8 +33689,8 @@ "markdown-mode", "transient" ], - "commit": "a60bd64056ec910fdbd1400dd8f583b8eec6145b", - "sha256": "1dhpsnb82mxpv3krf3apsbcirlcizw3g9gac9sfn0fad20qjwpgj" + "commit": "6c43971a78a08954c20992cb6b0e98a7e7295908", + "sha256": "1hlk6jmn4w7bq0x7syrxmk2gz4dn7iswi73dixcfkv3m97qiqxd1" }, "stable": { "version": [ @@ -33526,14 +33745,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20190721, - 1032 + 20190830, + 1152 ], "deps": [ "cl-lib" ], - "commit": "dbed2d1ea8ee9a86d6e5e5f2aab4e73aaa88e918", - "sha256": "1v12b067dca73qy4s3ladhrqdkhfiih1d1hkbgxh0x9q0yhci871" + "commit": "15e9837a9e2d74bbb12fbaf1dcb400d0153754ba", + "sha256": "0bpz3i20vkd22y16cb7cllikj0sd91km2697wmix5wjsc370nimh" } }, { @@ -34018,8 +34237,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20190626, - 1238 + 20190815, + 1357 ], "deps": [ "company", @@ -34029,8 +34248,8 @@ "quick-peek", "yasnippet" ], - "commit": "ddb653cb3d6ba6568ffaf531ca57c9ea3e7498f5", - "sha256": "0mr48y24p81srv2m4glif1d7iy6i7jpx98lbv9577xry22d3vvhb" + "commit": "5af6fea23d1631f3f6653f804f17cd1b7358ca6b", + "sha256": "1wpr8hsvf923k7fwadl6j47k50vvfhzvpgrpj91j8208g8br87l8" }, "stable": { "version": [ @@ -34060,8 +34279,8 @@ "deps": [ "cl-lib" ], - "commit": "2f2cb869f19e1ab10931a2228ad02b2cfbf8fc0e", - "sha256": "1pg1i85cx1zk10k333qzmc8i9dmry7nz6h57p13ysa7pnyi6d521" + "commit": "e6eb7be61c35d4a7b7d5eeb528b582639c57f08f", + "sha256": "10ndvjwg4c77qkh0a2ab7vdkz8z6fyk5ji7ra68cq75g7gclli77" }, "stable": { "version": [ @@ -34224,6 +34443,30 @@ "sha256": "1i6hhpdz5pyv07jr3wikrajnw270fm27nmrji2rz31z8b20nn4z0" } }, + { + "ename": "fuz", + "commit": "aed40e85cf9a9906ca7a9fe34469083d21254e42", + "sha256": "0bpm2p5i8zyjsbn4d7i7rghwbap9mw4f5a5q47r6nxnr0fciarz5", + "fetcher": "github", + "repo": "cireu/fuz.el", + "unstable": { + "version": [ + 20190810, + 507 + ], + "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", + "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "90ca9207a9c1decda24a552b94ff41169ecccb14", + "sha256": "0v1advw2yr8b4jwd713fijd1kx4yc5xzz5ck2qfdxy5ixi1b39nm" + } + }, { "ename": "fuzzy", "commit": "9e0197df173fbd7ec1e7e35c47476fcf2aaa483f", @@ -34573,11 +34816,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20190806, - 149 + 20190826, + 1736 ], - "commit": "8f801fbf01586e33bcf0060bd1d3172d4afb48cf", - "sha256": "0cxd8zjgzkxjsgv1wfb6afc75brvs6hal7if31cj5ip7z38qzksx" + "commit": "d7bcfde6303b420ca76d9364c6e8f2c6827112e6", + "sha256": "01n3vxczv02vj9h7w1syq62qpnaw44wryk17ssk72ihg3zrrri6v" }, "stable": { "version": [ @@ -34602,8 +34845,8 @@ "deps": [ "cl-lib" ], - "commit": "1907358fed4ad1ee61fb2a2e1a353b27822a3edd", - "sha256": "1v3645sgpr5i7alh08ik2dmlc3bl6idpfgdgf8763l7x8r41wa55" + "commit": "f032c3a77079487d0ea563b17ee3e5b2fb084611", + "sha256": "0lgh5z17ag5wvvnqwagvam29cp1n1vd50amn6df02xln80bsbllx" } }, { @@ -35255,8 +35498,8 @@ "dash", "with-editor" ], - "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", - "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" + "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", + "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" }, "stable": { "version": [ @@ -35526,20 +35769,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20190309, - 2326 + 20190829, + 145 ], - "commit": "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885", - "sha256": "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq" + "commit": "267bd81c228bdab434172dbef896f3f3b82713fa", + "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6" }, "stable": { "version": [ 0, 7, - 3 + 5 ], - "commit": "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885", - "sha256": "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq" + "commit": "267bd81c228bdab434172dbef896f3f3b82713fa", + "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6" } }, { @@ -35865,8 +36108,8 @@ 20190701, 630 ], - "commit": "6a05025663789e6daab80a5dd47c3efbe607795f", - "sha256": "1mkdsg1pzwgyyxdlizwcspppvh6kb7z1s55bszxwrfasnpqk30jl" + "commit": "e3a410dd1113bdff382a745465ea48d9b1fe860b", + "sha256": "1yq9bsy2qry49q1asdxnfyhahsp499b37l2yabwhpbxjlb7mmnp6" } }, { @@ -35950,16 +36193,16 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20190803, - 1701 + 20190830, + 1639 ], "deps": [ "dash", "ghub", "s" ], - "commit": "20b2e47f54587a39dbd8db9ec5ca33d5970dbcc1", - "sha256": "1slnggvsjzsqvdvm4nxnxba93hfjnz676bagmw79g7z6iswwz4sg" + "commit": "a13a3b4f1b6114a32af843971a145ab880f51232", + "sha256": "0injfpxzgfhmqalba845j5l5cdcxxqz43knhxwinf36g52nfabl0" } }, { @@ -36110,26 +36353,26 @@ "repo": "joewreschnig/gitlab-ci-mode", "unstable": { "version": [ - 20190425, - 2058 + 20190824, + 1528 ], "deps": [ "yaml-mode" ], - "commit": "dac4e5125c78aa3ae12d2e35a66196d709676236", - "sha256": "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0" + "commit": "2651e831aed84ee2512245952fac94901b086549", + "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59" }, "stable": { "version": [ - 20190425, - 11, - 10 + 20190824, + 12, + 2 ], "deps": [ "yaml-mode" ], - "commit": "dac4e5125c78aa3ae12d2e35a66196d709676236", - "sha256": "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0" + "commit": "2651e831aed84ee2512245952fac94901b086549", + "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59" } }, { @@ -36940,8 +37183,8 @@ "cl-lib", "go-mode" ], - "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", - "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" + "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", + "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" }, "stable": { "version": [ @@ -37033,11 +37276,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190808, - 2249 + 20190819, + 2109 ], - "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", - "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" + "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", + "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" }, "stable": { "version": [ @@ -37141,8 +37384,8 @@ "deps": [ "go-mode" ], - "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", - "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" + "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", + "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" }, "stable": { "version": [ @@ -37434,8 +37677,8 @@ 20180130, 1736 ], - "commit": "5beae3f4dacad9b0b86a8a4ab308459475feda0e", - "sha256": "0f1x1vjzlr0i41b7nqziw7yiawfw8sb1ssqwii7a5nfgzsv19z7w" + "commit": "dceb47fb3ea99ad7cc4308fa2c9ecb0d012639e1", + "sha256": "184llmywxm3fi20lpyni3vx4wxg2z8aag8ahirka2ipnykl1z9id" } }, { @@ -37808,8 +38051,8 @@ "magit-popup", "s" ], - "commit": "7b40d3e162becb69c99f2b71a26e1966adb34384", - "sha256": "16yqh892rfpg6mbzqxc8isxh3z3s9h14n6chm1h2qxsa82wqrrk2" + "commit": "3e2022d00278b8d47ea40793d299365c5d7b53a1", + "sha256": "1gmfsqn46lb4anqzb0s8yr21kzg5k2arw1daz056vcspq4fy3ix1" }, "stable": { "version": [ @@ -38414,6 +38657,30 @@ "sha256": "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2" } }, + { + "ename": "grip-mode", + "commit": "de97f1c15b3ab53ca5e314b679c289705302bb64", + "sha256": "162ss93hbkxv5zd0vid6xh77ln7bsx2ngzr7h1y4dmcg36npmy5d", + "fetcher": "github", + "repo": "seagle0128/grip-mode", + "unstable": { + "version": [ + 20190820, + 1726 + ], + "commit": "e3f5143d34ec47ee3c01a21e1d7c5dbf744bfe1a", + "sha256": "09ikf88nl7mig525m4432f8bjff4rdgiw3a5vjnmilmsx85n6gpd" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "7777b694751c0da754712b964052617de1740e42", + "sha256": "1kbyr3rfdbclpvxbbv66rirj7bn507izafjssvkwgjrrd6vfhdv2" + } + }, { "ename": "grizzl", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -38972,20 +39239,20 @@ "repo": "marcowahl/hack-time-mode", "unstable": { "version": [ - 20190529, - 855 + 20190827, + 956 ], - "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb", - "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh" + "commit": "74465859154314228482b4f41fcda726c82c71c9", + "sha256": "1q9k7r09y532fcvzjkgcqnk5hdms55hrshawgxhiz3qwxxc3svsi" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "95ed4c8a2410e1232453b3a49274a46afb740b1e", - "sha256": "083b9kwhh4bq0dwn6iskrrmsgxicqg08p8k6n1m1xadgs61lgkjb" + "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb", + "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh" } }, { @@ -39734,16 +40001,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190811, - 602 + 20190830, + 1604 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", - "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" + "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", + "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" }, "stable": { "version": [ @@ -40000,8 +40267,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190708, - 909 + 20190814, + 1056 ], "deps": [ "biblio", @@ -40012,8 +40279,8 @@ "parsebib", "s" ], - "commit": "8978ba5236af767023976c5b793a2b3e29e43c7a", - "sha256": "00fw8j3mjrq8y3qbcgj0baxnspq94a8qgxlyvrc6siraryppw65h" + "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", + "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" }, "stable": { "version": [ @@ -40588,14 +40855,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190809, - 1008 + 20190830, + 635 ], "deps": [ "async" ], - "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", - "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" + "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", + "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" }, "stable": { "version": [ @@ -41133,14 +41400,14 @@ "repo": "elpa-host/helm-file-preview", "unstable": { "version": [ - 20190630, - 839 + 20190825, + 247 ], "deps": [ "helm" ], - "commit": "6c67cc9a17f6e951dd79cfcdc6997b6357f5bf3b", - "sha256": "0fvmdhhkpa079zrz15h1adrff01c1csxwww5im8kqn2hk4qdycv2" + "commit": "7b332fc3ceb730d054bac464b78e4d6e009ff432", + "sha256": "0klcgqqyx4zkxy0vnqfkbydjv59za8g247x0rgk64iq62fsmm3k8" } }, { @@ -41296,6 +41563,38 @@ "sha256": "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987" } }, + { + "ename": "helm-fuz", + "commit": "7b411e46e9246beb36acb3e468980e84c77c6015", + "sha256": "1j3fpmqn526pkrrms578fm470svqd2yran4mpxjx0xps45nsklsc", + "fetcher": "github", + "repo": "cireu/fuz.el", + "unstable": { + "version": [ + 20190815, + 401 + ], + "deps": [ + "fuz", + "helm" + ], + "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", + "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "deps": [ + "fuz", + "helm" + ], + "commit": "90ca9207a9c1decda24a552b94ff41169ecccb14", + "sha256": "0v1advw2yr8b4jwd713fijd1kx4yc5xzz5ck2qfdxy5ixi1b39nm" + } + }, { "ename": "helm-fuzzier", "commit": "51dc6f01e0e5ee0593bea6616894bc0163878cd0", @@ -42343,14 +42642,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20190410, - 1718 + 20190819, + 1311 ], "deps": [ "helm" ], - "commit": "7793d96694505380c470cb7b31b4bd8a2781e529", - "sha256": "01410wi46ljpy1040wk9dp2k21nyhc3k6kwxpy35874bqhqn5r3i" + "commit": "481964fb26c59ea280a1ec7bce192d724ddf7d12", + "sha256": "08cszx5iqr65sz66ank722c1kdvjff2k7kvhxdilhf3gb6f8ph9p" } }, { @@ -42475,14 +42774,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20190813, - 604 + 20190819, + 617 ], "deps": [ "helm" ], - "commit": "7926896aa1195db7ca6394c1ce60152b98f5fca1", - "sha256": "0cxxjxh89qhxfxc5gwqm5jwvdcnmsyipzwibvmqmq800ims09fka" + "commit": "542dda7bc9a3b9dfb439e4f8a1e5f60cfb6cc256", + "sha256": "1xa32w80icrykpyfb89fhb0s4l7ysi0sc7f7lfwqz5najwbgqipl" }, "stable": { "version": [ @@ -43215,8 +43514,8 @@ "helm", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -43378,30 +43677,30 @@ "repo": "emacs-helm/helm-slime", "unstable": { "version": [ - 20190703, - 714 + 20190821, + 1304 ], "deps": [ "cl-lib", "helm", "slime" ], - "commit": "e51f756f2a6e00231a34f2b46aba6c746a112624", - "sha256": "1aam9zxx7j3g2kp6n62hjrcw6rkdnyk90anihbm1z89kb2b00bgw" + "commit": "e0dbf04d447098a1d074bc04e125764ff82091b7", + "sha256": "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "cl-lib", - "helm-core", + "helm", "slime" ], - "commit": "ebe80eebd1dfba1f1c837876c8f73cefc8c4db87", - "sha256": "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv" + "commit": "e0dbf04d447098a1d074bc04e125764ff82091b7", + "sha256": "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0" } }, { @@ -43530,26 +43829,26 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20190813, - 920 + 20190822, + 501 ], "deps": [ "helm" ], - "commit": "8ae7c47365d3cef4b81abe97af1532340821a21b", - "sha256": "06rfhd38fvfnzjxk119pwwddszv1sczxn5dn6r7qki39wwxcsqww" + "commit": "3cc15383fae9063de817d320e87a1f868a46eb83", + "sha256": "1jm1yvwbfqhrj0256n5ihvxb1zxhhhqv07yfzkfg2pv6k71hpd9h" }, "stable": { "version": [ - 1, - 7, - 4 + 2, + 0, + 0 ], "deps": [ "helm" ], - "commit": "c66336b8245ddc51c4206f19c119f1081920985c", - "sha256": "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk" + "commit": "c5ec1f3acfb07155273c2de021f3521e198e4a9d", + "sha256": "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd" } }, { @@ -43850,14 +44149,14 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20190721, - 1455 + 20190821, + 1252 ], "deps": [ "helm" ], - "commit": "cc90ed9e04f848b252ba50951f332f4c4208651b", - "sha256": "0gzfmnnvjc42r0pk1jxlcacl0bmr3jqav6rnj7cfk2g05af10xli" + "commit": "5290e2a05209b742d7efcd3e03b5f51ac1eab6ad", + "sha256": "1jkjm43fnwc4n9h5rrpkb2sgs2k0nb5fmxxn08b4iyz992lgmk7b" } }, { @@ -43961,8 +44260,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20190807, - 2141 + 20190814, + 308 ], "deps": [ "dash", @@ -43971,8 +44270,8 @@ "f", "s" ], - "commit": "69474e9c49076ce82cea4eff237933b6cec0b5cf", - "sha256": "1jf0rj5k9aa1gbsvwwhnj5vkwpv1am5ya1xw5sxhzl3iabqz680i" + "commit": "e9e958a5643619d0e32b9934bf4e9195c57cb71f", + "sha256": "1xhcl3i4cpm5j0q0qd3rcgv5cqfikgqxp4wnw96xkalmyhqdgi28" }, "stable": { "version": [ @@ -44020,6 +44319,35 @@ "sha256": "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697" } }, + { + "ename": "hercules", + "commit": "c0a3b713c6c8465dc461d9776ccd27f06659993e", + "sha256": "1ggb8ax18nvcrcf1rqf8lkjjxb90kl05ivk0110h6pb9270x03hy", + "fetcher": "gitlab", + "repo": "jjzmajic/hercules.el", + "unstable": { + "version": [ + 20190820, + 1712 + ], + "deps": [ + "which-key" + ], + "commit": "aace3409bc4d78fec3006b2906eb2ae99cadd9f4", + "sha256": "1s88hmw671in3lrmsbbc3w6fs1ccgzip8k46j79gyf50vzzfcpk7" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "which-key" + ], + "commit": "8d156df2b7ae2866bfe44ee1b9c038379524147a", + "sha256": "17izhdq6pgg25nkl1zlqri18dhjgxwkw95iy230adsbk8m0iys4g" + } + }, { "ename": "heroku", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -45237,14 +45565,14 @@ "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20180929, - 1214 + 20190818, + 1144 ], "deps": [ "cl-lib" ], - "commit": "374525133b96a801d7612cb65a026740a6d0361d", - "sha256": "06nwgwl165b5y7w5v6lgz0njapgn65fxbdxi0biw2qaswnz8vcwx" + "commit": "e011a70f5955b8eb2e30f7baf2f3833fc6d3216f", + "sha256": "0p8gphaqkyl9cmbs85vi31jgbc56j6ghwf5zhn523sy22vcw5j0j" } }, { @@ -45273,14 +45601,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20190611, - 2131 + 20190830, + 910 ], "deps": [ "dash" ], - "commit": "5650a8cd190badb49d28d21e72a2f55c9380de7b", - "sha256": "1hgd6nrj69283k240ngz7422776lw4fc9mvgwg7nvh41qb70vwgg" + "commit": "a5a046e7c26fbcda0b757a64b30ca3e5b1cc6d69", + "sha256": "15vqnl72ahydj0qjg7y7na1i6n8800fl0na2glgrrwyhzy0z2sa2" }, "stable": { "version": [ @@ -45718,15 +46046,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20190617, - 859 + 20190821, + 939 ], "deps": [ "cl-lib", "lv" ], - "commit": "a91dd72529aadd2d3cc14e132a3e0545eb2975a6", - "sha256": "1bbyj0l6176277qp20034lgs8ghx01fasnikkc76fndn3v4vsljn" + "commit": "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f", + "sha256": "0nzbjx5rnmzl0dhbrrmb5kbcmww6hzs1vwa62nlg9zfwq99zk42l" }, "stable": { "version": [ @@ -45994,15 +46322,15 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20190710, - 306 + 20190815, + 501 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "3d66e588556686563b8fb72d7654f840d88046c5", - "sha256": "0r6654zddbxsbqbrjdd9rbhvfvvdffbh4ggg67b3kcwmzwwjp92p" + "commit": "5e5cd04e3f3ad9963c29759293c1f7a54257866b", + "sha256": "0y9nsdkw8sahb3vgrgc278dys7m3nqzq6wgcifhhcsvv1bgs93hd" }, "stable": { "version": [ @@ -46231,21 +46559,21 @@ "memoize", "s" ], - "commit": "41b42779e22c064192b95e4de855ff7ebad45af6", - "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" + "commit": "61c6fc60c2c7c70cf07fa533914bd2dae27c902a", + "sha256": "0qwi4prdx6flfzkzhqz15xbvlcxdb9gg3i1hz350p7h2kcfjkqpa" }, "stable": { "version": [ 4, - 12 + 13 ], "deps": [ "cl-lib", "memoize", "s" ], - "commit": "d56125deac540a2ab396d6d71f7c1eeae7f37588", - "sha256": "11wn2xf7dbgfhwdrjazshf4c5im1yxnqpyvq8633fjc1cn9s7vxw" + "commit": "41b42779e22c064192b95e4de855ff7ebad45af6", + "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" } }, { @@ -46698,11 +47026,11 @@ "repo": "jrosdahl/iflipb", "unstable": { "version": [ - 20190427, - 1809 + 20190817, + 547 ], - "commit": "47d310a4576ae2195777d755cf86d5ea7525ef74", - "sha256": "0s35iiki06302q7bn2p5gdfv03y7w3d8rkk84hxr5azwhw1v2hcg" + "commit": "aeeb85633566ed3c13dbe94a6a4925d8930b7b85", + "sha256": "07010alf6ymhs0nyj3arafksba0rdvgzjw9wqqhayzw6qqannbb2" }, "stable": { "version": [ @@ -47663,11 +47991,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20181119, - 706 + 20190816, + 715 ], - "commit": "054c125b49247a08af5a391992817776fd0e8af6", - "sha256": "06g4xsirag4gjd9khii4yhca29g5z9507lyyxxk35k36ckarg07i" + "commit": "54adc447d30e60b6e6c39220e8b36d93d63fecac", + "sha256": "0pk8wgbxrly5lz0xzbk0kf5rx8z3cbyv9wj6l8s1zdc0bzj7i1nk" } }, { @@ -48496,11 +48824,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190809, - 1551 + 20190825, + 1023 ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -48520,8 +48848,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190708, - 909 + 20190814, + 1056 ], "deps": [ "biblio", @@ -48532,8 +48860,8 @@ "s", "swiper" ], - "commit": "8978ba5236af767023976c5b793a2b3e29e43c7a", - "sha256": "00fw8j3mjrq8y3qbcgj0baxnspq94a8qgxlyvrc6siraryppw65h" + "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", + "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" }, "stable": { "version": [ @@ -48554,6 +48882,25 @@ "sha256": "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23" } }, + { + "ename": "ivy-clojuredocs", + "commit": "ef20e3b6fa8d4586d6f17a4e9a6746390dbb2b50", + "sha256": "1p3fnj6zz2cxirn2dv54hnwabflxsj04vxjf0f7fbs931c7hrshx", + "fetcher": "github", + "repo": "wandersoncferreira/ivy-clojuredocs", + "unstable": { + "version": [ + 20190810, + 258 + ], + "deps": [ + "edn", + "ivy" + ], + "commit": "7af9cef998a608a7f505120af4754779f3014106", + "sha256": "1zg730gby1l0h1vrhbzwba2ybh1rk7n9gj1a369mcd2kkdlsvw2m" + } + }, { "ename": "ivy-dired-history", "commit": "ad37f6b04ff45fbffeadefc94db16baa27bcc2ac", @@ -48741,15 +49088,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190731, - 1602 + 20190829, + 630 ], "deps": [ "hydra", "ivy" ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -48913,15 +49260,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20190727, - 959 + 20190819, + 657 ], "deps": [ "ivy", "posframe" ], - "commit": "8ad466802de90d47992024394ea5f864c1cf0ac1", - "sha256": "013nsykqp50hdfady8j650lp3bfpmcl1ingf8b4pcwp6mcz2vg0w" + "commit": "d9ceee94171767b4aba6c55ebe93e51ccbe0fa8a", + "sha256": "1ghn9n4lc50p94byi0z2vfgkwyh4q4i19j26dkqr2lyvfhsvvdwj" } }, { @@ -49024,15 +49371,15 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20170523, - 454 + 20190821, + 1946 ], "deps": [ "ivy", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -50160,8 +50507,8 @@ 20180807, 1352 ], - "commit": "4c184256c4ccee3451357d3277c3e1bb16de2d98", - "sha256": "1mlqpzy5xg3wni1dchnmbs01dmlqimy167fknd6bsfb7ydf6ilqg" + "commit": "b4fec1497c76d36f7d8a2aad44983f8b6f501180", + "sha256": "0s80f6sq3ly9wiz5az1imrn5lyqhn0cdlq0vvfadk2ycvb370989" }, "stable": { "version": [ @@ -50333,14 +50680,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20190606, - 1008 + 20190815, + 1327 ], "deps": [ "cl-lib" ], - "commit": "999c0e7d96f4d5be0950b6506d732dc3d7c53635", - "sha256": "0nwhw0qw1hbdh0jrdbsgzv4z9yc93x9yjfpan93cbcw0i9qfai8h" + "commit": "b3841a7a304d9d1328fdb0868fbbecf0c2f9831f", + "sha256": "0rl9vz194c29ljiwgk7xfcgc047hi2ybda7mlj3r1plhk80768n6" }, "stable": { "version": [ @@ -50519,6 +50866,30 @@ "sha256": "0xrjbx6rkm8a6pmzhdph0r6l468hj827dvvq2hxhcm8v5gk6m690" } }, + { + "ename": "json-process-client", + "commit": "38cf8baad750427268659c8b25d35270add18317", + "sha256": "0lv4xdihjphpg31zdzkzrhp715sj7y2sl87c6cz6akhlfz2mmm0h", + "fetcher": "git", + "url": "https://gitlab.petton.fr/nico/json-process-client.git", + "unstable": { + "version": [ + 20190827, + 1858 + ], + "commit": "422606a7bf08d13646e3db4f6c2bddb69bd61dec", + "sha256": "16fyb0gwm4llwbmg12m4r9r8h540hcvhrsnlly6cry60h9p8dpc1" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "1d4a1fe2ecc682890dfc75e40054c9697c3046f6", + "sha256": "1r1mcd9xqibr7np2gsq8gpl310l05h75y2pnldlqqsszkhivyixd" + } + }, { "ename": "json-reformat", "commit": "f8c7976237f327fdfa58eea26ac8679f40ef3163", @@ -50735,11 +51106,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20190407, - 2119 + 20190813, + 1326 ], - "commit": "1eacdc608b6ce1947db0a86e61f2061f00a96bc1", - "sha256": "01bz57d8hnlr9g9xm987zaziyssgd5iacxcbgmg9lynksjgnpwsz" + "commit": "db84928742b3e4189dcc81997e4a3cad3eac7b68", + "sha256": "0hv43r037jacizmgql0sxxjj2g0f51k5zcxn7h30if86a6hhx659" } }, { @@ -50750,11 +51121,11 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20190420, - 1455 + 20190828, + 1646 ], - "commit": "71380e8139e28ea527a85ddb9146f2980d62c1f8", - "sha256": "1kmmk5wf0ifyn894qadqxfpwy2j6m397r0lg14sa73r01ql2j010" + "commit": "94761603d368f05eaed3573312503db940f4edfe", + "sha256": "1h3h5s0ls3shwgg6fl3sk0iszqdd90nz2kl5cpj1bbqfgw0fivmj" }, "stable": { "version": [ @@ -50916,8 +51287,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20190809, - 349 + 20190828, + 2043 ], "deps": [ "cl-lib", @@ -50925,8 +51296,8 @@ "websocket", "zmq" ], - "commit": "c4dc513c52c57a6f67d3c25c09079365dd2b06f5", - "sha256": "1bfxv5y8w0c3n81yb59f74014sdvdqf294kw01bq68kcg0xk6bx8" + "commit": "aa9b634e7b26347a9b938da4cb97184b73651a64", + "sha256": "0k1piakj4rzygy73jd6wv9hd6nhci3d056xfiaaala6vywfllvxg" }, "stable": { "version": [ @@ -51201,6 +51572,26 @@ "sha256": "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll" } }, + { + "ename": "kaocha-runner", + "commit": "7be32636579e00518b81644ba88e2ed9c1cf7346", + "sha256": "1j68vpbqsqyx54igqpihpzlmr4w38i52ms1aj41s4bgr953fmr43", + "fetcher": "github", + "repo": "magnars/kaocha-runner.el", + "unstable": { + "version": [ + 20190826, + 916 + ], + "deps": [ + "cider", + "parseedn", + "s" + ], + "commit": "5973bf9619d8c8b8f69824246210f31ea644127b", + "sha256": "1sr7zbdbg3hkcbmpr7fwpw26d6j4vk0a3cxnlr2pq2f5zy9n0hax" + } + }, { "ename": "kaolin-themes", "commit": "043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4", @@ -51297,6 +51688,21 @@ "sha256": "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8" } }, + { + "ename": "kconfig-mode", + "commit": "c359713acdb396c16d39fb6013d46677b5afa245", + "sha256": "17dhx5hjqhk4bljmj0v2xy379a0l89h8454x53mv6m9qm3rsnrhd", + "fetcher": "github", + "repo": "delaanthonio/kconfig-mode", + "unstable": { + "version": [ + 20190818, + 2030 + ], + "commit": "02bb919596cf673828e95872dc329f2424a99864", + "sha256": "1h0v9528d2ssjgqa8813l3anhz15aggsmf8yln0qpphhrlrkfmpz" + } + }, { "ename": "kdeconnect", "commit": "c363866d30fb86ae636d30def8c3847711ada762", @@ -51846,8 +52252,8 @@ 20180702, 2029 ], - "commit": "3ab5fde4ba63865333766685e025aae01933dbaf", - "sha256": "1k5qnrih9y8w49cbgi6prg98qqxrrn106g7h71azgpbav1mlfyk7" + "commit": "cefc5a72118021e01660734d08d1ad2433c7131e", + "sha256": "140h62p9i4h3jhf7rpsxn4ymg0dnxgf9kg070zc1fdvkj52gxxlw" }, "stable": { "version": [ @@ -52101,20 +52507,20 @@ }, { "ename": "kubel", - "commit": "f1c7ff1c44946f232730066d6c8c25d5b41ffda7", - "sha256": "1rm85bwpsqj600jvri508nn5i17ynyd84aanf8cqqxk5d2wf9x1n", + "commit": "6fe35f90b858d0b6710b4bae8a2b80f97f1b8228", + "sha256": "17xsy0kj2dskmr8mmrlvhkrylzgbfd0jqay9qa9avzlh24v85jcm", "fetcher": "github", "repo": "abrochard/kubel", "unstable": { "version": [ - 20190627, - 246 + 20190819, + 1434 ], "deps": [ "transient" ], - "commit": "4e5009540bb3305c9a0a298ffff25b933d6bbbdf", - "sha256": "08qshza3ph800n2wll4mdrgjv9mv41vq9aq7sa5v73ys3ghm4g7s" + "commit": "88995f796e6ba20cc91abfb012c23fe5ab29e19f", + "sha256": "0b33gp6qkclb1jxsxwjkwa74wri1zj2gx4sw11igbs58kkyzja52" } }, { @@ -52125,16 +52531,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20190813, - 239 + 20190822, + 913 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", - "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" + "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b", + "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj" }, "stable": { "version": [ @@ -52165,8 +52571,8 @@ "evil", "kubernetes" ], - "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", - "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" + "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b", + "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj" }, "stable": { "version": [ @@ -52593,11 +52999,11 @@ "repo": "galaunay/latexdiff.el", "unstable": { "version": [ - 20180521, - 2232 + 20190827, + 1651 ], - "commit": "024ee7a4fd235695dacd9f53594fef3d79bee88b", - "sha256": "17xpkbrwfck0m6zp5d1b9b4slkgyvm8d92nzilb4s1rf9nqf9mvw" + "commit": "56d0b240867527d1b43d3ddec14059361929b971", + "sha256": "1gkhzladgh0dj5pvak822x6nq7f4h6382647flhv7c65fqszscbf" } }, { @@ -52721,11 +53127,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20190728, - 1307 + 20190828, + 1538 ], - "commit": "7868e13bc2b10259245dd4bfc4b830ddc136b4bd", - "sha256": "15899b2fpck7k7ksm1x2v5gcq6y3rb9l4xi5i8myj356lgk8ycv9" + "commit": "daa8b5194f5a05b74a9eb46f6787f46ddfe5778d", + "sha256": "05f9vdbk31jpqpc5afnwpnzwaswmlrvz9cr09ncrbjwcap06705i" }, "stable": { "version": [ @@ -52745,14 +53151,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20190716, - 2321 + 20190816, + 1859 ], "deps": [ "leaf" ], - "commit": "4191bab8346313c17a151bf98007781fb5f894df", - "sha256": "0f09d112fsj2gy5nfwsp39llpwl113y0f2jhfhhs20slxqi3hfcm" + "commit": "c314c8295973f75034f0dc2946b18087d3408e66", + "sha256": "114g469016pjar5wmr126cpd6cfiliz4w0lmw1rlmafc53h3wbr7" }, "stable": { "version": [ @@ -52903,16 +53309,16 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20190706, - 1622 + 20190827, + 1032 ], "deps": [ "graphql", "request-deferred", "spinner" ], - "commit": "90324e6b57660c55f5c9fbf7bbb19e9855304206", - "sha256": "013bli8q39d280z1kknc29dsacq4g8wzk0119dhsl3acah5a168k" + "commit": "2b2f44bbd46d3c8db23473833824a237073f6c23", + "sha256": "1bcknygmz1ay2j90cs6rmiax5gsdwrysvv2w13cmz601bv3prrgf" } }, { @@ -53086,11 +53492,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20190308, - 1534 + 20190829, + 921 ], - "commit": "916c0f3b562b5b0e4f4294b83decda941fb183b1", - "sha256": "1garn9rkn1jmv1w329qdw0mbn11j467kfp64902ncajl3590x2ly" + "commit": "69ab5c2db93cf58a57354a5d78e825d191109717", + "sha256": "1bsshad7y9yicbzp2fp53jv4kkli1slkyw7b15db4bgzj8br55s5" } }, { @@ -53134,8 +53540,8 @@ 20170121, 1254 ], - "commit": "0775432025f43cafbb7063b5923286bbd700cdf0", - "sha256": "0q6svybyd73zadr0ymq0a6qydsrg547c5ax4f8kpgla0mc086w9m" + "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a", + "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w" }, "stable": { "version": [ @@ -53154,26 +53560,26 @@ "repo": "DamienCassou/libelcouch", "unstable": { "version": [ - 20180604, - 753 + 20190820, + 1632 ], "deps": [ "request" ], - "commit": "1faa877fd83c31f612eacb1d12645b2b4cfb57ed", - "sha256": "01b72d98h00rkkrpdimm1c64f7470z92yjb46y8gv1r76n6zcfy8" + "commit": "fd90ff7989632452434fc19a609805f7276821f3", + "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1" }, "stable": { "version": [ 0, - 8, + 9, 0 ], "deps": [ "request" ], - "commit": "1396144ebbb9790d4c744db0d4aacc0211b8e8e6", - "sha256": "1r0wrqiqar3jw5xbp1qv7kj7m1fdzciyy9690hwiq99dcm8nlri3" + "commit": "fd90ff7989632452434fc19a609805f7276821f3", + "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1" } }, { @@ -53214,20 +53620,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20190427, - 528 + 20190827, + 1905 ], - "commit": "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe", - "sha256": "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj" + "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", + "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe", - "sha256": "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj" + "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", + "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" } }, { @@ -53297,8 +53703,8 @@ 20180219, 1024 ], - "commit": "4abfd658dd0985b960da08a3ec426cd860d57d2a", - "sha256": "1fqgwydk5cw98nb7m9rq7cmmmmh3qfhwvq2b4lvv47ahk9113402" + "commit": "a00f8e380a8b87269a8ea0b68af63383a74ca5e8", + "sha256": "024hsx5jhr9myssmw60mxyizbj184hq6zxv8b0k1ivll026hbnpi" }, "stable": { "version": [ @@ -53504,6 +53910,30 @@ "sha256": "01ycjy3amzbplp3zf0x5fahsja92gyg2252xhzcyiazmhaz7gkrd" } }, + { + "ename": "lisp-butt-mode", + "commit": "ec923a5f6018404171e6ffc3fb36a649e8defb1b", + "sha256": "0n6inbcjcpw5l95r3z63bdzld3bn3i5ywl2niqfhh9dfv2k1k5wc", + "fetcher": "gitlab", + "repo": "marcowahl/lisp-butt-mode", + "unstable": { + "version": [ + 20190822, + 1102 + ], + "commit": "3199954a70594405ccb7b193e6e471264eae7b87", + "sha256": "12qvycibrxsd3mlpj7x673kwfxhyhg3266ghf3r11179yh12hgy9" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "commit": "f6ccceda1618aad0ec5a665dab912a7ebbc32f08", + "sha256": "0w4i478aybp9ca09ixmzsda83l9igqx5ryv0g8vpkmd2vg3r0dcy" + } + }, { "ename": "lisp-extra-font-lock", "commit": "13e01d4faf9ecb4dde8b6eb4acdb0e48e3e5b6ea", @@ -53542,8 +53972,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20190802, - 1214 + 20190827, + 1516 ], "deps": [ "ace-window", @@ -53552,8 +53982,8 @@ "iedit", "zoutline" ], - "commit": "beb939a1afaf8ee39955b7bc0bc65326df817f48", - "sha256": "101hqw794a8hcrcwvjjzxydcdlwdvxxfhbablcafpiqj1dr4vn9m" + "commit": "7130b9d36f6d7eaed61e911772ba23e0c36659b3", + "sha256": "1swihyr4ir3a74kl8vppbl8s4yf3mwrvrjrpdfgvva0jys03bhsx" }, "stable": { "version": [ @@ -54445,11 +54875,11 @@ "repo": "jschaf/emacs-lorem-ipsum", "unstable": { "version": [ - 20140911, - 2108 + 20190819, + 2042 ], - "commit": "4b39f6fed455d67f635b3837cf5668bf74d0f6cd", - "sha256": "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir" + "commit": "da75c155da327c7a7aedb80f5cfe409984787049", + "sha256": "04h97vnd758gsdfg30wkrhnh4hz7k63xbrw178dxfcwsylq32wi0" } }, { @@ -54514,8 +54944,8 @@ "haskell-mode", "lsp-mode" ], - "commit": "8f2dbb6e827b1adce6360c56f795f29ecff1d7f6", - "sha256": "00j6d5rpsi7h5jz54zpjmbpg38fda4xy67xc4x67r834493ldzlq" + "commit": "64106be79350f9ce6903d22c66b29761dadb5001", + "sha256": "1d2jvcsx0x7w7f9q93gdi4x2fc6ymyr7d213m9ca5jj52rxjfsm2" } }, { @@ -54544,8 +54974,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20190726, - 817 + 20190817, + 1436 ], "deps": [ "dash", @@ -54556,8 +54986,8 @@ "markdown-mode", "request" ], - "commit": "f407a9a7742fb3890bf9e2d8b8a83a0b9b39ee78", - "sha256": "0yyvbw398fn7dpjq3hj7hpc79fi1xzq9ggwldrfmb3717b4ba680" + "commit": "ccc40d3249c031e34fec13d4b82da694addb0274", + "sha256": "1nb40nnj7caz2mvfwnpwnicck1ippvnqhypqcglp6bvvz75h32z9" }, "stable": { "version": [ @@ -54604,8 +55034,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20190813, - 451 + 20190828, + 1641 ], "deps": [ "dash", @@ -54615,23 +55045,24 @@ "markdown-mode", "spinner" ], - "commit": "e4efbab6704e6b1241cccfa0992dbcc4ba08cdcb", - "sha256": "0by7frvvf1swarswa7vfv1pgq2pirvx5jl61nxdw3q2l1ak4v7mr" + "commit": "4835feb8189fab4b00ba54ba73837c931022931d", + "sha256": "0f859fhy245aq6r0w4ibyaqjr1i4s1f850w4867f9knfw67zj64h" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "dash", "dash-functional", "f", "ht", + "markdown-mode", "spinner" ], - "commit": "789b672500dcbb2350bb5b667ffc0fd037a8b2e3", - "sha256": "1v1mq6ixzlgiazj8fmg4xaqhsqn3l89iqy74yndhvzh2rdf0pbkl" + "commit": "50ddaf439cd62033d3bc0d12cca341fb0d4e1382", + "sha256": "0jn5slhv9zfs446a5966bfg9dq144g22v79wnkx9hxq7if78p652" } }, { @@ -54708,8 +55139,8 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20190809, - 640 + 20190826, + 1758 ], "deps": [ "cl-lib", @@ -54717,8 +55148,8 @@ "lsp-mode", "python" ], - "commit": "8b18a98ad68373aa4d7ef24ec728a250ca570a2a", - "sha256": "1mz6hy1k0g3m5x4cvyqb68811aa2iabmjw4v2qbjfwd5jbmyvy21" + "commit": "d2f9bddc3988a43e680b858e9da44f7b0a0eae55", + "sha256": "0hmmv8rjg89bgkhsf2wcllmz3rljhnnncg00wsiz6fiwh0dw8lpp" } }, { @@ -54766,8 +55197,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20190724, - 1649 + 20190829, + 2110 ], "deps": [ "dash", @@ -54777,8 +55208,8 @@ "lsp-mode", "treemacs" ], - "commit": "e3e049cb441ec5a8f43730da93996f73f6a6db95", - "sha256": "14v8lww136np4pmaq1hqlrpqi6kkpi367cjvfy0s92m3dv7yywsf" + "commit": "3adf416da2fcd7dd4eac33f87c3eff66d5b67624", + "sha256": "0dqa7ny01v7k16pjrb42393blccvck650803hbsf1bp40ainaks9" } }, { @@ -54789,8 +55220,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20190809, - 1907 + 20190823, + 541 ], "deps": [ "dash", @@ -54798,8 +55229,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "1cfff2135ffbf7ac52d9c2ece3f2bd157ac51167", - "sha256": "1pbqjrhdv3n73p785fj3gl11rpaim0my78gp530239w10q5i7g9z" + "commit": "845fbd40f20d63b9eff592ddefeefd2263f6b27c", + "sha256": "0z8cds09wv275ckx13dbw6z84lfldij2lfx0az7cj1hkfsrwhxd4" }, "stable": { "version": [ @@ -54902,11 +55333,11 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20190716, - 1741 + 20190821, + 947 ], - "commit": "a91dd72529aadd2d3cc14e132a3e0545eb2975a6", - "sha256": "1bbyj0l6176277qp20034lgs8ghx01fasnikkc76fndn3v4vsljn" + "commit": "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f", + "sha256": "0nzbjx5rnmzl0dhbrrmb5kbcmww6hzs1vwa62nlg9zfwq99zk42l" }, "stable": { "version": [ @@ -55232,8 +55663,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190812, - 1330 + 20190825, + 1416 ], "deps": [ "async", @@ -55242,8 +55673,8 @@ "transient", "with-editor" ], - "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", - "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" + "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", + "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" }, "stable": { "version": [ @@ -55303,15 +55734,16 @@ "repo": "abrochard/magit-circleci", "unstable": { "version": [ - 20190722, - 1533 + 20190814, + 1723 ], "deps": [ + "dash", "magit", "transient" ], - "commit": "a423b12d3158982cccf39a3d72f6fa00c4c6f387", - "sha256": "00xwfqdnajrykj0l3kzh4y3hp4rrbmyaj8wrwffswyylsacf9kca" + "commit": "03101bd9cdbdfd779471a4c6d3d00ebadc8ca4a2", + "sha256": "10jr06257g3wx45rrx8jp1lxrlf5xx9w07832p2jpwfvqwi9w0xh" } }, { @@ -55556,8 +55988,8 @@ "libgit", "magit" ], - "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", - "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" + "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", + "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" } }, { @@ -55713,14 +56145,14 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20190324, - 1459 + 20190821, + 1455 ], "deps": [ "magit" ], - "commit": "f7dad9b0f6b81b23550ea5cca0f3219f184b746c", - "sha256": "1dpljj5l0jf28xsynj9wsgbn6wh6llx0wxvigrv37ccvrz4k2fgg" + "commit": "2cff1a30a30f2b3963342a7d185ec13fc12279c3", + "sha256": "0c4bn9wjjwb0f6hzh7d6vz33lrf75kal62329drzmbh1sla2s3h3" }, "stable": { "version": [ @@ -55836,6 +56268,38 @@ "sha256": "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q" } }, + { + "ename": "magit-vcsh", + "commit": "9ee290ad797511ccc4ee2e1d3d773672796da3f9", + "sha256": "025ggdb40js7nmg0fqw3ncki4krswwyvl4q1m8250k09g5r57zij", + "fetcher": "gitlab", + "repo": "stepnem/magit-vcsh-el", + "unstable": { + "version": [ + 20190817, + 2014 + ], + "deps": [ + "magit", + "vcsh" + ], + "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca", + "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj" + }, + "stable": { + "version": [ + 0, + 4, + 1 + ], + "deps": [ + "magit", + "vcsh" + ], + "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca", + "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj" + } + }, { "ename": "magithub", "commit": "e555b46f5de7591aa8e10a7cf67421e26a676db8", @@ -55936,28 +56400,28 @@ "repo": "jerrypnz/major-mode-hydra.el", "unstable": { "version": [ - 20190715, - 937 + 20190814, + 952 ], "deps": [ "dash", "pretty-hydra" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "dash", "pretty-hydra" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" } }, { @@ -56373,6 +56837,24 @@ "sha256": "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29" } }, + { + "ename": "mark-thing-at", + "commit": "bf5429d251d45fb9eb6d3c677b695f5298b1fb91", + "sha256": "1hzahlfxyqs47k406grxsi0qfgcx76884scnnlj2xirszd6j5mpz", + "fetcher": "github", + "repo": "plandes/mark-thing-at", + "unstable": { + "version": [ + 20190817, + 1623 + ], + "deps": [ + "choice-program" + ], + "commit": "0d2220fdc81c33a36ab5f136856f9f2f79cd01a7", + "sha256": "0xxip63gkq76lhlafpgklpnj3n345fw95pdwhn5blzsjrx77ig6h" + } + }, { "ename": "mark-tools", "commit": "9ca36020392807aca9658d13481868d8b6c23d51", @@ -57278,8 +57760,8 @@ 20190718, 1023 ], - "commit": "bd94d345bf19e612c11737de2d7d401bcc4348a6", - "sha256": "167bh65vjpmqvfn6wvi8dd2c4n3dd1zw3m5y96wcgpiqvwjb01gm" + "commit": "a2fff37a09159ce94a3229ce137bb4e6e552339f", + "sha256": "12786wl1zmhdj5kkvfm9zv02j0lnrja18yrbc286v33xa77lpiwc" }, "stable": { "version": [ @@ -57299,14 +57781,14 @@ "repo": "Khady/merlin-eldoc", "unstable": { "version": [ - 20190314, - 806 + 20190830, + 517 ], "deps": [ "merlin" ], - "commit": "09760346e34ac22f2b55f43f0e36a2865c3b8026", - "sha256": "12bba6f6qxi6azlafzhymqyaf57qi479n34crixmk8v69ivdch8y" + "commit": "db7fab1eddfe34781b7e79694f8923b285698032", + "sha256": "1c13cgmi8z69b5imd9zlagfgrsdl3qv73n24wgc4ih99w1c7sc08" }, "stable": { "version": [ @@ -57483,11 +57965,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20190415, - 338 + 20190825, + 2345 ], - "commit": "70d6da044a4f6ac8e40e489d4963b8a3d530b8a9", - "sha256": "0j569nski5f3z26qa1scpzbsx3xdvmw9sxhm1m9wj3ac5kvgk9hn" + "commit": "3bc70db24c4f1410eb91017ea37173ba7da70281", + "sha256": "054fcl303jjkswnjyx5apas8l6v8f8m3haxsvhn7f1xbcxvjmr9s" }, "stable": { "version": [ @@ -57524,8 +58006,8 @@ 20190324, 1908 ], - "commit": "b18648118144c0a3f7c1d74aad3e98ff16402e2e", - "sha256": "0i8gc4n691fhfn4p99k08bcd5sddn9wjh3cr5djbfh3x78gm4m32" + "commit": "b79e48dd775de3e1a08e445953243f1491e244cf", + "sha256": "0b4kmm09c70jsidrvpla99p9sy9n2d3x628fxrd2z0l6rfwpcyrj" }, "stable": { "version": [ @@ -57551,8 +58033,8 @@ "deps": [ "calfw" ], - "commit": "56e58bb8f22d621d271ada64b98eb6e09595e462", - "sha256": "1bz5s7y7jb00acgk140rbd2rr1i6ajnqvxbgs3yp19cxfnspbcj5" + "commit": "86d3682ff9491893da671237be3cde0b0010ca85", + "sha256": "0md61pfjvx8xakahpig39ldfzvwdjgr19qxr78c7bzl98hbjpgq4" }, "stable": { "version": [ @@ -57720,6 +58202,24 @@ "sha256": "187xynmpgkx498an246ywrqdhyyp2ag1l7yxnm0x0rbfgw67q5j1" } }, + { + "ename": "mini-modeline", + "commit": "d8d20ab65df4c4a85a59a2a926ea14a262375490", + "sha256": "17zm255a85vmxc07h5cr6gcsb92gf8q5ma52z622ridbvzvfc5yc", + "fetcher": "github", + "repo": "kiennq/emacs-mini-modeline", + "unstable": { + "version": [ + 20190824, + 1308 + ], + "deps": [ + "dash" + ], + "commit": "d0ed5f1ac1ff5cdb1db5fb2a99f2a09b9bc6f089", + "sha256": "0i1b220b5kb0h0yhn5s3dgnlvf6r9hd0iazh9nqbnw28n92gvp01" + } + }, { "ename": "minibuf-isearch", "commit": "ebfd2f3f6a2dbd251c321738a4efaacc2200164b", @@ -58298,8 +58798,8 @@ 20181029, 516 ], - "commit": "4985ba42f5a19f46ddbf9b3622453a9694995ce5", - "sha256": "13n3di05lgqfm4f8krn3p36yika5znhymp5vr2d747x54hqmgh7y" + "commit": "bec2268fb42db58d22479a7b7ca3a956ead1af94", + "sha256": "0yqdc1z6n9cpa16drjij2r77yqk9jhj1z532cnyqnk7r90avbhzs" }, "stable": { "version": [ @@ -58683,11 +59183,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20180910, - 438 + 20190820, + 1114 ], - "commit": "a8820f19a8168ab395ba835872606280ad96916d", - "sha256": "1lpkmbabw9n50hf7yr6n4aim8x0km1wa15mpf7mv9w91ca2blg5d" + "commit": "52fe3ed21490e6a5266e5d2d7111199b997c2400", + "sha256": "00zk1ssfmks4bnw8j4zfxnjsvjzgdf9a3wb08h8jnbpkh48zff7i" }, "stable": { "version": [ @@ -58974,6 +59474,25 @@ "sha256": "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx" } }, + { + "ename": "mozc-cand-posframe", + "commit": "2c952ffcf7c2c358500df86e3ddeb6a10a119725", + "sha256": "0spxc1z7glls47k6cpq14cpbx9h0svl9qn954x8f1c7kcdy4wz6p", + "fetcher": "github", + "repo": "akirak/mozc-posframe", + "unstable": { + "version": [ + 20190817, + 2037 + ], + "deps": [ + "mozc", + "posframe" + ], + "commit": "20df08f0bf239bc2a686ff2c6d9390b5ea6d89fa", + "sha256": "0azcwdig6xp5vxr6yidmnbqbrfhgb7jwfmyk4cci5ca8sfm4ycvp" + } + }, { "ename": "mozc-im", "commit": "4b651b7f1c15b44577b3c2b7493264ed802cf073", @@ -59066,14 +59585,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20190507, - 1339 + 20190827, + 1854 ], "deps": [ - "libmpdel" + "libmpdel", + "navigel" ], - "commit": "1eb87264b6955235348880904378c199d65e3fa7", - "sha256": "0y43i4bngjnzv457kx7f6k38jsmsk4izfwx57pfp8bqz6f2yssb6" + "commit": "a16ff55e93109c37a204cde9a29699eb0b1d8e6f", + "sha256": "01kvgs4z4ppif339l8dq74ipjjyl8rdh0k03xy7zdivdna3mf06i" }, "stable": { "version": [ @@ -59631,14 +60151,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20190317, - 1211 + 20190820, + 749 ], "deps": [ "cl-lib" ], - "commit": "5ffb19af48bf8a76ddc9f81745be052f050bddef", - "sha256": "11cnwg0szk0fk6nf853pc1gisjh6gcq6ic0673qggg03ly77p87c" + "commit": "b9b851a7670f4348f3a08b11ef12ed99676c8b84", + "sha256": "0gg781vaa8jhmq5pdis3lwx3k114a0an2ggzhgqyrx0y3wic51ff" }, "stable": { "version": [ @@ -60443,6 +60963,36 @@ "sha256": "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn" } }, + { + "ename": "navigel", + "commit": "af52934237a069f70b8be136576562ba45c04ffc", + "sha256": "0ns2f1p943d2mfai6fdl87swcwh0sgmv0m3wz1kf73zh6vi4i277", + "fetcher": "github", + "repo": "DamienCassou/navigel", + "unstable": { + "version": [ + 20190828, + 449 + ], + "deps": [ + "tablist" + ], + "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7", + "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "deps": [ + "tablist" + ], + "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7", + "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m" + } + }, { "ename": "navorski", "commit": "9246cef94029d2da2211345c076ed55deb91e8fa", @@ -60864,11 +61414,11 @@ "repo": "aaronjensen/night-owl-emacs", "unstable": { "version": [ - 20190808, - 2050 + 20190825, + 1559 ], - "commit": "16fdaa15593cd86daf1100852045cdbd5c242d49", - "sha256": "0w4q9ar0kn0fgp554dwwb488za8kf80mi1dl0fh748b54m70j2c4" + "commit": "44c1b98f7c0d8b7ad31d6e1b3382bcf0294e03f2", + "sha256": "1nv2s0rz8ihixqxhxj3qn3h0zxfphgjzvldv3y32cg50gxnrb85n" }, "stable": { "version": [ @@ -60906,8 +61456,8 @@ "repo": "nim-lang/nim-mode", "unstable": { "version": [ - 20190710, - 2254 + 20190823, + 1009 ], "deps": [ "commenter", @@ -60915,8 +61465,8 @@ "flycheck-nimsuggest", "let-alist" ], - "commit": "0d46c05cdfa65d37f8cb5da860ff3052782f6bbd", - "sha256": "1lzrfllmcya7l2aqbh0j5wly3dx3wvag3b8gbmpjzd7cm4m6nax7" + "commit": "3fb6643ff684c5b5f3812cf66ea370a9c0e9559e", + "sha256": "1smv4a8rx9minmnw2vx8542lq6wy6n2prcxsvzrrilpykz1qdg38" }, "stable": { "version": [ @@ -60942,11 +61492,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20190810, - 1848 + 20190815, + 1740 ], - "commit": "0bbdedd23361ffbd7199c70481803b708fb65d59", - "sha256": "1v4cisqlqh2lqql29459lb475r4k95gz8qdvsn89hl58s27iq420" + "commit": "d2e627024ab7ce608b5203d4084c6a1588621545", + "sha256": "12zdk161d18f1yl6linx2g4fw1p4x68n5fbikkklw0ssqj0liqy2" } }, { @@ -60960,8 +61510,8 @@ 20181024, 1439 ], - "commit": "bd17f236231a58c44f1f5f09ff925aa666d672b7", - "sha256": "0xgb954shsahj8vm0mncl85cmy74xxxdqh4fp4bjv10gl8z2p8hf" + "commit": "61f90e918b608413daf07ffcb5c5c0930416951a", + "sha256": "1wsq7ap7yn5lvvb52ggzh7qk8wr8s4lfiip9v2qp73q25mlqnxww" }, "stable": { "version": [ @@ -61214,8 +61764,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20190812, - 2056 + 20190819, + 2331 ], "deps": [ "anaphora", @@ -61224,8 +61774,8 @@ "request", "virtualenvwrapper" ], - "commit": "3e6c4a5cd073d3d02aad0620cb00201e1f659fa5", - "sha256": "0k85hvp88i4rmv4igwhflw1rf307wxqk7l0qipybgbccs2zca5hc" + "commit": "c16a75a6fd99f5c47f10b349131be1c3d85bbe9b", + "sha256": "0gabznnvg9gxd6rrvcik2iyrlmpl409vc5k37c3vfjrnjqnwk6ra" } }, { @@ -61251,14 +61801,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20190730, - 2037 + 20190811, + 1527 ], "deps": [ "cl-lib" ], - "commit": "b36e1d28b97693850da258e103f24c40ec882753", - "sha256": "17y0m1n8vn6p0qykphbpbjbm3gzd2wprw6i2nwfd4g718hbsrkwi" + "commit": "e1e79c0211ad924ca220dac3a7a1a2e40710c073", + "sha256": "0cc4x62wynf71hzqk7gwx8g58gl4hm65pv0df8cir8g344li1c15" }, "stable": { "version": [ @@ -61564,8 +62114,8 @@ 20190525, 1602 ], - "commit": "17806ecc955ce0375146ea1df51eae061a72bef8", - "sha256": "1ishc13x25c4gxkgb9h1c7s16b5h2wrsxn1pk8vpykziippkjwxs" + "commit": "e13862f127394fd4addc5d2cf604b3af399c8377", + "sha256": "0w2jzv378bkkvwb6k7i6sfpis6hf8zpgwx8m2sa44ry3hixqmbgw" }, "stable": { "version": [ @@ -61614,28 +62164,28 @@ "repo": "wasamasa/nov.el", "unstable": { "version": [ - 20190611, - 922 + 20190821, + 1920 ], "deps": [ "dash", "esxml" ], - "commit": "b57fae0814502496796ce5b8170d779b64df42a9", - "sha256": "15s0r64w37m7a8kbcm47svvadaz6amqb9zirmyv7placbrfyaqzp" + "commit": "ecbdecc927a3b3f7e0927d225e6e6464c244c2ae", + "sha256": "0z6h3vgp0vawr96ni7814csdzkq7q710kya8raf9ii90fkzwhpi1" }, "stable": { "version": [ 0, 2, - 8 + 9 ], "deps": [ "dash", "esxml" ], - "commit": "b57fae0814502496796ce5b8170d779b64df42a9", - "sha256": "15s0r64w37m7a8kbcm47svvadaz6amqb9zirmyv7placbrfyaqzp" + "commit": "5184fbb1f3b3540be58a28f6dd469ff212ccc9bd", + "sha256": "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3" } }, { @@ -61762,8 +62312,8 @@ 20181022, 2154 ], - "commit": "b16092e8058af63ad2bc222f166b0aa3cb66bf9d", - "sha256": "0m1ih8ca4702zrkhl3zdvwbci96wyjlxhpfx95w372k25rca87dq" + "commit": "1efc30d38509647b417f05587fd7003457719256", + "sha256": "0px64jsdps477s9xiw96mhcf1fmgxf0gsp30gzhqfb1b1k4f306j" }, "stable": { "version": [ @@ -63171,14 +63721,14 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20190731, - 811 + 20190826, + 718 ], "deps": [ "org-re-reveal" ], - "commit": "e6cd154de8cfa0382495a047804e3b1ac90b431c", - "sha256": "1kf7daxs7p58lw7m09ygisyhm8hnzsdp74f1wqwb5fbl5zxhhmpq" + "commit": "f62fe1497be473d776d22094a02cfff381c61cfc", + "sha256": "088khyvflg4akdszkpalv2j49g25g10b0xzrjji2h2lgb1w5dg1m" } }, { @@ -63548,10 +64098,10 @@ }, { "ename": "opam", - "commit": "fc4e2076ebaefe7e241607ff6920fe243d10ccd0", - "sha256": "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "0hd08sb645jxz72m4g0jaggxa6l1dgimzgvd3mvvadihj6xkr2p3", "fetcher": "github", - "repo": "lunaryorn/opam.el", + "repo": "emacsorphanage/opam", "unstable": { "version": [ 20150719, @@ -63896,6 +64446,30 @@ "sha256": "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s" } }, + { + "ename": "org-analyzer", + "commit": "1e264f0cbd4ce919d28ae7b2fa00752dc83491fc", + "sha256": "18390jllqx2md5y5fjprx90nx11i0h1mdqx2q8jzv7napw957b1d", + "fetcher": "github", + "repo": "rksm/clj-org-analyzer", + "unstable": { + "version": [ + 20190827, + 2211 + ], + "commit": "e55960609c1ccd5feda307e28e72eac1f07e8e28", + "sha256": "0y1x04046gifmky3i46i23anr6q2f7ynj7lxp18v2iah3ri99v8f" + }, + "stable": { + "version": [ + 0, + 3, + 5 + ], + "commit": "10fe5da1bbad72093b784fb8c4c262e9daaa8b97", + "sha256": "0gf3bw8c5yll07mvh0ippvkqyf3m5bf36mwxabmmc64fpy0xb3jc" + } + }, { "ename": "org-attach-screenshot", "commit": "f545cd8d1da39e7fbd61020e178de30053ba774b", @@ -64048,14 +64622,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20190809, - 1315 + 20190830, + 757 ], "deps": [ "org" ], - "commit": "0f984e01a982ded563df9fab5355a29f781b2430", - "sha256": "09m4vsfmqfni5jdwxpkhfg3jzbd69d3di1z9wdc9bvbxrrd03a3a" + "commit": "e8a0dd5dd04c17dbbc954f3f2ec985996a539f01", + "sha256": "05l2yy3886nvkplca09q45lpzpwzx8fxd7fr96b4nb5i1187bagx" } }, { @@ -64090,14 +64664,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20190812, - 1918 + 20190817, + 1004 ], "deps": [ "org" ], - "commit": "1fd520490303d9a3e45187f2fe56f00ac403c214", - "sha256": "1m1ics2pd7x07ylbkmm1darbqdzrp29x3jlckr1bwizk9dwaz0r4" + "commit": "a563500c9884f38ce08793e2964f8274adde163d", + "sha256": "18qi1iv5dc0gsvkv9ifal3cjpm568nlb907v8a53cnm4439x1l0l" } }, { @@ -64153,14 +64727,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20190807, - 1453 + 20190815, + 1459 ], "deps": [ "org" ], - "commit": "f42d75a9787f9644f03b6f9a379bbc40f6397605", - "sha256": "0ra8ky67i2f4saqv265dby0r1x9n4lv8vn607g0z7c9myff6bxnf" + "commit": "8715302a16b5dc2cafee732a4e6b10a263d65328", + "sha256": "0l656xd2zp7l7xb5qs8fw8qsa8sdw5fp305lwiz66zq041xcpg4w" } }, { @@ -64421,14 +64995,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20190604, - 1340 + 20190830, + 1448 ], "deps": [ "async" ], - "commit": "ac72bf8fce3e855da60687027b6b8601cf1de480", - "sha256": "0ax5wd44765wnwabkam1g2r62gq8crx2qq733s2mg1z72cfvwxqb" + "commit": "10c9d7c8eed928c88a896310c882e3af4d8d0f61", + "sha256": "0i8wlx1i7y1vn5lqwjifvymvszg28a07vwqcm4jslf1v2ajs1lsl" }, "stable": { "version": [ @@ -64700,8 +65274,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20190812, - 951 + 20190826, + 2152 ], "deps": [ "alert", @@ -64709,8 +65283,8 @@ "org", "request-deferred" ], - "commit": "f0f9dc2ba7a5075b4f6755f96399c9dfee299ac7", - "sha256": "0s6bcyhg059409s0w191m1hpd8nfi1478jsilnby5fn1jhgdjmga" + "commit": "149ea8ee6ce538742d65d5a7925ab4536f421b1d", + "sha256": "02myllpdlizaqxfa8c8dk14481ly3c1yzb79dg1acna132p6sn93" }, "stable": { "version": [ @@ -64810,11 +65384,11 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20190703, - 1328 + 20190829, + 1443 ], - "commit": "eeed0584b1ebcc29bdbfd354e23141fe9f94b945", - "sha256": "0bfxl3ab1xpbpyvcr0qx6nk4lc1xm9ci29klqnr9msy5i94i6b8k" + "commit": "687c10cb4a2c4a66730bdfce161068bc6b0d2fa2", + "sha256": "1nnj7zzcbrmlnnd6q6739pqm8jsmlik2ci6zlfpd05sj7kmg0l19" }, "stable": { "version": [ @@ -64889,11 +65463,11 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20190701, - 1600 + 20190826, + 1919 ], - "commit": "eb7f9ab2f3e322586551c2f94c548868f8fb7aa2", - "sha256": "1h2w608a5r841bjcbacy2z5ph4mhykrg1zphrflz91ypsygn0qnj" + "commit": "cb15adcec09a891911bd2a85cbbfd45502e65f00", + "sha256": "10daayd273fc1vz6zxzjbi2blww12y2vzg93awmhn9awy5plg75z" }, "stable": { "version": [ @@ -64928,7 +65502,7 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20190802, + 20190821, 2107 ], "deps": [ @@ -64936,8 +65510,8 @@ "org", "s" ], - "commit": "1f9e420fd0030049714690c3d98cc75da83255bb", - "sha256": "0m9l4xsalavwm82wvlyfphi65lb65mkyp5dvpyjf86ijc9w8crvf" + "commit": "dd259135a4c3a320e020a335ea27fb4a2e488a53", + "sha256": "0k62s4kz8qmfq21r2jz7kfcyn6ydwxzfa5s2s2f26jny8flqva1d" }, "stable": { "version": [ @@ -65068,8 +65642,8 @@ "cl-lib", "seq" ], - "commit": "50bd8c22cde3b9b091889861e44a5043b53556f7", - "sha256": "01xz10xicsq07cyd6b42q3r8wnmsn91zjqkrh014d54alakkwhjj" + "commit": "65c09c5deba065752eb88875c54dc26abcdfaffb", + "sha256": "11chlfvil0wbvzaplzdymn4ajz85956hcs8bh3zds6ij806mqa4y" } }, { @@ -65222,14 +65796,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20190710, - 2230 + 20190822, + 2115 ], "deps": [ "htmlize" ], - "commit": "2e01080507e2276d5c52140f2c66f692e8e62f47", - "sha256": "18l8rjzkrrqmfq86s0m23xry8c92mls8bw019drbqix5g7ijw2gv" + "commit": "df89f46a86abed5c39d66ad35b47ab763dd27781", + "sha256": "1xm1ym4x1916h8nkm5zpj5q25sj2n9iawibmf2ifk0yr8faaz2jb" } }, { @@ -65290,15 +65864,15 @@ "repo": "weirdNox/org-noter", "unstable": { "version": [ - 20190807, - 1809 + 20190829, + 2358 ], "deps": [ "cl-lib", "org" ], - "commit": "d3df267a7432ecf0fb287a645e06dee7e7b80671", - "sha256": "0hj2h88zcg6vp3h1dash91gg2k1dqw2bib2glv0cp39b0xaspcsf" + "commit": "54e1bc5c1dbb291d4ed55c7961633b2977374055", + "sha256": "1kyxphldkqggn384mplvj8r3rbfwz7q8ba64i43b4j0ldglbvwgl" }, "stable": { "version": [ @@ -65527,8 +66101,8 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20181216, - 1436 + 20190823, + 1530 ], "deps": [ "a", @@ -65536,8 +66110,8 @@ "dash-functional", "request" ], - "commit": "84b026741a3f06ac4979b970a04f5c9bc38b8be1", - "sha256": "1dvr40i6zxkyimypk9m3p8jl2ff0xkp9pxdiggi5s6kkcrdw3cl7" + "commit": "11bde7699634926369fad0081d5e6d7525ac3260", + "sha256": "03zs5y0wm49pma739574sq6aky26l64j3bi6c8k52zzmg3pm3shy" } }, { @@ -65753,8 +66327,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20190813, - 146 + 20190830, + 1527 ], "deps": [ "dash", @@ -65762,8 +66336,8 @@ "s", "ts" ], - "commit": "5174aca4e8fe956abae7161d15058702bc8874c1", - "sha256": "1r2a1j4cdkw7rf981r06c3qc30c2irs3gawzkwxiflslkimpav42" + "commit": "58b298153c482e6517995bb94f28e03aaf9924bd", + "sha256": "0zkfczvmfwm09diihxr2yn1mdi7hxcd7p4hj4j0fkq6yrf296ca4" }, "stable": { "version": [ @@ -65855,28 +66429,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20190802, - 642 + 20190826, + 749 ], "deps": [ "htmlize", "org" ], - "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", - "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" + "commit": "84edfb6c359b4cdd489a92adf7e31c40a3c893e8", + "sha256": "0lz38sjkfja3f4szjw3gb15ckggkr4bjjyb3zdcfli89781zdjrq" }, "stable": { "version": [ + 2, 1, - 1, - 10 + 0 ], "deps": [ "htmlize", "org" ], - "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", - "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" + "commit": "6941394ce00f02a1fe8e7db99fe0c0bfc0a19824", + "sha256": "0bfbgjlp37ysik8y6a4gcqhbmy73i5p87lhjhp4d13f7dxq9q07p" } }, { @@ -65887,15 +66461,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20190804, - 846 + 20190819, + 921 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "094fd1d320c64ac361a57402501f0e43787b357c", - "sha256": "0r1ns3fm22yxc6zf4p5rvbk49r6966fqfl1caf0w3fyqgvwvllxi" + "commit": "12a85e3f6f1b2f4c9e0169c8642a78f71d933633", + "sha256": "0c03rd2rr43hbm4s9fd05qmhy98yvqdxg8da3dkwizkynr47f2yn" } }, { @@ -65906,8 +66480,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20190807, - 1016 + 20190817, + 624 ], "deps": [ "dash", @@ -65916,8 +66490,8 @@ "org", "s" ], - "commit": "c1984fe70322c35ee48b2d8bc410dd0a13ffbbc5", - "sha256": "13kcrki9v0w594g8q6rdzfx4002xzs8sz7c5fg7rvrm03sp93dqa" + "commit": "6336a0c36ef1048ba1f4e07716a421dce106d082", + "sha256": "1lpkjvlm969pr64j25zkpmsacjnr7qbq9zfwwzb9xyqlhaf5zzz0" }, "stable": { "version": [ @@ -66195,15 +66769,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190720, - 1012 + 20190824, + 814 ], "deps": [ "dash", "dash-functional" ], - "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", - "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" + "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", + "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" } }, { @@ -66214,15 +66788,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190812, - 215 + 20190817, + 1823 ], "deps": [ "org-starter", "swiper" ], - "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", - "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" + "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", + "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" } }, { @@ -66287,17 +66861,18 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20190809, - 1550 + 20190815, + 2140 ], "deps": [ "dash", "ht", "org", - "s" + "s", + "ts" ], - "commit": "4ad333643276ba1a604e8bec4a72ab68bafb8a94", - "sha256": "1rbivi5xjpbs4rbfldhrf0lw7q1nh99nlf8yi11kxf76z6d75vik" + "commit": "f65ff8109c97368ad640a6a50aaebd24046ce54a", + "sha256": "08aqq5sgj6y8mdj244j8024ampij49q08maws2sb1s40f0a7s697" }, "stable": { "version": [ @@ -66707,8 +67282,8 @@ 20190409, 1815 ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -67025,11 +67600,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20180522, - 1620 + 20190828, + 922 ], - "commit": "200ac4a636eeb6faf1793d1937e62a343debc437", - "sha256": "18a04grh4k9npf566xki9fiivy5qvpvv5v8mpj66wfx919fwa44c" + "commit": "cde171651b08ef24326127a62992062e25c3e699", + "sha256": "0a970fv8y2pvbxw2iy09zyl70c2raacdsysdi6ywkxi63fid5l8r" } }, { @@ -67443,10 +68018,10 @@ }, { "ename": "osx-trash", - "commit": "1f4c86e5b86df6c5c2c484f041fa3e434bbfbbb1", - "sha256": "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "05saq6w66n55m0wihwia6v2dd08xvblaw1zsbpf40l901flh9mrf", "fetcher": "github", - "repo": "lunaryorn/osx-trash.el", + "repo": "emacsorphanage/osx-trash", "unstable": { "version": [ 20160520, @@ -67951,14 +68526,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20190802, - 1755 + 20190830, + 1623 ], "deps": [ "org" ], - "commit": "470a708152c4a17eca80c49e042d4eeb57645539", - "sha256": "0dv068ghbci85y88zcqp6w4qkc8xpgwayh1van05r1k6krms8jms" + "commit": "a8e0c6e1ceeecebd5d2cd17dd3062b3e8aecbfcb", + "sha256": "0j2prlgb3gprdg9ynaka7y9390qdns6182zj6qpjvayvxkzfi0p5" }, "stable": { "version": [ @@ -68065,15 +68640,15 @@ "repo": "jlumpe/ox-json", "unstable": { "version": [ - 20190802, - 350 + 20190819, + 1506 ], "deps": [ "org", "s" ], - "commit": "ce99a8a7cb2e2a483d23ebc2f821f3a183cf4b50", - "sha256": "0lgcrd4ckjfph4h0ias6cr83bnj903xiyak6pcvskp3wfgwg09wa" + "commit": "96b7d330b77b02f7039adabe488595847a008bda", + "sha256": "1whysxp4s84lhvgz8vnj2r51dfnk91v5plvbj61rac0077md6df5" }, "stable": { "version": [ @@ -68097,11 +68672,11 @@ "repo": "linktohack/ox-latex-subfigure", "unstable": { "version": [ - 20190718, - 1529 + 20190816, + 1905 ], - "commit": "2e5b679212c33064eb25a8887e19a74897545389", - "sha256": "0mfjwwymlbyzppqicakyfl2yimlk48xvbr7sy2maip358898m5rj" + "commit": "5436eaf0cb036fed0a2042533ec1466a33cf9493", + "sha256": "1j9z7qr5nxbi96s22kkjp10jf29k7i61pwhs68j0lb4v238vdpsj" }, "stable": { "version": [ @@ -68646,14 +69221,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20190805, - 1628 + 20190818, + 1456 ], "deps": [ "cl-lib" ], - "commit": "64a6ac2343c791092ec2e43bab0c91293509c230", - "sha256": "0ac6kq9k6n3mznl0x5sgpalfa3v4cx9m0b7jc3s89dnyw6m4wp6h" + "commit": "4b71d9a5034953b0beac02b4722f09f43c5e0dbf", + "sha256": "1kc20sg0if2g3a2m6pjvwb7ddgcivmqfi104236s04dy4npzkwbm" }, "stable": { "version": [ @@ -68895,8 +69470,8 @@ 20190519, 2238 ], - "commit": "6f19d894bda6a981c10a58df5e23419f4d2ba353", - "sha256": "0b9jlqf5hk5m5zywwfcgxjb88aqhij73fxwkp16psfm4bv0zy78p" + "commit": "2e1d274e11071bb8daea4d6f4c0369c84466de7a", + "sha256": "1w6ckbb8rmi65knwnapyjy9amzcikgw088c6d9h5gqzdknbfdrqc" }, "stable": { "version": [ @@ -68999,16 +69574,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20190630, - 1842 + 20190827, + 1127 ], "deps": [ "hydra", "lispy", "worf" ], - "commit": "ef33bf4a84fa6fdd045e6e3d182429952f240c88", - "sha256": "07nlp4wfr7d856jjhxb8zqb9wsb425d6h48k2isy7jm4h7ksfm70" + "commit": "6fc4759d5431430ef9b3a182883d7e49ff7369fa", + "sha256": "0fmjii2j773alxj6nzg38qhyp3vsxh5x5mkbcazbchq1idfbhzlc" } }, { @@ -69113,11 +69688,11 @@ "repo": "coldnew/pangu-spacing", "unstable": { "version": [ - 20190422, - 514 + 20190823, + 401 ], - "commit": "3a741c1b669c7194fb766b784c10d52a8de9b87f", - "sha256": "12980pwsk4pvvya2x9nbwzkyxy75qfqzs0jxl4jdblgrhh104bs0" + "commit": "2e2dc6427b4427b045df37ba793884c6225c262e", + "sha256": "00zqb68vzcqd1mcxz3nsdydima14381dvqc4nncqm1l6hnapxf1h" }, "stable": { "version": [ @@ -69139,8 +69714,8 @@ 20190124, 1828 ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -69259,8 +69834,8 @@ "deps": [ "paredit" ], - "commit": "653d7a58fb370d5f7df367464d8d05e23a70b29d", - "sha256": "0q6a3cvanjh3j0kdpqa812yql2axgga45g6nljvxijm8i9ba2hqf" + "commit": "f04c522e6b088a11255a95cb1e6a08198b4d6537", + "sha256": "1jp6wk4zkfcma4akchbdh8wg5fi0i74m4cgnqnmvbyzwkbj6sf0q" }, "stable": { "version": [ @@ -69369,8 +69944,8 @@ "cl-lib", "dash" ], - "commit": "a7c041454e05ec2b88333a73e72debaa671ed596", - "sha256": "14ld7r2867aqa1rzk75bzf6qivqd1va4ilawggnxbbx5j2d82r1d" + "commit": "eaad857ae4351f72a561ee3dec8943713510003f", + "sha256": "1yjq2ddqmsl9jfy4qggwk5f8602ybvsx5qd544whm2b5xm0c5z9y" }, "stable": { "version": [ @@ -69673,16 +70248,17 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20190804, - 2004 + 20190829, + 1054 ], "deps": [ + "auth-source-pass", "f", "s", "with-editor" ], - "commit": "e93e03705fb5b81f3af85f04c07ad0ee2190b6aa", - "sha256": "0sxwz6awr60xh27q3ng90mmgjs9dpcjkags9dyvr3kc45dmdb931" + "commit": "b87e91f984f45615b6459ff3829baa9130b8ef75", + "sha256": "1xgfw238ph6fa8inrwqzfzfzqi16w4rr5sg79djb7iqz8njczbn8" }, "stable": { "version": [ @@ -70964,11 +71540,11 @@ "repo": "j0ni/phoenix-dark-pink", "unstable": { "version": [ - 20170729, - 1403 + 20190821, + 48 ], - "commit": "4defbb76b00c1a29f060813898578152d6be623d", - "sha256": "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc" + "commit": "ddd98a45775be105984ec598384e68df3d3e8046", + "sha256": "02fhna45wq3wja51yrwm0xysdvyck1r0a3dx41i5sh89504gl6a9" } }, { @@ -71091,14 +71667,14 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20190812, - 1711 + 20190827, + 1721 ], "deps": [ "cl-lib" ], - "commit": "6969d273992fd49c730fcc3170f17771a272b67c", - "sha256": "0p1bqabzlxp56vgvz42salqfjv7h3ffmnjv76wbzpx1jx5hx8yqd" + "commit": "5a5b9073585b7afb679e32f1d61086d9122c8b3f", + "sha256": "1595ncllpfzgjwq8lwcpk8wxgjvcsigpppf6y5s8gj5g7rz4d45c" }, "stable": { "version": [ @@ -71189,17 +71765,18 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190812, - 1454 + 20190824, + 500 ], "deps": [ + "async", "cl-lib", "composer", "f", "php-runtime" ], - "commit": "01ced487c673e027332ecb99c444f819b05ab40b", - "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" + "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", + "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" }, "stable": { "version": [ @@ -71360,29 +71937,29 @@ "repo": "ahungry/pickle-mode", "unstable": { "version": [ - 20190122, - 1748 + 20190816, + 341 ], "deps": [ "cl-lib" ], - "commit": "0d0b1925b7b79e2c80a1877351e3c6ce52935c4b", - "sha256": "0hbymja9109fzw34ra5iyxvhfv0x8ffr8sayqihdfmrs2ymh045z" + "commit": "0dab75b9f75dc2d0cf28f876cc9e2d127e6dca15", + "sha256": "03jp4nhca78k8kl6r5g8c2spjxsamhmqq5p3fqhiniqm3sz5v6cf" } }, { "ename": "picolisp-mode", - "commit": "fe116998dadeef6e61c0791efb396f9b8befa5d6", - "sha256": "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5", + "commit": "33b151c3aba268977b105965c816716d8b35ad6d", + "sha256": "1g45gmg3wd52yi3838bjlz3ccf71fznm6l3nkp7a7929q3rj9d90", "fetcher": "github", - "repo": "flexibeast/picolisp-mode", + "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20190811, - 1431 + 20190824, + 806 ], - "commit": "bf358e5e75adb7cfa1b7cde24209428a88d86b56", - "sha256": "15zb3g6b3n9242p10frzcyxa9gasnbmdjplsvjibzhxrrnhapans" + "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", + "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" } }, { @@ -71773,10 +72350,10 @@ }, { "ename": "pkg-info", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "1pg26fnni5yi4agqmy1lf1k0wkrcjz1d845d8xryai6bf8fiwf0c", "fetcher": "github", - "repo": "lunaryorn/pkg-info.el", + "repo": "emacsorphanage/pkg-info", "unstable": { "version": [ 20150517, @@ -71883,26 +72460,26 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20190812, - 1540 + 20190822, + 1403 ], "deps": [ "dash" ], - "commit": "1e5f8beedd940458d043832c7d972dbfe492155e", - "sha256": "1pf9jpsbxqxd90y3md1h1fyd2v9swhf10kkknfln102k6chyy1jx" + "commit": "2f8170b30b9885b5a6992047662d5ba0f4ac2248", + "sha256": "0c9as4g2rc1py12wcmv4s4gn2cpsf55cm7b4yf8amld5viz7r7pg" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "dash" ], - "commit": "648feb5b12372bbf8ea37544c44ffcde0aceba69", - "sha256": "0xpnd9r2d2pb6dj3sj1b0bvhg6rm1m6y1ksvngc9yfpynrxgrxwv" + "commit": "b39c310e9cb5a2e7aa72d143348362307d561f88", + "sha256": "03sdkjs7al2g6kqsxr8z53lqsnir6wk2a59kgi08lki049zim0a0" } }, { @@ -72073,6 +72650,21 @@ "sha256": "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2" } }, + { + "ename": "plisp-mode", + "commit": "33b151c3aba268977b105965c816716d8b35ad6d", + "sha256": "157v6h0rss9q1nshq0s59nn8q4xm7lq8c83ljgc8g9cql5b632i6", + "fetcher": "github", + "repo": "flexibeast/plisp-mode", + "unstable": { + "version": [ + 20190824, + 541 + ], + "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", + "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" + } + }, { "ename": "plsense", "commit": "fb1025f146514e9c142cd96cac9f2989d6d1a8c5", @@ -73570,14 +74162,14 @@ "hydra", "s" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "dash", @@ -73585,8 +74177,8 @@ "hydra", "s" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" } }, { @@ -73699,14 +74291,14 @@ "repo": "travisjeffery/proced-narrow", "unstable": { "version": [ - 20190810, - 420 + 20190818, + 1923 ], "deps": [ "seq" ], - "commit": "df5cce50b3d1219b23d28e23cbf68e0c7807a15c", - "sha256": "00b2g7prijad6q2zw0vhwq1xb49kcc8ym116zfj5r8wxz9cmpzpr" + "commit": "079a6834869638ae3586a68474149575d7623ef0", + "sha256": "0771n655f4bhvw6qdjkk0m8l5qwbqdyk28whp52bmx95j56yfkvx" }, "stable": { "version": [ @@ -74450,11 +75042,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20190727, - 1325 + 20190821, + 848 ], - "commit": "aa36785c6e7166da0720e05ba708cdf22687a9d9", - "sha256": "0a64z8h3mw3hyfiq0grpagmjj63bh6ix97f9zaximzin0q6zfxkk" + "commit": "d53ded580e30d49e7a783280fd9ba96bc9c1c39c", + "sha256": "17hf4mxpijvgd2jrffibcz9ps4vv8w2alcgmh78xjlb6mm0p3ls0" }, "stable": { "version": [ @@ -74557,8 +75149,8 @@ 20170526, 1650 ], - "commit": "c132a4aa165d8ce2b65af62d4bde4a7ce08d07c3", - "sha256": "06cqi10q6w07pshmfkzd40k40rm5slgsrbb6n0jdskhbw97wqk6h" + "commit": "36bdcb5a7a79aff977617bd1a83a7b25055e38bb", + "sha256": "00fgcysw557mgs0wfh095djnxd94qklf6h45bh8zw1dyhwfbmqpx" }, "stable": { "version": [ @@ -74833,11 +75425,11 @@ "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20190420, - 541 + 20190828, + 1136 ], - "commit": "552206807c9af6ec150540bbdda5d08393196e0a", - "sha256": "1bb14xcglvamvlqsx3dz75zq5ws17774g32484x5ksfpajpibwas" + "commit": "c47ea8fca65c0f964365488a392e51798d698cdd", + "sha256": "0j861dp8jzkp6a6956x9jy00bc905bzf3rwylws2vvrz9wpzp7r3" } }, { @@ -75379,16 +75971,17 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20190812, - 222 + 20190826, + 51 ], "deps": [ "async", "popup", - "pyim-basedict" + "pyim-basedict", + "xr" ], - "commit": "d096fc941f3844825415e2d3a3a627babe003428", - "sha256": "10i54v0v8x8ljh5h06cw3zljfi1g8bdkiprainn59ik8mc8rhhlw" + "commit": "0b8a7ff8b0fcd1086ef938ae398c8efb4791e494", + "sha256": "0lac78442pyidlrnd8zy6c96adv1jdfismz0qd9a0rj4zyfnzp4r" }, "stable": { "version": [ @@ -75533,8 +76126,8 @@ 20170402, 1255 ], - "commit": "a6b1e810df608430b04b65ad1ddc9ba1b8a22c89", - "sha256": "06cv6mah6wjbbwi196vn3fncf4drrhhr3gn1jndf2s14j98zpkh4" + "commit": "6b3afd4f6d75debd7f286f0d3c760ed10ab1e79f", + "sha256": "19rq53qmk3vzlh9l29f254jpvjbf28j6bzmhzakhy8sn1vchpqsq" } }, { @@ -75633,6 +76226,38 @@ "sha256": "0887620iq8xn28aajx7z2pkgh19778w494n8icibwlk2mj2m3gxl" } }, + { + "ename": "python-black", + "commit": "9e485ee04b19dda5d2165021da5018c3658a6cd7", + "sha256": "0jpr4zj8q4wfzfslr7v4a6975iz9jzd4ccmnci0ycbkbmrhy3mzj", + "fetcher": "github", + "repo": "wbolster/emacs-python-black", + "unstable": { + "version": [ + 20190817, + 1754 + ], + "deps": [ + "dash", + "reformatter" + ], + "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e", + "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "dash", + "reformatter" + ], + "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e", + "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk" + } + }, { "ename": "python-cell", "commit": "0549866c5e96f673ec9dec298e7ff9d5779d443b", @@ -75731,11 +76356,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20190724, - 633 + 20190819, + 1244 ], - "commit": "3bd6df77ddf41a3cfa10d8b634aeb8c65eb14b64", - "sha256": "07gai9b86cjsb9s0rh0601mznpsajmslp98sdig77qm9vvnj1x6q" + "commit": "31603f1fc1d8a7568b7259d7ccfef58dde72430a", + "sha256": "17rb0427v6nwjxy7b2364ihhlzhnqib1xvb547x8kdl971hw3ngx" }, "stable": { "version": [ @@ -76215,19 +76840,19 @@ "repo": "jstranik/emacs-quilt", "unstable": { "version": [ - 20190304, - 540 + 20190828, + 506 ], - "commit": "161ce2d8ba225bccef0ea8ae4937251b8ccaa892", - "sha256": "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14" + "commit": "b56a1f1acc46cdf8655710e4c8f24f5f31f22c6a", + "sha256": "1fk1cj0bwb4hrfcy868ll4jf3mq9ni0m8srf01dljh436aj2pc7h" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "161ce2d8ba225bccef0ea8ae4937251b8ccaa892", - "sha256": "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14" + "commit": "b56a1f1acc46cdf8655710e4c8f24f5f31f22c6a", + "sha256": "1fk1cj0bwb4hrfcy868ll4jf3mq9ni0m8srf01dljh436aj2pc7h" } }, { @@ -77636,8 +78261,8 @@ 20190529, 2238 ], - "commit": "b29fdd346d0d06bef4cafc75adbde51a46392e90", - "sha256": "0ahi9z3qpbg9zcb1fzbxqd6gb8ip44zdf9assimch7yklg5ph2ca" + "commit": "8372cc425967f055ba8a26f6098649467e776c5e", + "sha256": "1fmyqs06rrkyyclrsfrjsxcwkd0c20kimih2x5llhnxmw51i2y5s" }, "stable": { "version": [ @@ -77725,11 +78350,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190804, - 1931 + 20190830, + 1152 ], - "commit": "3e08d7bc123d6fbb84f7f8a5a6fc28aae4ec8c19", - "sha256": "0cwi5b89l7f21xq5cfms96vshz7swz0m2kjd5f71206f38rlcir3" + "commit": "5f52084d77c22df3b57e96a7ce0dc69679088f4e", + "sha256": "1p0q7dgchh9cjj0rknas3g40d5lfcp9qrxfbpq6hqzz569f6pc2y" } }, { @@ -78108,11 +78733,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20190730, - 1014 + 20190819, + 1735 ], - "commit": "f466ab1af578abd1942c3c70c101c585d9166bb0", - "sha256": "0jiqm701kn9xv9bxw4xd3qg9r2qkhws5qsly1749rs7zhbjfpzd2" + "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", + "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" }, "stable": { "version": [ @@ -78139,8 +78764,8 @@ "deferred", "request" ], - "commit": "f466ab1af578abd1942c3c70c101c585d9166bb0", - "sha256": "0jiqm701kn9xv9bxw4xd3qg9r2qkhws5qsly1749rs7zhbjfpzd2" + "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", + "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" }, "stable": { "version": [ @@ -78453,16 +79078,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20190403, - 1533 + 20190828, + 1339 ], "deps": [ "cl-lib", "s", "wgrep" ], - "commit": "450a1e54fb7c690166e61856b0d2002a71ccdf10", - "sha256": "01v5zz9psvkqw4cgq7b8r0b7wakxa5df4ki34g3nislrhmqp4n3x" + "commit": "64f25282fbba3cb436dbaabe73f5a5417f2daaa8", + "sha256": "003da113ak5bx2jdcy0ffkm2ihg013m1vk9v7pc5k65xb262c5wz" }, "stable": { "version": [ @@ -79001,11 +79626,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20190621, - 2006 + 20190820, + 502 ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -79476,8 +80101,8 @@ 20190517, 2037 ], - "commit": "c62185ae1c6edf0335261f169241eb8ee9713ad5", - "sha256": "0jq8hb8j484vqnd743d2azw4zg1gn2j0l6h60bd0vcqd2hgag1nw" + "commit": "48290d331d923031156bbbaf8360b774bf983d1e", + "sha256": "0xws8mrbrzhfy9kf2p68kwxvshayzbhrnqs6jjvv89h4aaj3630i" }, "stable": { "version": [ @@ -79520,8 +80145,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20190721, - 1342 + 20190820, + 1448 ], "deps": [ "dash", @@ -79535,8 +80160,8 @@ "spinner", "xterm-color" ], - "commit": "af0c3b88cb2fc4fabd66209c4dd91a520d924ec9", - "sha256": "0g9z58cxq4qjmgil1kzsnmf0fyp07db77l2alp1f25cgdfd92nbs" + "commit": "cb03a31bff0b1a13ff1ac90c1fd9bc89c55fbb0e", + "sha256": "0n0vrlv9l9d8qa4vrkvy5jaj6j4qvlqkjz1p5rya2vmiv4wb56ba" } }, { @@ -79571,11 +80196,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20180331, - 818 + 20190816, + 1209 ], - "commit": "42f874467dfdce59b511f883496ce2624b133dd7", - "sha256": "0k9nmi014vb9c8rymy3w8xbnj1q85xlslpblacz78iqn1kr6wy1z" + "commit": "539abca4651dda2d667a44f172957df39fa76eb5", + "sha256": "1n3biqink9zfbj4r94519xn68xigkvx16caj35njfzc05pkmvawc" } }, { @@ -79923,26 +80548,26 @@ "repo": "clojure-emacs/sayid", "unstable": { "version": [ - 20181223, - 835 + 20190826, + 1037 ], "deps": [ "cider" ], - "commit": "559a335926c12b37ff2928097b3e7eaefb88920d", - "sha256": "02h1dkzgs6439l2fjflkgvq40gvb353y47zhlasfqxy9cjj76d22" + "commit": "6febf397d5d610d28100fb1381a82d5e77f0d261", + "sha256": "0ra8xjsmagjwa1qakr1x4f9l88f3zj686dyk88q9qj1bvyam8r33" }, "stable": { "version": [ 0, 0, - 17 + 18 ], "deps": [ "cider" ], - "commit": "56ec0343322cf30d689810a8f5cffee004bb8d07", - "sha256": "16dq2hg3k0vypb5rjyrz90abm7qxbjbs6pv0z9qvsyn0ahi65jn3" + "commit": "5412d0e129337f0f97a5501521f86dd7deee5804", + "sha256": "1immns40clz78frsd4dc5ck5n90ac5pfid40bw3phxwr4prhmgf6" } }, { @@ -79980,8 +80605,8 @@ 20190413, 1246 ], - "commit": "fc91c81ffafe07691cec7466399b18f267964328", - "sha256": "0i7jrxdfxin6aaz1v578vy50j0g5l3j9yj2pgn5dw5v04xk42822" + "commit": "c060053d3b4818bf6d0620b0711be845795c4157", + "sha256": "0w3s32kk7mr9605mmssxrh4izq1wllxccd1hs4hcn2fz04igd9b7" } }, { @@ -80343,11 +80968,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20190721, - 2218 + 20190826, + 8 ], - "commit": "e509c10ccdf6f4239d448da8aa6f8b9cc36bb340", - "sha256": "00yy0bx874ijg8s16bp13n0w5q2fmjiklz0kgbwh4wpb7fawk8vv" + "commit": "271b4aa6b38c2550119a36efac2b92cf1233e6e3", + "sha256": "1ia2mcl42r69dlyxabjh76c550x0nf0irhpsdbda0h3in62f7q6m" } }, { @@ -81159,11 +81784,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20190731, - 1807 + 20190818, + 2128 ], - "commit": "0e7c98455ef71be929005d1d6e2372712081de69", - "sha256": "025kyyyr4pd58lzm917dzlfk3l5z877rc97jp4mjknlf89idi7lk" + "commit": "1887f606db73846d7da6023cb8944efbc791377c", + "sha256": "1izivy5vz2x86yqbip69jz7sfrjwfm0gsya95ynic7q9qqnq7bmj" } }, { @@ -81502,11 +82127,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190808, - 238 + 20190826, + 741 ], - "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", - "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" + "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", + "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" } }, { @@ -81848,20 +82473,20 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20190715, - 504 + 20190816, + 303 ], - "commit": "aeaaeaffb9a6d6205f2230fdbc9a4afbc0088323", - "sha256": "00jkqzh2rnj4jb93lzfmasr75lxb25j3sfj4cgppdz24hzd2yznf" + "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05", + "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2" }, "stable": { "version": [ 0, 2, - 0 + 1 ], - "commit": "2319ee180a4a67175b9e95322cd30b3ac70a9bdf", - "sha256": "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2" + "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05", + "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2" } }, { @@ -82257,8 +82882,8 @@ "deps": [ "skewer-mode" ], - "commit": "927d6848a1ea9428d4cc995f76bd42f7b8da6bc8", - "sha256": "11zaq1p04igg0hbmazsf5c0xz7aigx120rwg5iq7niaz2277j1k1" + "commit": "8ce9d030e18133319181d5dabe3e905c8ca5fd6b", + "sha256": "1hkk9si9z9zd2x2cv2gs0z423prlwlhq847irypz2dm1bnm5dzrx" }, "stable": { "version": [ @@ -82447,15 +83072,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20190724, - 1352 + 20190818, + 1634 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "11c0d8349347ab91449306f2448f2a558e747e90", - "sha256": "1yawjp5gcj3ainrbmlwjgxddzdbsfyq37kv5fjkzj8dywggdv8qy" + "commit": "cbab3e9a1bc4f1a03ee21f392a499f01333af816", + "sha256": "0y645w8lp1f51xx0f36fv2fz1lgk2w1rk7v6brxfg44igbb4c6sv" }, "stable": { "version": [ @@ -82703,6 +83328,18 @@ ], "commit": "c387ba34a75b172e8a75747220c416462ae9de31", "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "sly" + ], + "commit": "c387ba34a75b172e8a75747220c416462ae9de31", + "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km" } }, { @@ -84261,11 +84898,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20190801, - 1302 + 20190820, + 816 ], - "commit": "db328e2092bc56e7bf861ad294b8748fd35e16f1", - "sha256": "1cz3rcm5n90nf4qailyn6m544waknxngvm20pflbmzgj3q5cklgv" + "commit": "32ddc1a9b9f4f58ebe8410abc1124b7acf0f36b1", + "sha256": "14bga23rf9zn18fbs8zdhksi2kyxq0s937fbjpl0q91x05b6m61f" } }, { @@ -84393,11 +85030,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20190616, - 1309 + 20190821, + 1129 ], - "commit": "b3d62e62f9f23b08b62c1363e415c4f8a8f20029", - "sha256": "0nyh7v7qvwsayb1xdmbjagl3yxgs76fqm80w2r1xjmjzi0346qwb" + "commit": "1d4086a64ba554bb8c7d648c8d0e6c176277f6f3", + "sha256": "06sz5yl12mn0mq43bbv3ln14pk176ij8rxs95wi25yxdblznhsg0" } }, { @@ -84893,8 +85530,8 @@ 20170610, 1537 ], - "commit": "04970977b4abb4d44301651618bbf1cdb0b263dd", - "sha256": "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz" + "commit": "3f9df9c88d6a7f9b1ae907e401cad8d3d7d63bbf", + "sha256": "1crah9h86m5sdc7panj98ws9cv2as6kh9syal8m1p7rhimgvdx1v" }, "stable": { "version": [ @@ -85089,11 +85726,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20190610, - 1256 + 20190816, + 2237 ], - "commit": "e1507feccf581160daece98b436dfac63020bb68", - "sha256": "1bbs2k65fggab61pgl8p5jgg8jxsggqkfcs55k6kg4s78gj2rqma" + "commit": "d0f7294d23380766dcabdb4ed21bc6a68e496110", + "sha256": "1w4zd38whpqidhfscbcns7y14ixw6lq2x6wirfjxybq3yilgz9j2" }, "stable": { "version": [ @@ -85159,11 +85796,11 @@ "stable": { "version": [ 9, - 2, + 3, 0 ], - "commit": "45b8242611fe0437fcff48f5f4f7d8f0552531ac", - "sha256": "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" } }, { @@ -85187,15 +85824,15 @@ "stable": { "version": [ 9, - 2, + 3, 0 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "45b8242611fe0437fcff48f5f4f7d8f0552531ac", - "sha256": "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" } }, { @@ -85353,8 +85990,8 @@ 20171130, 1559 ], - "commit": "114bc99e7f65b6959d91b3a0452deca55c38dc32", - "sha256": "0w3fdbzscb7dc54q7qdp2k2kqvrqya1919qnj7nq4zsc6bw9v0x6" + "commit": "143146feada95b8be228d339114f2c469a78bbb9", + "sha256": "0dknxxp320zy3zrrbqsgl4d8jj4i2xcmsa6n91zpvdnb035658pp" }, "stable": { "version": [ @@ -86264,14 +86901,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190801, - 1110 + 20190822, + 1708 ], "deps": [ "ivy" ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -86502,8 +87139,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20190809, - 443 + 20190810, + 432 ], "deps": [ "cider", @@ -86520,8 +87157,8 @@ "slime", "smartparens" ], - "commit": "163d54eb483a9986587c586cabfcaa15210a2b5d", - "sha256": "1y8va209v32f6rd7f420aqyh8fs9srxyc9hinb9q6i1bs92vkry9" + "commit": "745dc44bc1569a05ade034981277ee5955677798", + "sha256": "0c1sibigy0kvhizxg2198k9kqgb57cmcjx7l0jmar2cgnmndbrgj" }, "stable": { "version": [ @@ -87320,14 +87957,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20190812, - 2131 + 20190830, + 1446 ], "deps": [ "visual-fill-column" ], - "commit": "5444e2a02374c245769417148ccf2dad0a0c633a", - "sha256": "0byddvnkyabcxy64f2w64sqcki4zfxjwkvzvkrcan46san6hsn87" + "commit": "f8f28c739dcc8f52c3e66368b06c0cfcd48e83a9", + "sha256": "0ynhw9ai906y4405r8wdalx09hinfns9n01cg96nc4fgbqkhbpdw" }, "stable": { "version": [ @@ -87855,6 +88492,21 @@ "sha256": "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y" } }, + { + "ename": "terraform-doc", + "commit": "81ba99e4734f231294800cc2b0a27fba2eb396e0", + "sha256": "0n62yicjsjikgbw5fckjxzgx5vfzn4ydi7jizm27ycpwxbw59ifl", + "fetcher": "github", + "repo": "TxGVNN/terraform-doc", + "unstable": { + "version": [ + 20190813, + 1254 + ], + "commit": "2ec10ea7bef5a75edfffeb515dd268e19c1f8c9c", + "sha256": "0r70fc7vv2rjnwnsg7myc1c15f3ql6hp6zrf5msmf8r2iz32jnpp" + } + }, { "ename": "terraform-mode", "commit": "93e06adf34bc613edf95feaca64c69a0a2a4b567", @@ -88315,8 +88967,8 @@ 20180905, 1050 ], - "commit": "01ea3cb8cee36e31a0ab8015426b57eb4ce29cdc", - "sha256": "0mfgr1303lpfa0nzh4lbxpiiijwv41bh3r631hjj9cpz8jkwicc7" + "commit": "562e52d2ecc53b86c56c7ee4e88288b45fe2e4e3", + "sha256": "10hxy7iwz24qcagpmi6vvkw7zv04ly4r5ym3sw8wzhcsb1fslzgf" }, "stable": { "version": [ @@ -88382,20 +89034,20 @@ "deps": [ "haskell-mode" ], - "commit": "17db036b9895fb7b54dda5e3cf2cb0ce5980b457", - "sha256": "1gys96kr6vq7h2jz15c9340idxv6915anw98is1mfl4ak6pqq3w1" + "commit": "621d95f6563d550bf777a51a2010f23382d61a78", + "sha256": "0ps8zjfkwjan5ziil6jhz7ls3mzgk970js0gaja3ndwsd5nlsmq2" }, "stable": { "version": [ 1, - 2, - 0 + 4, + 2 ], "deps": [ "haskell-mode" ], - "commit": "ba2eb0a503b604a806e45b914d16ece6899bd9be", - "sha256": "1cimnm9d5cm5bw8fjdm2gw5dlcrxcwkfjdh4dh9s7bgrbqjgdcmj" + "commit": "eabe03946d2d537e38d8f38f8c30d38a18202279", + "sha256": "0nwmic0iimy0fgc1m9ixi4mv8ckpc8cv8wjij1882ggd0isi4k59" } }, { @@ -88406,8 +89058,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20190706, - 2322 + 20190829, + 1315 ], "deps": [ "cl-lib", @@ -88416,8 +89068,8 @@ "s", "typescript-mode" ], - "commit": "dd90f5ad6c537d38b5f56599687c3bc9b21072a6", - "sha256": "1rpha2fbhmj891hbpm24din84j2m1ccjignwr237fhv34yy55z07" + "commit": "13f64933c19590ebd02a4b141bb6be88d7aaf2b0", + "sha256": "19kl8r426hi93q1nj5mwadx6wiymx0f77db4w51jcf5kp0rr2hs0" }, "stable": { "version": [ @@ -88862,8 +89514,8 @@ "deps": [ "cl-lib" ], - "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", - "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" + "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", + "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" } }, { @@ -89390,8 +90042,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190812, - 546 + 20190826, + 1125 ], "deps": [ "ace-window", @@ -89403,8 +90055,8 @@ "pfuture", "s" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89440,8 +90092,8 @@ "evil", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89471,8 +90123,8 @@ "cl-lib", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89503,8 +90155,8 @@ "pfuture", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89535,8 +90187,8 @@ "projectile", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89705,15 +90357,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20190812, - 1655 + 20190819, + 102 ], "deps": [ "dash", "s" ], - "commit": "31bd5a86aa35f7b8143170892ffaf6425284f3fd", - "sha256": "004z24vxk7xrc9in7q8rpaif79sw219zh86hj2fyczv2jixl6i9r" + "commit": "93c074f2895a204e003e8c7f3033c37d6486fac8", + "sha256": "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735" }, "stable": { "version": [ @@ -90385,11 +91037,11 @@ "repo": "jackkamm/undo-propose-el", "unstable": { "version": [ - 20190409, - 636 + 20190824, + 1554 ], - "commit": "5f1fa99a04369a959aad01b476fe4f34229f28cd", - "sha256": "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0" + "commit": "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c", + "sha256": "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny" } }, { @@ -90577,11 +91229,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20181230, - 1223 + 20190813, + 1436 ], - "commit": "ed87837d2303fb07ec81508930bc3b2a4d857fcd", - "sha256": "1xk8snjby46fprj3vd0yf2zmcqcqx6jcljgaxijdh6wqbl2ard3b" + "commit": "ba45edbfb8fa453e29c4c6c73af60f06637951d6", + "sha256": "1sil8lnvpdwk0g30mbqymp6ib325q28a8zn3n9y6j39ngphpkffl" } }, { @@ -91087,14 +91739,14 @@ "repo": "elpa-host/use-ttf", "unstable": { "version": [ - 20190701, - 1222 + 20190823, + 939 ], "deps": [ "s" ], - "commit": "0b56d4b062bb86e6b2e5425a0e76b4b2997a80d7", - "sha256": "0k3zy8zpv4isr5nd3xyvncbjdcpyfgc9swylhc8padr3ifkxvb3p" + "commit": "8c7f50a2b6f5bd55cdd92e351371386ff4b6edce", + "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q" } }, { @@ -91240,14 +91892,14 @@ "repo": "dougm/vagrant-tramp", "unstable": { "version": [ - 20190125, - 1859 + 20190816, + 1846 ], "deps": [ "dash" ], - "commit": "77256deca35bb797cbba499837f3658d1a17d2e3", - "sha256": "0j7ff9b3ic4a6kzn7k0c52knlgangql7sjsxahwvym6w18r52d5a" + "commit": "47c6fdc07722934eacce9f91c47bb1ee7d46b86f", + "sha256": "0a423h6klk0m3vjkds27a3h60xq8n72j15p1izrhgdzf1642w1g1" } }, { @@ -91485,6 +92137,30 @@ "sha256": "1xd42bdi6x89gc9xjrwvzzdaanv9vwlbbjwp25bs1nsd53k5nvak" } }, + { + "ename": "vcsh", + "commit": "a5f56f914d7cc11f45be0474897998accb0fec2e", + "sha256": "0cclih5yfgal3bi3n2na4sc4xw1rqalml3nknhgypxrlx4j784pb", + "fetcher": "gitlab", + "repo": "stepnem/vcsh-el", + "unstable": { + "version": [ + 20190817, + 2011 + ], + "commit": "2051e4ee20709f82ab2396ab2ccfbe887a3c6a67", + "sha256": "168rhydrz7h7bhaf885j4lqxz5x50is7gsypj0vypi6xv71zhd03" + }, + "stable": { + "version": [ + 0, + 4, + 1 + ], + "commit": "2051e4ee20709f82ab2396ab2ccfbe887a3c6a67", + "sha256": "168rhydrz7h7bhaf885j4lqxz5x50is7gsypj0vypi6xv71zhd03" + } + }, { "ename": "vdiff", "commit": "e90f19c8fa4b0d267d269b76f117995e812e899c", @@ -91753,14 +92429,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20190705, - 949 + 20190828, + 1121 ], "deps": [ "yasnippet" ], - "commit": "a7288bf5d55b554ea78c4b5fa1046d38d91ed2b0", - "sha256": "10jj3ipw65wazr46lwnrhj1q51b6scnn2m98yg105vcb8vssbszd" + "commit": "4869b7da62799e846b17258f6828dee016a991f4", + "sha256": "1phhrkk0yyxq4nlrcwad4dvspg6rwda5lzsmch2w64nr5v4ppvl7" } }, { @@ -92007,8 +92683,8 @@ "dash", "s" ], - "commit": "c3da41a3995c98dae2c751688655ea0cbe72493b", - "sha256": "0s5qnzb8ar3qp5fq69sa29x8xy917jbdi8xciqjl6dzk2a7nvqsv" + "commit": "107e7e0bf923f44d217712772cd58b414d0065cb", + "sha256": "1qqfcif4by8psc4kp9wnna7pm321a7d0xjkwznq2fwc5cqgbp0vz" }, "stable": { "version": [ @@ -92272,11 +92948,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20190812, - 1520 + 20190822, + 1225 ], - "commit": "fad40c1436afcf73fe39ea2ec535628866c72b23", - "sha256": "0kbb2f7p8ivznyqxx1ji60iqks3sbp6fb6nzfw9q5phagryl5bys" + "commit": "097d9806ffab9120f078bea22e9b49502807786b", + "sha256": "0x402pq4kq8agzbq1imxg3qm2v6agq2ni1x2a6yqrvwy5vq72qxs" } }, { @@ -92287,14 +92963,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20190803, - 1103 + 20190816, + 633 ], "deps": [ "vterm" ], - "commit": "96cac28e72dc5739958fa674acd51ceed8835556", - "sha256": "1scfbjr3vksn0d93gb3n0mi8gi49579szn24f78vkqwd99ivifwr" + "commit": "ecb5a44650515ea554ead078dcf824888e8c234b", + "sha256": "0jsf7sac45zc43linajmzkqv4lsxyf5m6zvhq01skpvb5y3hl881" } }, { @@ -92400,11 +93076,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190808, - 238 + 20190830, + 742 ], - "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", - "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" + "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", + "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" } }, { @@ -92492,11 +93168,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20180818, - 1829 + 20190828, + 916 ], - "commit": "abf7e18bf85c09963537156a447f0d01ff8d6c1b", - "sha256": "0icxgmyw68m19yqp6446rilfyv25xrm8ih44vg10nkdlk8m5kh9l" + "commit": "4f3e2c10b8d3b0bd48afb4db9df93ff2ce61c2cd", + "sha256": "0dmcbv4d2h2jxxblq6kqqy4rs8aci1zxl8wccz6zi3v9si4f7sql" } }, { @@ -93398,8 +94074,8 @@ 20190106, 2022 ], - "commit": "72427144b054b0238a86e1348c45d986b8830d9d", - "sha256": "1zlk534jbwrsabcg3kqlzk4h4hwya60lh6q2n1v4yn4rpf5ghsag" + "commit": "121854747776df1b78d0ef89efb6d01c2c1e8c89", + "sha256": "1qli6vwdnm73jnv37lyf1xb5ykav322xjm1fqmgb1369k2fgkl44" }, "stable": { "version": [ @@ -93980,11 +94656,11 @@ "repo": "twlz0ne/with-emacs.el", "unstable": { "version": [ - 20190623, - 302 + 20190820, + 1326 ], - "commit": "0766fb87668bb92ef95a9ecab5180c2933ac0743", - "sha256": "0nzb4fswxfqzscsg0gbhfrfy9z0y9fn7cl78zh6wdmmnfsdbl314" + "commit": "b398e54bcce2fc023b0c0b6fa1ba6686192d8b9b", + "sha256": "0hdz7adag2m97h07j3llzdnwwg2dp6n2q46hx7klp3khdlgrh2z1" } }, { @@ -95137,25 +95813,25 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20190602, - 1201 + 20190816, + 941 ], "deps": [ "cl-lib" ], - "commit": "ff64312ad412c8b3e87a059139f288205d221e15", - "sha256": "1hl2n0mlnskz0f43dz41h11dkyw1pn3x9sq61w0qzjkkbbyz5cqk" + "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668", + "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "a452ab38a7cfae97078062ff8885b5d74fd1e5a6", - "sha256": "02kpajb993yshhjhsizpfcbrcndyzkf4dqfipifhxxng50dhp95i" + "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668", + "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm" } }, { @@ -95455,11 +96131,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20190617, - 1004 + 20190824, + 1946 ], - "commit": "f443ccb94579dcf28ac50ba4053fa7649e079665", - "sha256": "08khi9mp35pp5niz212vpm0yab577m9a23wl7gsymcfcif0drbza" + "commit": "c364607804e943b301ded8a30d7e19dda217568a", + "sha256": "0sqcli05kyafn2x9sd92az3hqc010pypr0dw31mv0vslg0rfkn8m" }, "stable": { "version": [ @@ -95652,25 +96328,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20190725, - 1049 + 20190821, + 901 ], "deps": [ "yasnippet" ], - "commit": "f5dbb814767ac4e6398144b6d372f2effcc9c4a1", - "sha256": "1gj5y4c8fxq578x3d0n3yhkwaab6lvsgvmqi1g65ynm5xdlxvm5w" + "commit": "71ae4a665f0db13165f14687cf5828d4510ef557", + "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "yasnippet" ], - "commit": "7e94b9e948e16b3b1778aacb05c65e75d81fc188", - "sha256": "0pdfdyxl440ngx77j2b9zymh50r9pqzway2maad64ijaz9l2g2bm" + "commit": "71ae4a665f0db13165f14687cf5828d4510ef557", + "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8" } }, { From d9076f6503540dfbc8201777ffc41aa9ca83facf Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 30 Aug 2019 17:18:40 -0400 Subject: [PATCH 270/283] sgtpuzzles: 20180429.31384ca -> 20190415.e2135d5 --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index ce8d38ca5d1..428be470b3e 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sgt-puzzles-r${version}"; - version = "20180429.31384ca"; + version = "20190415.e2135d5"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0r97kyy0rxgzw78lby2kwi8fg1yimw8a3biy5psgd983d0nwcf9l"; + sha256 = "02p9kpvmqa0cm9y0lzdy7g8h4b4mqma8d9jfvgi2yysbgjfzq2ak"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; From 80a3988150200da2839716dde04f728562930dec Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 19 Feb 2019 19:38:32 +0100 Subject: [PATCH 271/283] remove empty nix file Nix repl hangs when evaluating empty files. find -name "*.nix" -empty -delete --- pkgs/development/interpreters/lua-5/build-rocks.nix | 0 pkgs/development/interpreters/lua-5/build-rockspec.nix | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pkgs/development/interpreters/lua-5/build-rocks.nix delete mode 100644 pkgs/development/interpreters/lua-5/build-rockspec.nix diff --git a/pkgs/development/interpreters/lua-5/build-rocks.nix b/pkgs/development/interpreters/lua-5/build-rocks.nix deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/pkgs/development/interpreters/lua-5/build-rockspec.nix b/pkgs/development/interpreters/lua-5/build-rockspec.nix deleted file mode 100644 index e69de29bb2d..00000000000 From 0d220e4ed62355e8c2598f9e7b3e5a8e8eba43c2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 26 Aug 2019 15:52:19 -0400 Subject: [PATCH 272/283] nixos/fontconfig-penultimate: disable by default It currently lacks an emoji font-family which means it has to be disabled for them to function [0]. Additionally it's fallen out of necessity to ship custom font rendering settings (as far as I'm aware of). [0]: https://github.com/NixOS/nixpkgs/pull/67215 --- nixos/doc/manual/release-notes/rl-1909.xml | 6 ++++++ nixos/modules/config/fonts/fontconfig-penultimate.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index a211a8dfb86..560b3198517 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -585,6 +585,12 @@ features. + + + We no longer enable custom font rendering settings with by default. + The defaults from fontconfig are sufficient. + + diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 24ed9c97668..7100f10dcfc 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -269,7 +269,7 @@ in penultimate = { enable = mkOption { type = types.bool; - default = true; + default = false; description = '' Enable fontconfig-penultimate settings to supplement the NixOS defaults by providing per-font rendering defaults and From aaad52ba7af22bc4771c54b740f31e5b424aff46 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Fri, 30 Aug 2019 21:18:27 -0400 Subject: [PATCH 273/283] olive-editor: 0.1.0 -> 0.1.1 Commit updated according to #65399 --- pkgs/applications/video/olive-editor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 15db28b05e4..efa06f4794e 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, +{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, qtbase, qtmultimedia, frei0r, opencolorio, hicolor-icon-theme, ffmpeg-full, CoreFoundation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "olive-editor"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "olive-editor"; repo = "olive"; rev = version; - sha256 = "191nk4c35gys4iypykcidn6h27c3sbjfy117q7h9h1qilz2wm94z"; + sha256 = "15q4qwf5rc3adssywl72jrhkpqk55ihpd5h5wf07baw0s47vv5kq"; }; nativeBuildInputs = [ From bd1e4424e51ec3240933377f0746c4e9d10e856e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 31 Aug 2019 01:39:25 +0200 Subject: [PATCH 274/283] monero-gui: cleanup for qt wrappers --- .../blockchains/monero-gui/default.nix | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index aaff39f1c6b..92f6f008021 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub -, wrapQtAppsHook, makeDesktopItem +{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative , qtlocation, qtquickcontrols, qtquickcontrols2 @@ -9,22 +8,10 @@ , hidapi }: -with stdenv.lib; +with lib; -let - qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; - - qml2ImportPath = concatMapStringsSep ":" qmlPath [ - qtbase.bin qtmultimedia.bin qtgraphicaleffects - qtdeclarative.bin qtlocation.bin - qtquickcontrols qtquickcontrols2.bin - qtwebchannel.bin qtwebengine.bin qtxmlpatterns - ]; - -in - -stdenv.mkDerivation rec { - name = "monero-gui-${version}"; +mkDerivation rec { + pname = "monero-gui"; version = "0.14.1.2"; src = fetchFromGitHub { @@ -34,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects @@ -46,9 +33,7 @@ stdenv.mkDerivation rec { cppzmq hidapi ]; - patches = [ - ./move-log-file.patch - ]; + patches = [ ./move-log-file.patch ]; postPatch = '' echo ' From 60216e84720c68745b0665a4747a6f9695563984 Mon Sep 17 00:00:00 2001 From: averelld Date: Sat, 31 Aug 2019 06:06:40 +0200 Subject: [PATCH 275/283] hexchat: 2.12.4 -> 2.14.2 (#67714) --- .../networking/irc/hexchat/default.nix | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 34c4fcf0c88..815b74f85c9 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,43 +1,52 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 -, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, libsexy, enchant1, libnotify, openssl, intltool +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +, pciutils, dbus-glib, libcanberra-gtk2, libproxy +, libsexy, enchant2, libnotify, openssl, isocodes , desktop-file-utils, hicolor-icon-theme -, autoconf, automake, autoconf-archive +, meson, ninja }: stdenv.mkDerivation rec { - version = "2.12.4"; - name = "hexchat-${version}"; + version = "2.14.2"; + pname = "hexchat"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "1z8v7jg1mc2277k3jihnq4rixw1q27305aw6b6rpb1x7vpiy2zr3"; + sha256 = "1kz81xfis0bw2cfd6ndw32jdzdl5azk9ixqj4a3lginmlj6fs45a"; }; - nativeBuildInputs = [ - pkgconfig libtool intltool - autoconf autoconf-archive automake - ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy + gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy libsexy libnotify openssl desktop-file-utils hicolor-icon-theme + isocodes ]; - enableParallelBuilding = true; + patches = [ + #https://github.com/hexchat/hexchat/issues/2237 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hexchat/raw/8a08a0c8a8da503b18f2fbb15194c5f3728a689a/f/0001-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch"; + sha256 = "1199dj3wvjqj6h5vlm7lzhaax84j9ki6an8y8fs4rww27iq0lk8g"; + }) + ]; - #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path - patchPhase = '' - sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c + #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path + postPatch = '' + sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c + sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build + chmod +x meson_post_install.py + for f in meson_post_install.py \ + src/common/make-te.py \ + plugins/perl/generate_header.py \ + po/validate-textevent-translations + do + patchShebangs $f + done ''; - preConfigure = '' - ./autogen.sh - ''; - - configureFlags = [ "--enable-shm" "--enable-textfe" ]; + mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; meta = with stdenv.lib; { description = "A popular and easy to use graphical IRC (chat) client"; From 5a581c420c33f1188484f9d45d1cba6e97ae1d45 Mon Sep 17 00:00:00 2001 From: averelld Date: Sat, 31 Aug 2019 06:19:16 +0200 Subject: [PATCH 276/283] python.pkgs.handout: init at 1.0.0 (#66263) --- .../python-modules/handout/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/handout/default.nix diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix new file mode 100644 index 00000000000..9a398080609 --- /dev/null +++ b/pkgs/development/python-modules/handout/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, imageio, imageio-ffmpeg }: + +buildPythonPackage rec { + pname = "handout"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16y1wqx8j4kf6fa94x22njrkdfb2cfi0dvc7a4q2qsa8m3ri0b43"; + }; + + propagatedBuildInputs = [ imageio imageio-ffmpeg ]; + + meta = with stdenv.lib; { + description = "Turn Python scripts into handouts with Markdown and figures"; + homepage = "https://github.com/danijar/handout"; + license = licenses.gpl3; + maintainers = with maintainers; [ averelld ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdaae932f68..9099552add2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -645,6 +645,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + handout = callPackage ../development/python-modules/handout { }; + helper = callPackage ../development/python-modules/helper { }; histbook = callPackage ../development/python-modules/histbook { }; From d7c7fc460300e30cbb105bf2e0d9021f368be492 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 31 Aug 2019 06:30:50 +0200 Subject: [PATCH 277/283] nixos/tests/systemd: Fix x-initrd-mount flakiness (#67798) It turns out that checking for the last mount time of an ext4 file system isn't a very reliable way to check whether the file system was properly unmounted. When creating that test in the first place (88530e02b6fa9b5429dc09972b), I was reluctant to inspect the file system when the VM is down and was searching for a way to check for a clean unmount *after* the file system was mounted again to make sure we don't need to create a 512 MB raw image on the host. Fortunately however, when converting from qcow2, qemu-img actually writes a sparse file, so for most file systems (that is, file systems supporting sparse files) this shouldn't waste a lot of disk space. So when investigating the flakiness, I found that whenever the test is failing, the unmount of /test-x-initrd-mount was done *before* the final step during which systemd remounts+unmounts all the remaining file systems. I haven't investigated why this is the case, but the test is a regression test for https://github.com/NixOS/nixpkgs/issues/35268, which actually didn't unmount the file system *at* *all*, so really all we need to take care here is whether the unmount has happened and not *how*. To make sure that checking the filesystem state is enough for this, I temporarily replaced the $machine->shutdown call with $machine->crash and verified that the file system state is "not clean". Signed-off-by: aszlig Fixes: https://github.com/NixOS/nixpkgs/issues/67555 --- nixos/tests/systemd.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 1c201e3b5dc..4b71b4d6759 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -71,11 +71,13 @@ import ./make-test.nix ({ pkgs, ... }: { # Regression test for https://github.com/NixOS/nixpkgs/issues/35268 subtest "file system with x-initrd.mount is not unmounted", sub { + $machine->succeed('mountpoint -q /test-x-initrd-mount'); $machine->shutdown; - $machine->waitForUnit('multi-user.target'); - # If the file system was unmounted during the shutdown the file system - # has a last mount time, because the file system wasn't checked. - $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"'); + system('qemu-img', 'convert', '-O', 'raw', + 'vm-state-machine/empty2.qcow2', 'x-initrd-mount.raw'); + my $extinfo = `${pkgs.e2fsprogs}/bin/dumpe2fs x-initrd-mount.raw`; + die "File system was not cleanly unmounted: $extinfo" + unless $extinfo =~ /^Filesystem state: *clean$/m; }; subtest "systemd-shutdown works", sub { From 1bf70fd2f178647d40784e6c6fce8431b3b5f0d8 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sat, 31 Aug 2019 06:35:33 +0200 Subject: [PATCH 278/283] bazel: cctools runtime dependency on darwin (#66724) The bazel build patches paths like `/usr/bin/install_name_tool` to refer to `${cctools}/bin/install_name_tool` instead. If the corresponding runtime dependency is not denoted, then darwin users can encounter "file not found" errors, e.g. when they fetch bazel from a binary cache and don't have `cctools` in their own nix store. --- pkgs/development/tools/build-managers/bazel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1007f4df8ca..7e6b584f966 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -511,6 +511,8 @@ stdenv.mkDerivation rec { # The templates get tar’d up into a .jar, # so nix can’t detect python is needed in the runtime closure echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends ''; dontStrip = true; From b79f6f68a7d9c8476da46b497643d9053881d968 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Fri, 30 Aug 2019 23:30:22 -0600 Subject: [PATCH 279/283] neofetch: 6.0.0 -> 6.1.0 --- pkgs/tools/misc/neofetch/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 18ae88547a0..5850c4a90af 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "neofetch-${version}"; - version = "6.0.0"; + pname = "neofetch"; + version = "6.1.0"; + src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0j0r40llyry1sgc6p9wd7jrpydps2lnj4rwajjp37697g2bik89i"; + sha256 = "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"; }; dontBuild = true; - makeFlags = [ - "PREFIX=$(out)" - "SYSCONFDIR=$(out)/etc" + "PREFIX=${placeholder "out"}" + "SYSCONFDIR=${placeholder "out"}/etc" ]; meta = with stdenv.lib; { From d33df05f5073f370da22c737c84fc6a44a89a02e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 24 Aug 2019 07:02:11 +0000 Subject: [PATCH 280/283] ocamlPackages.domain-name: init at 0.3.0 --- .../ocaml-modules/domain-name/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/domain-name/default.nix diff --git a/pkgs/development/ocaml-modules/domain-name/default.nix b/pkgs/development/ocaml-modules/domain-name/default.nix new file mode 100644 index 00000000000..cb0105ff46f --- /dev/null +++ b/pkgs/development/ocaml-modules/domain-name/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchurl +, alcotest +, astring, fmt +}: + +buildDunePackage rec { + pname = "domain-name"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-v${version}.tbz"; + sha256 = "12kc9p2a2fi1ipc2hyhbzivxpph3npglxwdgvhd6v20rqqdyvnad"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ alcotest ]; + + propagatedBuildInputs = [ astring fmt ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/hannesm/domain-name"; + description = "RFC 1035 Internet domain names"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7eabfccf85f..72ca022adc6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -215,6 +215,8 @@ let dolog = callPackage ../development/ocaml-modules/dolog { }; + domain-name = callPackage ../development/ocaml-modules/domain-name { }; + dtoa = callPackage ../development/ocaml-modules/dtoa { }; dune = callPackage ../development/tools/ocaml/dune { }; From e9edc7537a86fb1ab7b4c9637b414ed2ea70b8a4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 24 Aug 2019 07:02:17 +0000 Subject: [PATCH 281/283] ocamlPackages.gmap: init at 0.3.0 --- .../ocaml-modules/gmap/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/gmap/default.nix diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix new file mode 100644 index 00000000000..2585dfcaa96 --- /dev/null +++ b/pkgs/development/ocaml-modules/gmap/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fetchurl, alcotest }: + +buildDunePackage rec { + pname = "gmap"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz"; + sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ alcotest ]; + + doCheck = true; + + meta = { + description = "Heterogenous maps over a GADT"; + homepage = "https://github.com/hannesm/gmap"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 72ca022adc6..64e2effa724 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -273,6 +273,8 @@ let gen = callPackage ../development/ocaml-modules/gen { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; higlo = callPackage ../development/ocaml-modules/higlo { }; From 10ffd51a96dc2f341f2aaf93b564dca7e8a2d555 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 24 Aug 2019 07:02:21 +0000 Subject: [PATCH 282/283] ocamlPackages.bigarray-compat: init at 1.0.0 --- .../ocaml-modules/bigarray-compat/default.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bigarray-compat/default.nix diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix new file mode 100644 index 00000000000..6d833b48f26 --- /dev/null +++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "bigarray-compat"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = pname; + rev = "v${version}"; + sha256 = "06j1dwlpisxshdd0nab4n4x266gg1s1n8na16lpgw3fvcznwnimz"; + }; + + meta = { + description = "Compatibility library to use Stdlib.Bigarray when possible"; + inherit (src.meta) homepage; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 64e2effa724..8f7f76a3e25 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -61,6 +61,8 @@ let batteries = callPackage ../development/ocaml-modules/batteries { }; + bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; + bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; bistro = callPackage ../development/ocaml-modules/bistro { }; From 81760f32353fa7f309a49fda17d90f43ac1e9a42 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 24 Aug 2019 07:02:26 +0000 Subject: [PATCH 283/283] ocamlPackages.cstruct: 3.1.1 -> 4.0.0 ocamlPackages.cstruct-sexp: init at 4.0.0 ocamlPackages.x509: 0.6.1 -> 0.7.1 ocamlPackages.tls: 0.9.0 -> 0.10.4 jackline: 2018-05-11 -> 2019-08-08 --- .../instant-messengers/jackline/default.nix | 6 ++-- .../ocaml-modules/cstruct/default.nix | 14 ++++----- .../development/ocaml-modules/cstruct/ppx.nix | 6 ++-- .../ocaml-modules/cstruct/sexp.nix | 16 ++++++++++ .../ocaml-modules/cstruct/unix.nix | 2 +- .../development/ocaml-modules/git/default.nix | 4 +-- .../ocaml-modules/nocrypto/default.nix | 12 ++++++-- .../development/ocaml-modules/tls/default.nix | 15 +++++----- .../ocaml-modules/x509/default.nix | 29 ++++++++----------- pkgs/top-level/ocaml-packages.nix | 2 ++ 10 files changed, 63 insertions(+), 43 deletions(-) create mode 100644 pkgs/development/ocaml-modules/cstruct/sexp.nix diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 689445d7dcb..e9a2b9edec3 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,14 +3,14 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2018-05-11"; + version = "2019-08-08"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "bc36b1c8b80fee6baba4f91011cd01b82a06e8eb"; - sha256 = "1xx2yx8a95m84sa1bkxi3rlx7pd39zkqwk3znj0zzz3cni6apfrz"; + rev = "b934594010a563ded9c0f436e3fab8f1cae29856"; + sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc"; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 37c7f660ca6..01a32fc09a2 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, buildDunePackage, sexplib, ocplib-endian }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "cstruct"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; + url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; + sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a"; }; - propagatedBuildInputs = [ sexplib ocplib-endian ]; - meta = { description = "Access C-like structures directly from OCaml"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://github.com/mirage/ocaml-cstruct"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index 78600b78306..b5c39533e73 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, ppx_tools_versioned }: +{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct @@ -8,8 +8,8 @@ buildDunePackage { pname = "ppx_cstruct"; inherit (cstruct) version src meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.03"; - buildInputs = [ ppx_tools_versioned ]; + buildInputs = [ sexplib ppx_tools_versioned ]; propagatedBuildInputs = [ cstruct ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix new file mode 100644 index 00000000000..9a1ef0dd301 --- /dev/null +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, alcotest, cstruct, sexplib }: + +if !lib.versionAtLeast (cstruct.version or "1") "3" +then cstruct +else + +buildDunePackage { + pname = "cstruct-sexp"; + inherit (cstruct) version src meta; + + doCheck = true; + buildInputs = [ alcotest ]; + + propagatedBuildInputs = [ cstruct sexplib ]; +} + diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index 604ad4fb083..7cb5d665869 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "cstruct-unix"; inherit (cstruct) version src meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.06"; propagatedBuildInputs = [ cstruct ]; } diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 944195fd0a3..35f8f5d52e9 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildDunePackage -, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri +, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri , alcotest, mtime, nocrypto }: @@ -15,7 +15,7 @@ buildDunePackage rec { }; buildInputs = [ alcotest mtime nocrypto ]; - propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; + propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 813b4d7f7a4..9108fd248c0 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg -, cpuid, ocb-stubblr +, cpuid, ocb-stubblr, sexplib , cstruct, zarith, ppx_sexp_conv , cstruct-lwt ? null }: @@ -33,10 +33,18 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch"; sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9"; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch"; + sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch"; + sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z"; + }) ]; buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ]; - propagatedBuildInputs = [ cstruct ppx_sexp_conv zarith ] ++ optional withLwt cstruct-lwt; + propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 181946802d7..2a29179f4cd 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit +, ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: with stdenv.lib; @@ -11,23 +11,24 @@ then throw "tls is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "0.9.0"; + version = "0.10.4"; name = "ocaml${ocaml.version}-tls-${version}"; src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-tls"; rev = "${version}"; - sha256 = "0qgw8lq8pk9hss7b5i6fr08pi711i0zqx7yyjgcil47ipjig6c31"; + sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ounit ppx_cstruct cstruct-unix ]; - propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ + buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_cstruct ] + ++ optionals doCheck [ ounit cstruct-unix ]; + propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++ optional withLwt lwt; - buildPhase = "${topkg.run} build --tests true --with-mirage false --with-lwt ${if withLwt then "true" else "false"}"; + buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}"; - doCheck = true; + doCheck = versionAtLeast ocaml.version "4.06"; checkPhase = "${topkg.run} test"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 8d4bd4c82b3..63ddc6e67bd 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,28 +1,23 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg -, asn1-combinators, astring, nocrypto, ppx_sexp_conv -, ounit, cstruct-unix +{ lib, fetchurl, buildDunePackage, ocaml +, alcotest, cstruct-unix +, asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-x509-${version}"; - version = "0.6.1"; +buildDunePackage rec { + pname = "x509"; + version = "0.7.1"; src = fetchurl { - url = "https://github.com/mirleft/ocaml-x509/releases/download/${version}/x509-${version}.tbz"; - sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; + url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; + sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; + buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ]; - buildPhase = "${topkg.run} build --tests true"; + doCheck = lib.versionAtLeast ocaml.version "4.06"; - doCheck = true; - checkPhase = "${topkg.run} test"; - - inherit (topkg) installPhase; - - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; license = licenses.bsd2; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8f7f76a3e25..9dbc36e8601 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -188,6 +188,8 @@ let lwt = ocaml_lwt; }; + cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {}; + cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {}; csv =