diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 026117cc34f..36afdae3866 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -84,7 +84,7 @@ rec {
else final.parsed.cpu.name;
qemuArch =
- if final.isArm then "arm"
+ if final.isAarch32 then "arm"
else if final.isx86_64 then "x86_64"
else if final.isx86 then "i386"
else {
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index d1980c6dff8..01dcf0787df 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -55,9 +55,6 @@ rec {
isEfi = map (family: { cpu.family = family; })
[ "x86" "arm" "aarch64" ];
-
- # Deprecated after 18.03
- isArm = isAarch32;
};
matchAnyAttrs = patterns:
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8a806baf984..4bb59d9c49e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -682,6 +682,12 @@
githubId = 192147;
name = "aszlig";
};
+ atemu = {
+ name = "Atemu";
+ email = "atemu.main+nixpkgs@gmail.com";
+ github = "Atemu";
+ githubId = 18599032;
+ };
athas = {
email = "athas@sigkill.dk";
github = "athas";
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 8d3f35b7c26..92864cf2557 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -120,12 +120,17 @@ nixos https://nixos.org/channels/nixos-unstable
to configuration.nix:
= true;
+ = true;
This enables a periodically executed systemd service named
- nixos-upgrade.service. It runs nixos-rebuild
- switch --upgrade to upgrade NixOS to the latest version in the
- current channel. (To see when the service runs, see systemctl
- list-timers.) You can also specify a channel explicitly, e.g.
+ nixos-upgrade.service. If the allowReboot
+ option is false, it runs nixos-rebuild switch
+ --upgrade to upgrade NixOS to the latest version in the current
+ channel. (To see when the service runs, see systemctl list-timers.)
+ If allowReboot is true, then the
+ system will automatically reboot if the new generation contains a different
+ kernel, initrd or kernel modules.
+ You can also specify a channel explicitly, e.g.
= https://nixos.org/channels/nixos-19.09;
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 75f80df53f2..2b8dffec7d5 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -1,13 +1,17 @@
#! /somewhere/python3
from contextlib import contextmanager, _GeneratorContextManager
+from queue import Queue, Empty
+from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
from xml.sax.saxutils import XMLGenerator
import _thread
import atexit
+import base64
import os
+import pathlib
import ptpython.repl
import pty
-from queue import Queue, Empty
import re
+import shlex
import shutil
import socket
import subprocess
@@ -15,9 +19,6 @@ import sys
import tempfile
import time
import unicodedata
-from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
-import shlex
-import pathlib
CHAR_TO_KEY = {
"A": "shift-a",
@@ -566,6 +567,41 @@ class Machine:
if ret.returncode != 0:
raise Exception("Cannot convert screenshot")
+ def copy_from_host_via_shell(self, source: str, target: str) -> None:
+ """Copy a file from the host into the guest by piping it over the
+ shell into the destination file. Works without host-guest shared folder.
+ Prefer copy_from_host for whenever possible.
+ """
+ with open(source, "rb") as fh:
+ content_b64 = base64.b64encode(fh.read()).decode()
+ self.succeed(
+ f"mkdir -p $(dirname {target})",
+ f"echo -n {content_b64} | base64 -d > {target}",
+ )
+
+ def copy_from_host(self, source: str, target: str) -> None:
+ """Copy a file from the host into the guest via the `shared_dir` shared
+ among all the VMs (using a temporary directory).
+ """
+ host_src = pathlib.Path(source)
+ vm_target = pathlib.Path(target)
+ with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:
+ shared_temp = pathlib.Path(shared_td)
+ host_intermediate = shared_temp / host_src.name
+ vm_shared_temp = pathlib.Path("/tmp/shared") / shared_temp.name
+ vm_intermediate = vm_shared_temp / host_src.name
+
+ self.succeed(make_command(["mkdir", "-p", vm_shared_temp]))
+ if host_src.is_dir():
+ shutil.copytree(host_src, host_intermediate)
+ else:
+ shutil.copy(host_src, host_intermediate)
+ self.succeed("sync")
+ self.succeed(make_command(["mkdir", "-p", vm_target.parent]))
+ self.succeed(make_command(["cp", "-r", vm_intermediate, vm_target]))
+ # Make sure the cleanup is synced into VM
+ self.succeed("sync")
+
def copy_from_vm(self, source: str, target_dir: str = "") -> None:
"""Copy a file from the VM (specified by an in-VM source path) to a path
relative to `$out`. The file is copied via the `shared_dir` shared among
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 048bbb30c73..408d0a9c33f 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -248,6 +248,9 @@ in {
security.rtkit.enable = true;
systemd.packages = [ overriddenPackage ];
+
+ # PulseAudio is packaged with udev rules to handle various audio device quirks
+ services.udev.packages = [ overriddenPackage ];
})
(mkIf (cfg.extraModules != []) {
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 980961225c9..7785861a730 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -151,7 +151,7 @@ let
publicKey = mkOption {
example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
type = types.str;
- description = "The base64 public key the peer.";
+ description = "The base64 public key of the peer.";
};
presharedKey = mkOption {
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 1efd0739376..821886e5fda 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -141,9 +141,11 @@ let
'';
dmDefault = cfg.desktopManager.default;
+ # fallback default for cases when only default wm is set
+ dmFallbackDefault = if dmDefault != null then dmDefault else "none";
wmDefault = cfg.windowManager.default;
- defaultSessionFromLegacyOptions = concatStringsSep "+" (filter (s: s != null) ([ dmDefault ] ++ optional (wmDefault != "none") wmDefault));
+ defaultSessionFromLegacyOptions = dmFallbackDefault + optionalString (wmDefault != null && wmDefault != "none") "+${wmDefault}";
in
@@ -358,7 +360,7 @@ in
{ c = wmDefault; t = "- services.xserver.windowManager.default"; }
]))}
Please use
- services.xserver.displayManager.defaultSession = "${concatStringsSep "+" (filter (s: s != null) [ dmDefault wmDefault ])}";
+ services.xserver.displayManager.defaultSession = "${defaultSessionFromLegacyOptions}";
instead.
''
];
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 688c77cb22d..965a1c9eb1a 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -304,6 +304,10 @@ in
in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems));
+ systemd.tmpfiles.rules = [
+ "Z /run/keys 0750 root ${toString config.ids.gids.keys}"
+ ];
+
# Sync mount options with systemd's src/core/mount-setup.c: mount_table.
boot.specialFileSystems = {
"/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; };
@@ -312,8 +316,8 @@ in
"/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; };
"/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "ptmxmode=0666" "gid=${toString config.ids.gids.tty}" ]; };
- # To hold secrets that shouldn't be written to disk (generally used for NixOps, harmless elsewhere)
- "/run/keys" = { fsType = "ramfs"; options = [ "nosuid" "nodev" "mode=750" "gid=${toString config.ids.gids.keys}" ]; };
+ # To hold secrets that shouldn't be written to disk
+ "/run/keys" = { fsType = "ramfs"; options = [ "nosuid" "nodev" "mode=750" ]; };
} // optionalAttrs (!config.boot.isContainer) {
# systemd-nspawn populates /sys by itself, and remounting it causes all
# kinds of weird issues (most noticeably, waiting for host disk device
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e1c299b8413..bdac56169fd 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -308,6 +308,7 @@ in
xss-lock = handleTest ./xss-lock.nix {};
yabar = handleTest ./yabar.nix {};
yggdrasil = handleTest ./yggdrasil.nix {};
+ zfs = handleTest ./zfs.nix {};
zsh-history = handleTest ./zsh-history.nix {};
zookeeper = handleTest ./zookeeper.nix {};
}
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 024445b01b6..983861911e0 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -3,7 +3,7 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
@@ -67,161 +67,193 @@ let
, grubIdentifier, preBootCommands, extraConfig
, testCloneConfig
}:
- let
- iface = if grubVersion == 1 then "ide" else "virtio";
- isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
-
- # FIXME don't duplicate the -enable-kvm etc. flags here yet again!
- qemuFlags =
- (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
- (optionalString (system == "x86_64-linux") "-cpu host ") +
- (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host ");
-
- hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''
- + optionalString isEfi (if pkgs.stdenv.isAarch64
- then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
- else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
+ let iface = if grubVersion == 1 then "ide" else "virtio";
+ isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
+ bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd";
in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
throw "Non-EFI boot methods are only supported on i686 / x86_64"
else ''
+ def assemble_qemu_flags():
+ flags = "-cpu host"
+ ${if system == "x86_64-linux"
+ then ''flags += " -m 768"''
+ else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
+ }
+ return flags
- $machine->start;
- # Make sure that we get a login prompt etc.
- $machine->succeed("echo hello");
- #$machine->waitForUnit('getty@tty2');
- #$machine->waitForUnit("rogue");
- $machine->waitForUnit("nixos-manual");
+ qemu_flags = {"qemuFlags": assemble_qemu_flags()}
- # Wait for hard disks to appear in /dev
- $machine->succeed("udevadm settle");
+ hd_flags = {
+ "hdaInterface": "${iface}",
+ "hda": "vm-state-machine/machine.qcow2",
+ }
+ ${optionalString isEfi ''
+ hd_flags.update(
+ bios="${pkgs.OVMF.fd}/FV/${bios}"
+ )''
+ }
+ default_flags = {**hd_flags, **qemu_flags}
+
+
+ def create_machine_named(name):
+ return create_machine({**default_flags, "name": "boot-after-install"})
+
+
+ machine.start()
+
+ with subtest("Assert readiness of login prompt"):
+ machine.succeed("echo hello")
+ machine.wait_for_unit("nixos-manual")
+
+ with subtest("Wait for hard disks to appear in /dev"):
+ machine.succeed("udevadm settle")
- # Partition the disk.
${createPartitions}
- # Create the NixOS configuration.
- $machine->succeed("nixos-generate-config --root /mnt");
+ with subtest("Create the NixOS configuration"):
+ machine.succeed("nixos-generate-config --root /mnt")
+ machine.succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2")
+ machine.copy_from_host(
+ "${ makeConfig {
+ inherit bootLoader grubVersion grubDevice grubIdentifier
+ grubUseEfi extraConfig;
+ }
+ }",
+ "/mnt/etc/nixos/configuration.nix",
+ )
- $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
+ with subtest("Perform the installation"):
+ machine.succeed("nixos-install < /dev/null >&2")
- $machine->copyFileFromHost(
- "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; } }",
- "/mnt/etc/nixos/configuration.nix");
+ with subtest("Do it again to make sure it's idempotent"):
+ machine.succeed("nixos-install < /dev/null >&2")
- # Perform the installation.
- $machine->succeed("nixos-install < /dev/null >&2");
-
- # Do it again to make sure it's idempotent.
- $machine->succeed("nixos-install < /dev/null >&2");
-
- $machine->succeed("umount /mnt/boot || true");
- $machine->succeed("umount /mnt");
- $machine->succeed("sync");
-
- $machine->shutdown;
+ with subtest("Shutdown system after installation"):
+ machine.succeed("umount /mnt/boot || true")
+ machine.succeed("umount /mnt")
+ machine.succeed("sync")
+ machine.shutdown()
# Now see if we can boot the installation.
- $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "boot-after-install" });
+ machine = create_machine_named("boot-after-install")
# For example to enter LUKS passphrase.
${preBootCommands}
- # Did /boot get mounted?
- $machine->waitForUnit("local-fs.target");
+ with subtest("Assert that /boot get mounted"):
+ machine.wait_for_unit("local-fs.target")
+ ${if bootLoader == "grub"
+ then ''machine.succeed("test -e /boot/grub")''
+ else ''machine.succeed("test -e /boot/loader/loader.conf")''
+ }
- ${if bootLoader == "grub" then
- ''$machine->succeed("test -e /boot/grub");''
- else
- ''$machine->succeed("test -e /boot/loader/loader.conf");''
- }
+ with subtest("Check whether /root has correct permissions"):
+ assert "700" in machine.succeed("stat -c '%a' /root")
- # Check whether /root has correct permissions.
- $machine->succeed("stat -c '%a' /root") =~ /700/ or die;
+ with subtest("Assert swap device got activated"):
+ # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved
+ machine.wait_for_unit("swap.target")
+ machine.succeed("cat /proc/swaps | grep -q /dev")
- # Did the swap device get activated?
- # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved
- $machine->waitForUnit("swap.target");
- $machine->succeed("cat /proc/swaps | grep -q /dev");
+ with subtest("Check that the store is in good shape"):
+ machine.succeed("nix-store --verify --check-contents >&2")
- # Check that the store is in good shape
- $machine->succeed("nix-store --verify --check-contents >&2");
+ with subtest("Check whether the channel works"):
+ machine.succeed("nix-env -iA nixos.procps >&2")
+ assert ".nix-profile" in machine.succeed("type -tP ps | tee /dev/stderr")
- # Check whether the channel works.
- $machine->succeed("nix-env -iA nixos.procps >&2");
- $machine->succeed("type -tP ps | tee /dev/stderr") =~ /.nix-profile/
- or die "nix-env failed";
+ with subtest(
+ "Check that the daemon works, and that non-root users can run builds "
+ "(this will build a new profile generation through the daemon)"
+ ):
+ machine.succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2")
- # Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon)
- $machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2");
+ with subtest("Configure system with writable Nix store on next boot"):
+ # we're not using copy_from_host here because the installer image
+ # doesn't know about the host-guest sharing mechanism.
+ machine.copy_from_host_via_shell(
+ "${ makeConfig {
+ inherit bootLoader grubVersion grubDevice grubIdentifier
+ grubUseEfi extraConfig;
+ forceGrubReinstallCount = 1;
+ }
+ }",
+ "/etc/nixos/configuration.nix",
+ )
- # We need a writable Nix store on next boot.
- $machine->copyFileFromHost(
- "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 1; } }",
- "/etc/nixos/configuration.nix");
+ with subtest("Check whether nixos-rebuild works"):
+ machine.succeed("nixos-rebuild switch >&2")
- # Check whether nixos-rebuild works.
- $machine->succeed("nixos-rebuild switch >&2");
+ with subtest("Test nixos-option"):
+ kernel_modules = machine.succeed("nixos-option boot.initrd.kernelModules")
+ assert "virtio_console" in kernel_modules
+ assert "List of modules" in kernel_modules
+ assert "qemu-guest.nix" in kernel_modules
- # Test nixos-option.
- $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console");
- $machine->succeed("nixos-option boot.initrd.kernelModules | grep 'List of modules'");
- $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix");
-
- $machine->shutdown;
+ machine.shutdown()
# Check whether a writable store build works
- $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "rebuild-switch" });
+ machine = create_machine_named("rebuild-switch")
${preBootCommands}
- $machine->waitForUnit("multi-user.target");
- $machine->copyFileFromHost(
- "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 2; } }",
- "/etc/nixos/configuration.nix");
- $machine->succeed("nixos-rebuild boot >&2");
- $machine->shutdown;
+ machine.wait_for_unit("multi-user.target")
+
+ # we're not using copy_from_host here because the installer image
+ # doesn't know about the host-guest sharing mechanism.
+ machine.copy_from_host_via_shell(
+ "${ makeConfig {
+ inherit bootLoader grubVersion grubDevice grubIdentifier
+ grubUseEfi extraConfig;
+ forceGrubReinstallCount = 2;
+ }
+ }",
+ "/etc/nixos/configuration.nix",
+ )
+ machine.succeed("nixos-rebuild boot >&2")
+ machine.shutdown()
# And just to be sure, check that the machine still boots after
# "nixos-rebuild switch".
- $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", "boot-after-rebuild-switch" });
+ machine = create_machine_named("boot-after-rebuild-switch")
${preBootCommands}
- $machine->waitForUnit("network.target");
- $machine->shutdown;
+ machine.wait_for_unit("network.target")
+ machine.shutdown()
# Tests for validating clone configuration entries in grub menu
- ${optionalString testCloneConfig ''
- # Reboot Machine
- $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "clone-default-config" });
- ${preBootCommands}
- $machine->waitForUnit("multi-user.target");
+ ''
+ + optionalString testCloneConfig ''
+ # Reboot Machine
+ machine = create_machine_named("clone-default-config")
+ ${preBootCommands}
+ machine.wait_for_unit("multi-user.target")
- # Booted configuration name should be Home
- # This is not the name that shows in the grub menu.
- # The default configuration is always shown as "Default"
- $machine->succeed("cat /run/booted-system/configuration-name >&2");
- $machine->succeed("cat /run/booted-system/configuration-name | grep Home");
+ with subtest("Booted configuration name should be 'Home'"):
+ # This is not the name that shows in the grub menu.
+ # The default configuration is always shown as "Default"
+ machine.succeed("cat /run/booted-system/configuration-name >&2")
+ assert "Home" in machine.succeed("cat /run/booted-system/configuration-name")
- # We should find **not** a file named /etc/gitconfig
- $machine->fail("test -e /etc/gitconfig");
+ with subtest("We should **not** find a file named /etc/gitconfig"):
+ machine.fail("test -e /etc/gitconfig")
- # Set grub to boot the second configuration
- $machine->succeed("grub-reboot 1");
+ with subtest("Set grub to boot the second configuration"):
+ machine.succeed("grub-reboot 1")
- $machine->shutdown;
+ machine.shutdown()
- # Reboot Machine
- $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "clone-alternate-config" });
- ${preBootCommands}
+ # Reboot Machine
+ machine = create_machine_named("clone-alternate-config")
+ ${preBootCommands}
- $machine->waitForUnit("multi-user.target");
- # Booted configuration name should be Work
- $machine->succeed("cat /run/booted-system/configuration-name >&2");
- $machine->succeed("cat /run/booted-system/configuration-name | grep Work");
+ machine.wait_for_unit("multi-user.target")
+ with subtest("Booted configuration name should be Work"):
+ machine.succeed("cat /run/booted-system/configuration-name >&2")
+ assert "Work" in machine.succeed("cat /run/booted-system/configuration-name")
- # We should find a file named /etc/gitconfig
- $machine->succeed("test -e /etc/gitconfig");
-
- $machine->shutdown;
- ''}
+ with subtest("We should find a file named /etc/gitconfig"):
+ machine.succeed("test -e /etc/gitconfig")
+ machine.shutdown()
'';
@@ -243,63 +275,63 @@ let
nodes = {
# The configuration of the machine used to run "nixos-install".
- machine =
- { pkgs, ... }:
+ machine = { pkgs, ... }: {
+ imports = [
+ ../modules/profiles/installation-device.nix
+ ../modules/profiles/base.nix
+ extraInstallerConfig
+ ];
- { imports =
- [ ../modules/profiles/installation-device.nix
- ../modules/profiles/base.nix
- extraInstallerConfig
- ];
+ virtualisation.diskSize = 8 * 1024;
+ virtualisation.memorySize = 1024;
- virtualisation.diskSize = 8 * 1024;
- virtualisation.memorySize = 1024;
+ # Use a small /dev/vdb as the root disk for the
+ # installer. This ensures the target disk (/dev/vda) is
+ # the same during and after installation.
+ virtualisation.emptyDiskImages = [ 512 ];
+ virtualisation.bootDevice =
+ if grubVersion == 1 then "/dev/sdb" else "/dev/vdb";
+ virtualisation.qemu.diskInterface =
+ if grubVersion == 1 then "scsi" else "virtio";
- # Use a small /dev/vdb as the root disk for the
- # installer. This ensures the target disk (/dev/vda) is
- # the same during and after installation.
- virtualisation.emptyDiskImages = [ 512 ];
- virtualisation.bootDevice =
- if grubVersion == 1 then "/dev/sdb" else "/dev/vdb";
- virtualisation.qemu.diskInterface =
- if grubVersion == 1 then "scsi" else "virtio";
+ boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true;
- boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true;
+ hardware.enableAllFirmware = mkForce false;
- hardware.enableAllFirmware = mkForce false;
+ # The test cannot access the network, so any packages we
+ # need must be included in the VM.
+ system.extraDependencies = with pkgs; [
+ desktop-file-utils
+ docbook5
+ docbook_xsl_ns
+ libxml2.bin
+ libxslt.bin
+ nixos-artwork.wallpapers.simple-dark-gray-bottom
+ ntp
+ perlPackages.ListCompare
+ perlPackages.XMLLibXML
+ shared-mime-info
+ sudo
+ texinfo
+ unionfs-fuse
+ xorg.lndir
- # The test cannot access the network, so any packages we
- # need must be included in the VM.
- system.extraDependencies = with pkgs;
- [ sudo
- libxml2.bin
- libxslt.bin
- desktop-file-utils
- docbook5
- docbook_xsl_ns
- unionfs-fuse
- ntp
- nixos-artwork.wallpapers.simple-dark-gray-bottom
- perlPackages.XMLLibXML
- perlPackages.ListCompare
- shared-mime-info
- texinfo
- xorg.lndir
+ # add curl so that rather than seeing the test attempt to download
+ # curl's tarball, we see what it's trying to download
+ curl
+ ]
+ ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
+ ++ optionals (bootLoader == "grub" && grubVersion == 2) [
+ pkgs.grub2
+ pkgs.grub2_efi
+ ];
- # add curl so that rather than seeing the test attempt to download
- # curl's tarball, we see what it's trying to download
- curl
- ]
- ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
- ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
-
- nix.binaryCaches = mkForce [ ];
- nix.extraOptions =
- ''
- hashed-mirrors =
- connect-timeout = 1
- '';
- };
+ nix.binaryCaches = mkForce [ ];
+ nix.extraOptions = ''
+ hashed-mirrors =
+ connect-timeout = 1
+ '';
+ };
};
@@ -310,13 +342,13 @@ let
};
};
- makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name
- { createPartitions = ''
- $machine->succeed(
+ makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name {
+ createPartitions = ''
+ machine.succeed(
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- . " mkpart primary ext2 1M 50MB" # /boot
- . " mkpart primary linux-swap 50M 1024M"
- . " mkpart primary 1024M -1s", # LUKS
+ + " mkpart primary ext2 1M 50MB" # /boot
+ + " mkpart primary linux-swap 50M 1024M"
+ + " mkpart primary 1024M -1s", # LUKS
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -328,77 +360,74 @@ let
"mkfs.ext3 -L boot /dev/vda1",
"mkdir -p /mnt/boot",
"mount LABEL=boot /mnt/boot",
- );
- '';
- extraConfig = ''
- boot.kernelParams = lib.mkAfter [ "console=tty0" ];
- '';
- enableOCR = true;
- preBootCommands = ''
- $machine->start;
- $machine->waitForText(qr/Passphrase for/);
- $machine->sendChars("supersecret\n");
- '';
- };
+ )
+ '';
+ extraConfig = ''
+ boot.kernelParams = lib.mkAfter [ "console=tty0" ];
+ '';
+ enableOCR = true;
+ preBootCommands = ''
+ machine.start()
+ machine.wait_for_text("Passphrase for")
+ machine.send_chars("supersecret\n")
+ '';
+ };
# The (almost) simplest partitioning scheme: a swap partition and
# one big filesystem partition.
- simple-test-config = { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- . " mkpart primary linux-swap 1M 1024M"
- . " mkpart primary ext2 1024M -1s",
- "udevadm settle",
- "mkswap /dev/vda1 -L swap",
- "swapon -L swap",
- "mkfs.ext3 -L nixos /dev/vda2",
- "mount LABEL=nixos /mnt",
- );
- '';
- };
+ simple-test-config = {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ + " mkpart primary linux-swap 1M 1024M"
+ + " mkpart primary ext2 1024M -1s",
+ "udevadm settle",
+ "mkswap /dev/vda1 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/vda2",
+ "mount LABEL=nixos /mnt",
+ )
+ '';
+ };
- simple-uefi-grub-config =
- { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
- . " mkpart ESP fat32 1M 50MiB" # /boot
- . " set 1 boot on"
- . " mkpart primary linux-swap 50MiB 1024MiB"
- . " mkpart primary ext2 1024MiB -1MiB", # /
- "udevadm settle",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.ext3 -L nixos /dev/vda3",
- "mount LABEL=nixos /mnt",
- "mkfs.vfat -n BOOT /dev/vda1",
- "mkdir -p /mnt/boot",
- "mount LABEL=BOOT /mnt/boot",
- );
- '';
- bootLoader = "grub";
- grubUseEfi = true;
- };
+ simple-uefi-grub-config = {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
+ + " mkpart ESP fat32 1M 50MiB" # /boot
+ + " set 1 boot on"
+ + " mkpart primary linux-swap 50MiB 1024MiB"
+ + " mkpart primary ext2 1024MiB -1MiB", # /
+ "udevadm settle",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/vda3",
+ "mount LABEL=nixos /mnt",
+ "mkfs.vfat -n BOOT /dev/vda1",
+ "mkdir -p /mnt/boot",
+ "mount LABEL=BOOT /mnt/boot",
+ )
+ '';
+ bootLoader = "grub";
+ grubUseEfi = true;
+ };
- clone-test-extraconfig = { extraConfig =
- ''
- environment.systemPackages = [ pkgs.grub2 ];
- boot.loader.grub.configurationName = "Home";
- nesting.clone = [
- {
- boot.loader.grub.configurationName = lib.mkForce "Work";
+ clone-test-extraconfig = {
+ extraConfig = ''
+ environment.systemPackages = [ pkgs.grub2 ];
+ boot.loader.grub.configurationName = "Home";
+ nesting.clone = [ {
+ boot.loader.grub.configurationName = lib.mkForce "Work";
- environment.etc = {
- "gitconfig".text = "
- [core]
- gitproxy = none for work.com
- ";
- };
- }
- ];
- '';
- testCloneConfig = true;
+ environment.etc = {
+ "gitconfig".text = "
+ [core]
+ gitproxy = none for work.com
+ ";
+ };
+ } ];
+ '';
+ testCloneConfig = true;
};
@@ -415,27 +444,26 @@ in {
simpleClone = makeInstallerTest "simpleClone" (simple-test-config // clone-test-extraconfig);
# Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem
- simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot"
- { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
- . " mkpart ESP fat32 1M 50MiB" # /boot
- . " set 1 boot on"
- . " mkpart primary linux-swap 50MiB 1024MiB"
- . " mkpart primary ext2 1024MiB -1MiB", # /
- "udevadm settle",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.ext3 -L nixos /dev/vda3",
- "mount LABEL=nixos /mnt",
- "mkfs.vfat -n BOOT /dev/vda1",
- "mkdir -p /mnt/boot",
- "mount LABEL=BOOT /mnt/boot",
- );
- '';
- bootLoader = "systemd-boot";
- };
+ simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot" {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
+ + " mkpart ESP fat32 1M 50MiB" # /boot
+ + " set 1 boot on"
+ + " mkpart primary linux-swap 50MiB 1024MiB"
+ + " mkpart primary ext2 1024MiB -1MiB", # /
+ "udevadm settle",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/vda3",
+ "mount LABEL=nixos /mnt",
+ "mkfs.vfat -n BOOT /dev/vda1",
+ "mkdir -p /mnt/boot",
+ "mount LABEL=BOOT /mnt/boot",
+ )
+ '';
+ bootLoader = "systemd-boot";
+ };
simpleUefiGrub = makeInstallerTest "simpleUefiGrub" simple-uefi-grub-config;
@@ -443,107 +471,99 @@ in {
simpleUefiGrubClone = makeInstallerTest "simpleUefiGrubClone" (simple-uefi-grub-config // clone-test-extraconfig);
# Same as the previous, but now with a separate /boot partition.
- separateBoot = makeInstallerTest "separateBoot"
- { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- . " mkpart primary ext2 1M 50MB" # /boot
- . " mkpart primary linux-swap 50MB 1024M"
- . " mkpart primary ext2 1024M -1s", # /
- "udevadm settle",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.ext3 -L nixos /dev/vda3",
- "mount LABEL=nixos /mnt",
- "mkfs.ext3 -L boot /dev/vda1",
- "mkdir -p /mnt/boot",
- "mount LABEL=boot /mnt/boot",
- );
- '';
- };
+ separateBoot = makeInstallerTest "separateBoot" {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ + " mkpart primary ext2 1M 50MB" # /boot
+ + " mkpart primary linux-swap 50MB 1024M"
+ + " mkpart primary ext2 1024M -1s", # /
+ "udevadm settle",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/vda3",
+ "mount LABEL=nixos /mnt",
+ "mkfs.ext3 -L boot /dev/vda1",
+ "mkdir -p /mnt/boot",
+ "mount LABEL=boot /mnt/boot",
+ )
+ '';
+ };
# Same as the previous, but with fat32 /boot.
- separateBootFat = makeInstallerTest "separateBootFat"
- { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- . " mkpart primary ext2 1M 50MB" # /boot
- . " mkpart primary linux-swap 50MB 1024M"
- . " mkpart primary ext2 1024M -1s", # /
- "udevadm settle",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.ext3 -L nixos /dev/vda3",
- "mount LABEL=nixos /mnt",
- "mkfs.vfat -n BOOT /dev/vda1",
- "mkdir -p /mnt/boot",
- "mount LABEL=BOOT /mnt/boot",
- );
- '';
- };
+ separateBootFat = makeInstallerTest "separateBootFat" {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ + " mkpart primary ext2 1M 50MB" # /boot
+ + " mkpart primary linux-swap 50MB 1024M"
+ + " mkpart primary ext2 1024M -1s", # /
+ "udevadm settle",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/vda3",
+ "mount LABEL=nixos /mnt",
+ "mkfs.vfat -n BOOT /dev/vda1",
+ "mkdir -p /mnt/boot",
+ "mount LABEL=BOOT /mnt/boot",
+ )
+ '';
+ };
# zfs on / with swap
- zfsroot = makeInstallerTest "zfs-root"
- {
- extraInstallerConfig = {
- boot.supportedFilesystems = [ "zfs" ];
- };
-
- extraConfig = ''
- boot.supportedFilesystems = [ "zfs" ];
-
- # Using by-uuid overrides the default of by-id, and is unique
- # to the qemu disks, as they don't produce by-id paths for
- # some reason.
- boot.zfs.devNodes = "/dev/disk/by-uuid/";
- networking.hostId = "00000000";
- '';
-
- createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- . " mkpart primary linux-swap 1M 1024M"
- . " mkpart primary 1024M -1s",
- "udevadm settle",
-
- "mkswap /dev/vda1 -L swap",
- "swapon -L swap",
-
- "zpool create rpool /dev/vda2",
- "zfs create -o mountpoint=legacy rpool/root",
- "mount -t zfs rpool/root /mnt",
-
- "udevadm settle"
- );
- '';
+ zfsroot = makeInstallerTest "zfs-root" {
+ extraInstallerConfig = {
+ boot.supportedFilesystems = [ "zfs" ];
};
+ extraConfig = ''
+ boot.supportedFilesystems = [ "zfs" ];
+
+ # Using by-uuid overrides the default of by-id, and is unique
+ # to the qemu disks, as they don't produce by-id paths for
+ # some reason.
+ boot.zfs.devNodes = "/dev/disk/by-uuid/";
+ networking.hostId = "00000000";
+ '';
+
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ + " mkpart primary linux-swap 1M 1024M"
+ + " mkpart primary 1024M -1s",
+ "udevadm settle",
+ "mkswap /dev/vda1 -L swap",
+ "swapon -L swap",
+ "zpool create rpool /dev/vda2",
+ "zfs create -o mountpoint=legacy rpool/root",
+ "mount -t zfs rpool/root /mnt",
+ "udevadm settle",
+ )
+ '';
+ };
+
# Create two physical LVM partitions combined into one volume group
# that contains the logical swap and root partitions.
- lvm = makeInstallerTest "lvm"
- { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- . " mkpart primary 1M 2048M" # PV1
- . " set 1 lvm on"
- . " mkpart primary 2048M -1s" # PV2
- . " set 2 lvm on",
- "udevadm settle",
- "pvcreate /dev/vda1 /dev/vda2",
- "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
- "lvcreate --size 1G --name swap MyVolGroup",
- "lvcreate --size 2G --name nixos MyVolGroup",
- "mkswap -f /dev/MyVolGroup/swap -L swap",
- "swapon -L swap",
- "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
- "mount LABEL=nixos /mnt",
- );
- '';
- };
+ lvm = makeInstallerTest "lvm" {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ + " mkpart primary 1M 2048M" # PV1
+ + " set 1 lvm on"
+ + " mkpart primary 2048M -1s" # PV2
+ + " set 2 lvm on",
+ "udevadm settle",
+ "pvcreate /dev/vda1 /dev/vda2",
+ "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
+ "lvcreate --size 1G --name swap MyVolGroup",
+ "lvcreate --size 2G --name nixos MyVolGroup",
+ "mkswap -f /dev/MyVolGroup/swap -L swap",
+ "swapon -L swap",
+ "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
+ "mount LABEL=nixos /mnt",
+ )
+ '';
+ };
# Boot off an encrypted root partition with the default LUKS header format
luksroot = makeLuksRootTest "luksroot-format1" "";
@@ -557,14 +577,14 @@ in {
# Test whether opening encrypted filesystem with keyfile
# Checks for regression of missing cryptsetup, when no luks device without
# keyfile is configured
- encryptedFSWithKeyfile = makeInstallerTest "encryptedFSWithKeyfile"
- { createPartitions = ''
- $machine->succeed(
+ encryptedFSWithKeyfile = makeInstallerTest "encryptedFSWithKeyfile" {
+ createPartitions = ''
+ machine.succeed(
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- . " mkpart primary ext2 1M 50MB" # /boot
- . " mkpart primary linux-swap 50M 1024M"
- . " mkpart primary 1024M 1280M" # LUKS with keyfile
- . " mkpart primary 1280M -1s",
+ + " mkpart primary ext2 1M 50MB" # /boot
+ + " mkpart primary linux-swap 50M 1024M"
+ + " mkpart primary 1024M 1280M" # LUKS with keyfile
+ + " mkpart primary 1280M -1s",
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -579,89 +599,88 @@ in {
"cryptsetup luksOpen --key-file /mnt/keyfile /dev/vda3 crypt",
"mkfs.ext3 -L test /dev/mapper/crypt",
"cryptsetup luksClose crypt",
- "mkdir -p /mnt/test"
- );
- '';
- extraConfig = ''
- fileSystems."/test" =
- { device = "/dev/disk/by-label/test";
- fsType = "ext3";
- encrypted.enable = true;
- encrypted.blkDev = "/dev/vda3";
- encrypted.label = "crypt";
- encrypted.keyFile = "/mnt-root/keyfile";
- };
- '';
- };
+ "mkdir -p /mnt/test",
+ )
+ '';
+ extraConfig = ''
+ fileSystems."/test" = {
+ device = "/dev/disk/by-label/test";
+ fsType = "ext3";
+ encrypted.enable = true;
+ encrypted.blkDev = "/dev/vda3";
+ encrypted.label = "crypt";
+ encrypted.keyFile = "/mnt-root/keyfile";
+ };
+ '';
+ };
-
- swraid = makeInstallerTest "swraid"
- { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/vda parted --script /dev/vda --"
- . " mklabel msdos"
- . " mkpart primary ext2 1M 100MB" # /boot
- . " mkpart extended 100M -1s"
- . " mkpart logical 102M 2102M" # md0 (root), first device
- . " mkpart logical 2103M 4103M" # md0 (root), second device
- . " mkpart logical 4104M 4360M" # md1 (swap), first device
- . " mkpart logical 4361M 4617M", # md1 (swap), second device
- "udevadm settle",
- "ls -l /dev/vda* >&2",
- "cat /proc/partitions >&2",
- "udevadm control --stop-exec-queue",
- "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
- "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
- "udevadm control --start-exec-queue",
- "udevadm settle",
- "mkswap -f /dev/md1 -L swap",
- "swapon -L swap",
- "mkfs.ext3 -L nixos /dev/md0",
- "mount LABEL=nixos /mnt",
- "mkfs.ext3 -L boot /dev/vda1",
- "mkdir /mnt/boot",
- "mount LABEL=boot /mnt/boot",
- "udevadm settle",
- );
- '';
- preBootCommands = ''
- $machine->start;
- $machine->fail("dmesg | grep 'immediate safe mode'");
- '';
- };
+ swraid = makeInstallerTest "swraid" {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/vda parted --script /dev/vda --"
+ + " mklabel msdos"
+ + " mkpart primary ext2 1M 100MB" # /boot
+ + " mkpart extended 100M -1s"
+ + " mkpart logical 102M 2102M" # md0 (root), first device
+ + " mkpart logical 2103M 4103M" # md0 (root), second device
+ + " mkpart logical 4104M 4360M" # md1 (swap), first device
+ + " mkpart logical 4361M 4617M", # md1 (swap), second device
+ "udevadm settle",
+ "ls -l /dev/vda* >&2",
+ "cat /proc/partitions >&2",
+ "udevadm control --stop-exec-queue",
+ "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 "
+ + "--raid-devices=2 /dev/vda5 /dev/vda6",
+ "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 "
+ + "--raid-devices=2 /dev/vda7 /dev/vda8",
+ "udevadm control --start-exec-queue",
+ "udevadm settle",
+ "mkswap -f /dev/md1 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/md0",
+ "mount LABEL=nixos /mnt",
+ "mkfs.ext3 -L boot /dev/vda1",
+ "mkdir /mnt/boot",
+ "mount LABEL=boot /mnt/boot",
+ "udevadm settle",
+ )
+ '';
+ preBootCommands = ''
+ machine.start()
+ machine.fail("dmesg | grep 'immediate safe mode'")
+ '';
+ };
# Test a basic install using GRUB 1.
- grub1 = makeInstallerTest "grub1"
- { createPartitions =
- ''
- $machine->succeed(
- "flock /dev/sda parted --script /dev/sda -- mklabel msdos"
- . " mkpart primary linux-swap 1M 1024M"
- . " mkpart primary ext2 1024M -1s",
- "udevadm settle",
- "mkswap /dev/sda1 -L swap",
- "swapon -L swap",
- "mkfs.ext3 -L nixos /dev/sda2",
- "mount LABEL=nixos /mnt",
- "mkdir -p /mnt/tmp",
- );
- '';
- grubVersion = 1;
- grubDevice = "/dev/sda";
- };
+ grub1 = makeInstallerTest "grub1" {
+ createPartitions = ''
+ machine.succeed(
+ "flock /dev/sda parted --script /dev/sda -- mklabel msdos"
+ + " mkpart primary linux-swap 1M 1024M"
+ + " mkpart primary ext2 1024M -1s",
+ "udevadm settle",
+ "mkswap /dev/sda1 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/sda2",
+ "mount LABEL=nixos /mnt",
+ "mkdir -p /mnt/tmp",
+ )
+ '';
+ grubVersion = 1;
+ grubDevice = "/dev/sda";
+ };
# Test using labels to identify volumes in grub
simpleLabels = makeInstallerTest "simpleLabels" {
createPartitions = ''
- $machine->succeed(
- "sgdisk -Z /dev/vda",
- "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.ext4 -L root /dev/vda3",
- "mount LABEL=root /mnt",
- );
+ machine.succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.ext4 -L root /dev/vda3",
+ "mount LABEL=root /mnt",
+ )
'';
grubIdentifier = "label";
};
@@ -670,22 +689,23 @@ in {
# TODO: Fix udev so the symlinks are unneeded in /dev/disks
simpleProvided = makeInstallerTest "simpleProvided" {
createPartitions = ''
- my $UUID = "\$(blkid -s UUID -o value /dev/vda2)";
- $machine->succeed(
- "sgdisk -Z /dev/vda",
- "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
- "mkswap /dev/vda3 -L swap",
- "swapon -L swap",
- "mkfs.ext4 -L boot /dev/vda2",
- "mkfs.ext4 -L root /dev/vda4",
- );
- $machine->execute("ln -s ../../vda2 /dev/disk/by-uuid/$UUID");
- $machine->execute("ln -s ../../vda4 /dev/disk/by-label/root");
- $machine->succeed(
- "mount /dev/disk/by-label/root /mnt",
- "mkdir /mnt/boot",
- "mount /dev/disk/by-uuid/$UUID /mnt/boot"
- );
+ uuid = "$(blkid -s UUID -o value /dev/vda2)"
+ machine.succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 "
+ + "-t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
+ "mkswap /dev/vda3 -L swap",
+ "swapon -L swap",
+ "mkfs.ext4 -L boot /dev/vda2",
+ "mkfs.ext4 -L root /dev/vda4",
+ )
+ machine.execute(f"ln -s ../../vda2 /dev/disk/by-uuid/{uuid}")
+ machine.execute("ln -s ../../vda4 /dev/disk/by-label/root")
+ machine.succeed(
+ "mount /dev/disk/by-label/root /mnt",
+ "mkdir /mnt/boot",
+ f"mount /dev/disk/by-uuid/{uuid} /mnt/boot",
+ )
'';
grubIdentifier = "provided";
};
@@ -693,61 +713,62 @@ in {
# Simple btrfs grub testing
btrfsSimple = makeInstallerTest "btrfsSimple" {
createPartitions = ''
- $machine->succeed(
- "sgdisk -Z /dev/vda",
- "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.btrfs -L root /dev/vda3",
- "mount LABEL=root /mnt",
- );
+ machine.succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.btrfs -L root /dev/vda3",
+ "mount LABEL=root /mnt",
+ )
'';
};
# Test to see if we can detect /boot and /nix on subvolumes
btrfsSubvols = makeInstallerTest "btrfsSubvols" {
createPartitions = ''
- $machine->succeed(
- "sgdisk -Z /dev/vda",
- "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.btrfs -L root /dev/vda3",
- "btrfs device scan",
- "mount LABEL=root /mnt",
- "btrfs subvol create /mnt/boot",
- "btrfs subvol create /mnt/nixos",
- "btrfs subvol create /mnt/nixos/default",
- "umount /mnt",
- "mount -o defaults,subvol=nixos/default LABEL=root /mnt",
- "mkdir /mnt/boot",
- "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
- );
+ machine.succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.btrfs -L root /dev/vda3",
+ "btrfs device scan",
+ "mount LABEL=root /mnt",
+ "btrfs subvol create /mnt/boot",
+ "btrfs subvol create /mnt/nixos",
+ "btrfs subvol create /mnt/nixos/default",
+ "umount /mnt",
+ "mount -o defaults,subvol=nixos/default LABEL=root /mnt",
+ "mkdir /mnt/boot",
+ "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
+ )
'';
};
# Test to see if we can detect default and aux subvolumes correctly
btrfsSubvolDefault = makeInstallerTest "btrfsSubvolDefault" {
createPartitions = ''
- $machine->succeed(
- "sgdisk -Z /dev/vda",
- "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
- "mkswap /dev/vda2 -L swap",
- "swapon -L swap",
- "mkfs.btrfs -L root /dev/vda3",
- "btrfs device scan",
- "mount LABEL=root /mnt",
- "btrfs subvol create /mnt/badpath",
- "btrfs subvol create /mnt/badpath/boot",
- "btrfs subvol create /mnt/nixos",
- "btrfs subvol set-default \$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
- "umount /mnt",
- "mount -o defaults LABEL=root /mnt",
- "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism is actually looking up subvolumes
- "mkdir /mnt/boot",
- "mount -o defaults,subvol=badpath/boot LABEL=root /mnt/boot",
- );
+ machine.succeed(
+ "sgdisk -Z /dev/vda",
+ "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.btrfs -L root /dev/vda3",
+ "btrfs device scan",
+ "mount LABEL=root /mnt",
+ "btrfs subvol create /mnt/badpath",
+ "btrfs subvol create /mnt/badpath/boot",
+ "btrfs subvol create /mnt/nixos",
+ "btrfs subvol set-default "
+ + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
+ "umount /mnt",
+ "mount -o defaults LABEL=root /mnt",
+ "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism
+ # is actually looking up subvolumes
+ "mkdir /mnt/boot",
+ "mount -o defaults,subvol=badpath/boot LABEL=root /mnt/boot",
+ )
'';
};
-
}
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 8f844aca416..7ba60ee9806 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -3,12 +3,10 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
let
- makeTest = import ./make-test-python.nix;
-
makeZfsTest = name:
{ kernelPackage ? pkgs.linuxPackages_latest
, enableUnstable ? false
@@ -20,41 +18,33 @@ let
maintainers = [ adisbladis ];
};
- machine = { pkgs, ... }:
- {
- virtualisation.emptyDiskImages = [ 4096 ];
- networking.hostId = "deadbeef";
- boot.kernelPackages = kernelPackage;
- boot.supportedFilesystems = [ "zfs" ];
- boot.zfs.enableUnstable = enableUnstable;
+ machine = { pkgs, ... }: {
+ virtualisation.emptyDiskImages = [ 4096 ];
+ networking.hostId = "deadbeef";
+ boot.kernelPackages = kernelPackage;
+ boot.supportedFilesystems = [ "zfs" ];
+ boot.zfs.enableUnstable = enableUnstable;
- environment.systemPackages = with pkgs; [
- parted
- ];
- };
+ environment.systemPackages = [ pkgs.parted ];
+ };
testScript = ''
- machine.succeed("modprobe zfs")
- machine.succeed("zpool status")
-
- machine.succeed("ls /dev")
-
machine.succeed(
- "mkdir /tmp/mnt",
-
- "udevadm settle",
- "parted --script /dev/vdb mklabel msdos",
- "parted --script /dev/vdb -- mkpart primary 1024M -1s",
- "udevadm settle",
-
- "zpool create rpool /dev/vdb1",
- "zfs create -o mountpoint=legacy rpool/root",
- "mount -t zfs rpool/root /tmp/mnt",
- "udevadm settle",
-
- "umount /tmp/mnt",
- "zpool destroy rpool",
- "udevadm settle"
+ "modprobe zfs",
+ "zpool status",
+ "ls /dev",
+ "mkdir /tmp/mnt",
+ "udevadm settle",
+ "parted --script /dev/vdb mklabel msdos",
+ "parted --script /dev/vdb -- mkpart primary 1024M -1s",
+ "udevadm settle",
+ "zpool create rpool /dev/vdb1",
+ "zfs create -o mountpoint=legacy rpool/root",
+ "mount -t zfs rpool/root /tmp/mnt",
+ "udevadm settle",
+ "umount /tmp/mnt",
+ "zpool destroy rpool",
+ "udevadm settle",
)
'' + extraTest;
@@ -69,18 +59,17 @@ in {
enableUnstable = true;
extraTest = ''
machine.succeed(
- "echo password | zpool create -o altroot=\"/tmp/mnt\" -O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1",
- "zfs create -o mountpoint=legacy rpool/root",
- "mount -t zfs rpool/root /tmp/mnt",
- "udevadm settle",
-
- "umount /tmp/mnt",
- "zpool destroy rpool",
- "udevadm settle"
+ 'echo password | zpool create -o altroot="/tmp/mnt" '
+ + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1",
+ "zfs create -o mountpoint=legacy rpool/root",
+ "mount -t zfs rpool/root /tmp/mnt",
+ "udevadm settle",
+ "umount /tmp/mnt",
+ "zpool destroy rpool",
+ "udevadm settle",
)
'';
};
installer = (import ./installer.nix { }).zfsroot;
-
}
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index a92d331baad..9f7f0b09007 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fomp";
- version = "1.0.0";
+ version = "1.2.0";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
- sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
+ sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw";
};
nativeBuildInputs = [ pkgconfig wafHook ];
diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix
new file mode 100644
index 00000000000..b3c3caae4e4
--- /dev/null
+++ b/pkgs/applications/editors/bless/default.nix
@@ -0,0 +1,80 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkgconfig
+, mono
+, gtk-sharp-2_0
+, gettext
+, makeWrapper
+, glib
+, gtk2-x11
+, gnome2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "bless";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "afrantzis";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "04ra2mcx3pkhzbhcz0zwfmbpqj6cwisrypi6xbc2d6pxd4hdafn1";
+ };
+
+ buildInputs = [
+ gtk-sharp-2_0
+ mono
+ # runtime only deps
+ glib
+ gtk2-x11
+ gnome2.libglade
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ autoreconfHook
+ gettext
+ makeWrapper
+ ];
+
+ configureFlags = [
+ # scrollkeeper is a gnome2 package, so it must be old and we shouldn't really support it
+ # NOTE: that sadly doesn't turn off the compilation of the manual with scrollkeeper, so we have to fake the binaries below
+ "--without-scrollkeeper"
+ ];
+
+ autoreconfPhase = ''
+ mkdir _bin
+
+ # this fakes the scrollkeeper commands, to keep the build happy
+ for f in scrollkeeper-preinstall scrollkeeper-update; do
+ echo "true" > ./_bin/$f
+ chmod +x ./_bin/$f
+ done
+
+ export PATH="$PWD/_bin:$PATH"
+
+ # and it also wants to install that file
+ touch ./doc/user/bless-manual.omf
+
+ # patch mono path
+ sed "s|^mono|${mono}/bin/mono|g" -i src/bless-script.in
+
+ ./autogen.sh
+ '';
+
+ preFixup = ''
+ MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gnome2.libglade}/lib:${gtk-sharp-2_0}/lib"
+ wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/afrantzis/bless";
+ description = "Gtk# Hex Editor";
+ maintainers = [ maintainers.mkg20001 ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ badPlatforms = [ "aarch64-linux" ];
+ };
+}
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 933644cc471..cab7ac119b6 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib
+{ lib, mkDerivation, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib
, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel
, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
, llvmPackages
}:
-with stdenv.lib;
+with lib;
let
verMajor = "1";
verMinor = "2";
@@ -13,7 +13,7 @@ let
ginVer = "2.1.2";
gwtVer = "2.8.1";
in
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "RStudio";
inherit version;
@@ -116,15 +116,16 @@ stdenv.mkDerivation rec {
mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
};
+ qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ];
+
postInstall = ''
- wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
mkdir $out/share
cp -r ${desktopItem}/share/applications $out/share
mkdir $out/share/icons
ln $out/rstudio.png $out/share/icons
'';
- meta = with stdenv.lib;
+ meta = with lib;
{ description = "Set of integrated tools for the R language";
homepage = https://www.rstudio.com/;
license = licenses.agpl3;
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 663c64ac5de..b6861a9023f 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,15 +11,15 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "00b6q3rvf9v993i8d1vh9ckb86s655mz6kqkw0lxg8xmhpm568ra";
- x86_64-darwin = "1r4qbjbypdqx9qmycykgkrg8anckicmdmawwwsszgkdd0zd5idgg";
+ x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn";
+ x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0";
}.${system};
in
callPackage ./generic.nix rec {
# The update script doesn't correctly change the hash for darwin, so please:
# nixpkgs-update: no auto update
- version = "1.41.1";
+ version = "1.42.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 225a5c5fc37..4b2e1c66761 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -11,13 +11,13 @@
pythonPackages.buildPythonApplication rec {
pname = "bleachbit";
- version = "3.0";
+ version = "3.2.0";
format = "other";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "18ns9hms671b4l0189m1m2agprkydnpvyky9q2f5hxf35i9cn67d";
+ sha256 = "1sszpn7ifiry0wwmkzdppzh61zvgrfypm9g7wk6q1ya20qhb5b51";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index e06ee14a2d3..3cb5738cd42 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "cherrytree";
- version = "0.38.10";
+ version = "0.38.11";
src = fetchurl {
url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
- sha256 = "1bj83b7lwqir13fp9slcdn8mgign06vywy42x8zvsp22fjn4p7f7";
+ sha256 = "1awrrfyawa7d8qaipvikxm1p0961060az2qvmv9wwpl47zcnk1dn";
};
nativeBuildInputs = [ gettext ];
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index d578479787b..941b6050a1a 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.12.2";
+ version = "1.12.3";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "013bavyqvnay38c844n1jvirsmj807f0wg2qlclkdghkj316p1pz";
+ sha256 = "06q6vmbliy935zlf4bbnfgiqyrx9vskz3fsks4jpxi47xs80rqkz";
};
doCheck = false;
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 4416e1e62c2..b70901bac81 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -2,11 +2,11 @@
, curl, cdparanoia, libid3tag, ncurses, libtool }:
stdenv.mkDerivation rec {
- name = "grip-4.0.1";
+ name = "grip-4.1.0";
src = fetchurl {
url = "mirror://sourceforge/grip/${name}.tar.gz";
- sha256 = "0blh5j3d4g16bhsqmhv71qhbsyyzcqywzpqsjjiiw465mjlwxka6";
+ sha256 = "0iy7bcyrxm7zyrxah06qyxdshkgq6yqkadlw211j2qzld38a79j5";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index 4b086c691cd..d82f8e1664b 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pdfsam-basic";
- version = "4.0.5";
+ version = "4.1.1";
src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
- sha256 = "1znadsg65312h8yyxvj8k0c4pl3g9daif50vk50acwpblq49wm1v";
+ sha256 = "17qb3l7xibhb3fbskddvparrj2cxj4kz9qbril094kxrgbvyc9gs";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index be1389c2121..ffc6bde79a1 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchgit, unzip, firefox-esr, makeWrapper }:
+{ stdenv, fetchgit, unzip, firefox-esr-52, makeWrapper }:
stdenv.mkDerivation rec {
pkgname = "conkeror";
version = "1.0.4";
name = "${pkgname}-${version}";
-
+
src = fetchgit {
url = git://repo.or.cz/conkeror.git;
rev = "refs/tags/${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/libexec/conkeror
cp -r * $out/libexec/conkeror
- makeWrapper ${firefox-esr}/bin/firefox $out/bin/conkeror \
+ makeWrapper ${firefox-esr-52}/bin/firefox $out/bin/conkeror \
--add-flags "-app $out/libexec/conkeror/application.ini"
'';
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 6712dcd486b..b7e0ba75115 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "cloudflared";
- version = "2019.7.0";
-
- goPackagePath = "github.com/cloudflare/cloudflared";
+ version = "2019.12.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
- sha256 = "19229p7c9m7v0xpmzi5rfwjzm845ikq8pndkry2si9azks18x77q";
+ sha256 = "0cc78bysp7z76h4ddiwbsrygz4m4r71f8xylg99pc5qyg8p3my4p";
};
- goDeps = ./deps.nix;
+ modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p";
buildFlagsArray = "-ldflags=-X main.Version=${version}";
diff --git a/pkgs/applications/networking/cloudflared/deps.nix b/pkgs/applications/networking/cloudflared/deps.nix
deleted file mode 100644
index e5ca7be0070..00000000000
--- a/pkgs/applications/networking/cloudflared/deps.nix
+++ /dev/null
@@ -1,453 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
- sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46";
- sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
- };
- }
- {
- goPackagePath = "github.com/certifi/gocertifi";
- fetch = {
- type = "git";
- url = "https://github.com/certifi/gocertifi";
- rev = "deb3ae2ef2610fde3330947281941c562861188b";
- sha256 = "1xy09y1fdfcny1z09hd4493w1acj5min9z2sx4gfpshc80icrmr6";
- };
- }
- {
- goPackagePath = "github.com/cloudflare/brotli-go";
- fetch = {
- type = "git";
- url = "https://github.com/cloudflare/brotli-go";
- rev = "18c9f6c67e3dfc12e0ddaca748d2887f97a7ac28";
- sha256 = "10112y4k8qing552n0df9w33cgminrzm6g3x7ng0vgin4sv59785";
- };
- }
- {
- goPackagePath = "github.com/cloudflare/golibs";
- fetch = {
- type = "git";
- url = "https://github.com/cloudflare/golibs";
- rev = "333127dbecfcc23a8db7d9a4f52785d23aff44a1";
- sha256 = "170hbv9wyfmb5da9a6wjz2mphp0pylv23h8qp8h5kwa2i9frdqqi";
- };
- }
- {
- goPackagePath = "github.com/coredns/coredns";
- fetch = {
- type = "git";
- url = "https://github.com/coredns/coredns";
- rev = "2e322f6e8a54f18c6aef9c25a7c432c291a3d9f7";
- sha256 = "0s9x5yww1qd9pzh2w846g9qw0n86ygymjiqjn15ws6ha3nj5p75p";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-oidc";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-oidc";
- rev = "a93f71fdfe73d2c0f5413c0565eea0af6523a6df";
- sha256 = "00pmmky0y9a9l767xn16xlf52h81j4869n6j0xql79rybp6xc1f3";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-systemd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-systemd";
- rev = "95778dfbb74eb7e4dbaf43bf7d71809650ef8076";
- sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf";
- };
- }
- {
- goPackagePath = "github.com/coreos/pkg";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/pkg";
- rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
- sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- };
- }
- {
- goPackagePath = "github.com/elgs/gosqljson";
- fetch = {
- type = "git";
- url = "https://github.com/elgs/gosqljson";
- rev = "027aa4915315a0b2825c0f025cea347829b974fa";
- sha256 = "14i45m1y505acvsk4l725bp8p9w3mcg49khz9hxkzg3afg7nc5gq";
- };
- }
- {
- goPackagePath = "github.com/equinox-io/equinox";
- fetch = {
- type = "git";
- url = "https://github.com/equinox-io/equinox";
- rev = "5205c98a6c11dc72747ce12fff6cd620a99fde05";
- sha256 = "19gya2zhs3xqfjh8y6s63yw9q8h1x710rl1drf4a1fmgdhaf2lrv";
- };
- }
- {
- goPackagePath = "github.com/facebookgo/grace";
- fetch = {
- type = "git";
- url = "https://github.com/facebookgo/grace";
- rev = "75cf19382434e82df4dd84953f566b8ad23d6e9e";
- sha256 = "15chyvgv5y59w9x2asm0vh29cmmcji7f5vxvv8gqcr15nkyi61q0";
- };
- }
- {
- goPackagePath = "github.com/flynn/go-shlex";
- fetch = {
- type = "git";
- url = "https://github.com/flynn/go-shlex";
- rev = "3f9db97f856818214da2e1057f8ad84803971cff";
- sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
- };
- }
- {
- goPackagePath = "github.com/getsentry/raven-go";
- fetch = {
- type = "git";
- url = "https://github.com/getsentry/raven-go";
- rev = "ed7bcb39ff10f39ab08e317ce16df282845852fa";
- sha256 = "0pqggcjbia9sidxqxnyd5z5k44iswxaqss3qvkka8bfm082kczij";
- };
- }
- {
- goPackagePath = "github.com/golang-collections/collections";
- fetch = {
- type = "git";
- url = "https://github.com/golang-collections/collections";
- rev = "604e922904d35e97f98a774db7881f049cd8d970";
- sha256 = "04g0xc1bs4aphc2rcj9knah2shmck500qagnazy4mg052b84ggwm";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30";
- sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
- };
- }
- {
- goPackagePath = "github.com/google/uuid";
- fetch = {
- type = "git";
- url = "https://github.com/google/uuid";
- rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4";
- sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
- };
- }
- {
- goPackagePath = "github.com/gorilla/mux";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/mux";
- rev = "c5c6c98bc25355028a63748a498942a6398ccd22";
- sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
- sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
- };
- }
- {
- goPackagePath = "github.com/grpc-ecosystem/grpc-opentracing";
- fetch = {
- type = "git";
- url = "https://github.com/grpc-ecosystem/grpc-opentracing";
- rev = "8e809c8a86450a29b90dcc9efbf062d0fe6d9746";
- sha256 = "1yz3gxhdipmi63n32y5srwx7p254k3fm8y64cimkb1gz7sw99nxw";
- };
- }
- {
- goPackagePath = "github.com/jonboulle/clockwork";
- fetch = {
- type = "git";
- url = "https://github.com/jonboulle/clockwork";
- rev = "2eee05ed794112d45db504eb05aa693efd2b8b09";
- sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
- };
- }
- {
- goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
- fetch = {
- type = "git";
- url = "https://github.com/konsorten/go-windows-terminal-sequences";
- rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e";
- sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
- };
- }
- {
- goPackagePath = "github.com/lib/pq";
- fetch = {
- type = "git";
- url = "https://github.com/lib/pq";
- rev = "51e2106eed1cea199c802d2a49e91e2491b02056";
- sha256 = "00kp0k7sd7xrv92crd2xja68z096b2fw0mlz58mdjlri9w72hqbf";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045";
- sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7";
- sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
- sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
- };
- }
- {
- goPackagePath = "github.com/mholt/caddy";
- fetch = {
- type = "git";
- url = "https://github.com/mholt/caddy";
- rev = "d3b731e9255b72d4571a5aac125634cf1b6031dc";
- sha256 = "1183cfaryw7m3hvngzv87w80pc9vp3369sjyz7a0dlbr39jip1r0";
- };
- }
- {
- goPackagePath = "github.com/miekg/dns";
- fetch = {
- type = "git";
- url = "https://github.com/miekg/dns";
- rev = "73601d4aed9d844322611759d7f3619110b7c88e";
- sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-homedir";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "af06845cf3004701891bf4fdb884bfe4920b3727";
- sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
- };
- }
- {
- goPackagePath = "github.com/opentracing/opentracing-go";
- fetch = {
- type = "git";
- url = "https://github.com/opentracing/opentracing-go";
- rev = "659c90643e714681897ec2521c60567dd21da733";
- sha256 = "0aj9cbm21zsg1i5l25hz8gn0yf99yxyxcp1gqh3yd5g4knj2cgzf";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "792786c7400a136282c1664665ae0a8db921c6c2";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "967789050ba94deca04a5e84cce8ad472ce313c1";
- sha256 = "1djwz6shmyx5kbp9b1pim3kncq2jwn3qhbx4b0b4lq7msww76hpz";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8";
- sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "a82f4c12f983cc2649298185f296632953e50d3e";
- sha256 = "0pcgnxrv2i31jljqzhkv5hpdz92f6zrkh2p1i7i59acfz1fxhq0s";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "8368d24ba045f26503eb745b624d930cbe214c79";
- sha256 = "0cfrgsy82c964hcmzzyk6ccghpr9dkfvdlxa0cj9cfc0w94cqvrl";
- };
- }
- {
- goPackagePath = "github.com/rifflock/lfshook";
- fetch = {
- type = "git";
- url = "https://github.com/rifflock/lfshook";
- rev = "b9218ef580f59a2e72dad1aa33d660150445d05a";
- sha256 = "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "839c75faf7f98a33d445d181f3018b5c3409a45e";
- sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
- sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "f416ebab96af27ca70b6e5c23d6a0747530da626";
- sha256 = "1cmddgh6x1c3lij50r8245jhqgi4j00add4wjpqpc2dmcg5928m3";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "1da14a5a36f220ea3f03470682b737b1dfd5de22";
- sha256 = "1ivqwn3r44vlldlj53669jvsd6klwsg7hmla7f0vz03ny8xz4lpz";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
- sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "12500544f89f9420afe9529ba8940bf72d294972";
- sha256 = "1y37dlbbsp1dkfqaf563fwlf3xl74ymswmy52faqyv0wpcbwixgy";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "google.golang.org/genproto";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-genproto";
- rev = "d1146b9035b912113a38af3b138eb2af567b2c67";
- sha256 = "1ry1vbbnfh7i3zrv3vmbsbmq2w8jmz88ykd6cxviijnxvms3zab8";
- };
- }
- {
- goPackagePath = "google.golang.org/grpc";
- fetch = {
- type = "git";
- url = "https://github.com/grpc/grpc-go";
- rev = "236199dd5f8031d698fb64091194aecd1c3895b2";
- sha256 = "0rzpcmp5fscg3smn0aiaahgimv74smylg701na5px3pn5iymh94a";
- };
- }
- {
- goPackagePath = "gopkg.in/urfave/cli.v2";
- fetch = {
- type = "git";
- url = "https://github.com/cbranch/cli";
- rev = "d604b6ffeee878fbf084fd2761466b6649989cee";
- sha256 = "16csqipw5vrbb91m9w9g72jlxlrhcyxa79fz6fjp6803znmjdpk2";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
- sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
- };
- }
- {
- goPackagePath = "zombiezen.com/go/capnproto2";
- fetch = {
- type = "git";
- url = "https://github.com/zombiezen/go-capnproto2";
- rev = "7cfd211c19c7f5783c695f3654efa46f0df259c3";
- sha256 = "0nzw3g8xpxyzwqqv3ja0iznd0j18l1rwagwhf9sinwdjjgmh51sy";
- };
- }
-]
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 3125ab3330e..40acd423925 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "k9s";
- version = "0.13.6";
+ version = "0.13.8";
# rev is the release commit, mainly for version command output
rev = "8fedc42304ce33df314664eb0c4ac73be59065af";
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
- sha256 = "1gffbj6pgys6k3i8ikcy3yr2r9cwg0xki55yz5yg6z4a8h0jc8a6";
+ sha256 = "0xkxvgqzzhz5bhbqwgyw9w238kadqccr1fbvrxjcjr32xlbs56z2";
};
buildFlagsArray = ''
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 9de87ee178d..a1539bd7165 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
stdenv.mkDerivation {
- name = "esniper-2.35.0-18-g4a59da0";
+ name = "esniper-2.35.0-21-g6379846";
src = fetchgit {
url = "https://git.code.sf.net/p/esniper/git";
- rev = "4a59da032aa4536b9e5ea95633247650412511db";
- sha256 = "0d3vazh5q7wymqahggbb2apl9hgrm037y4s3j91d24hjgk2pzzyd";
+ rev = "637984623984ef36782d52d8968df7fae7bbb0a7";
+ sha256 = "1md3fzs0k88f6mgvrj1yrh96mn0qlca2p6vfqj6dnpyb8pjjwp8w";
};
buildInputs = [ openssl curl ];
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 2d29a409d37..a509d9be329 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
- version = "3.1.18";
+ version = "3.1.21";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "34be4ac61dbb5699cfbc9db8bf4f4be15a63164d9006d8ac7c488278d00baa62";
+ sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e";
};
postPatch = ''
diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix
index b317838f672..769f58785ee 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -1,29 +1,31 @@
-{ stdenv, fetchFromGitHub, python3Packages
-}:
+{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
python3Packages.buildPythonPackage rec {
- name = "qnotero-${version}";
+ pname = "qnotero";
- version = "1.0.0";
+ version = "2.1.1";
src = fetchFromGitHub {
- owner = "smathot";
- repo = "qnotero";
- rev = "release/${version}";
- name = "qnotero-${version}-src";
- sha256 = "1d5a9k1llzn9q1qv1bfwc7gfflabh4riplz9jj0hf04b279y1bj0";
+ owner = "ealbiter";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "16ckcjxa3dgmz1y8gd57q2h84akra3j4bgl4fwv4m05bam3ml1xs";
};
- propagatedBuildInputs = [ python3Packages.pyqt4 ];
+ propagatedBuildInputs = [ python3Packages.pyqt5 wrapQtAppsHook ];
patchPhase = ''
substituteInPlace ./setup.py \
--replace "/usr/share" "usr/share"
- substituteInPlace ./libqnotero/_themes/default.py \
+ substituteInPlace ./libqnotero/_themes/light.py \
--replace "/usr/share" "$out/usr/share"
'';
+ preFixup = ''
+ wrapQtApp "$out"/bin/qnotero
+ '';
+
meta = {
description = "Quick access to Zotero references";
homepage = http://www.cogsci.nl/software/qnotero;
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 44247f294aa..42b13a981d9 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
- version = "2.21.6";
+ version = "2.21.8";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "1vpyzhrs3bbviwk2n7k5296rnsw7g9ksvjsibl0gm7dawip9jb5s";
+ sha256 = "0wxacfyxqvd39mzmwkwz39g4mf0ig1zcgymwbhsnhmn9j60mdmrf";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index c3395a85148..ba20695ec44 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "marvin";
- version = "19.27.0";
+ version = "20.3.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
- sha256 = "10pzprr43pklf4yl14m9q921ynalsil1dsfbl6lx8r1jmyjgl3w7";
+ sha256 = "1y2vh1n80mrrbxqbhxfag8h4lisarbw8h3labmh3ajrfan7bmhql";
};
nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index da10ca34b87..dacbd948241 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }:
+{ lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }:
-stdenv.mkDerivation {
+mkDerivation {
pname = "librepcb";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "LibrePCB";
repo = "LibrePCB";
fetchSubmodules = true;
- rev = "acdd94d9d2310f79215125b999153e9da88a9376";
- sha256 = "1bbl01rp75sl6k1cmch7x90v00lck578xvqmb856s9fx75bdgnv5";
+ rev = "56bc60d347ff67df0fe1d57807d03f0606de557f";
+ sha256 = "0z6jn5zawp0x5i9zda7l787jnsv3yl8aqwnpii3g4hsnf2q3hhrh";
};
enableParallelBuilding = true;
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
wrapQtApp $out/bin/librepcb
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = https://librepcb.org/;
maintainers = with maintainers; [ luz ];
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index ddefcf1b3aa..d6ff7a8b4a7 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "symbiyosys";
- version = "2019.10.11";
+ version = "2020.02.08";
src = fetchFromGitHub {
- owner = "yosyshq";
- repo = "symbiyosys";
- rev = "23f89011b678daa9da406d4f45f790e45f8f68ca";
- sha256 = "01596yvfj79iywwczjwlb2l9qnh7bsj7jff66jdk1ybjnxf841f0";
+ owner = "YosysHQ";
+ repo = "SymbiYosys";
+ rev = "500b526131f434b9679732fc89515dbed67c8d7d";
+ sha256 = "1pwbirszc80r288x81nx032snniqgmc80i09bbha2i3zd0c3pj5h";
};
buildInputs = [ python3 yosys ];
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 07ec466e000..e55bcd8fe21 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gmsh";
- version = "4.5.1";
+ version = "4.5.2";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "0rjwxpz5qwq6dj7ka53mhxlgnp9bs5jphhsamlb0nk3h8kzckisq";
+ sha256 = "10i6i1s68lkccnl73lzr04cf1hc5rd8b7dpiaxs1vzrj1ljgw801";
};
buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 6f8c4091a16..960d0826a84 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "2.12.6";
+ version = "2.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1h7daf74s0plnqrz2f63s6rak8fmqns96ydjn01366bcsqrbvkw6";
+ sha256 = "1qq94x4rqn8vl5h11bn5d4x5ybsbj769kgf4lnj56my7si7qy8qn";
};
nativeBuildInputs = [ installShellFiles pbr ];
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index b49a6294832..f976ede79c4 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "crun";
- version = "0.12";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
- sha256 = "0sxpdv3afh8hn39jdg06vwkyp7i6dsyf1gg8719vwiwmcbhzj8mx";
+ sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index dbd05e38d3f..f4a81068781 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "podman";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
- sha256 = "1f1dq9g08mlm9y9d7jbs780nrfc25ln97ca5qifcsyc9bmp4f6r1";
+ sha256 = "1rbapks11xg0vgl9m322mijirx0wm6c4yav8aw2y41wsr7qd7db4";
};
goPackagePath = "github.com/containers/libpod";
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 2cafa57586e..208764c0adc 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
- version = "0.13.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
- sha256 = "047ivrp70kwsm4792ing8dvgh161cmayzy9ij6ww61fbkb4slr1i";
+ sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg";
};
- cargoSha256 = "16rgg0fy50n0z0kal52iaxiqwhw4qpjvzyqwaldm29fq9c0105d1";
+ cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix
index 21c598b6cdd..258114715f3 100644
--- a/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/pkgs/data/fonts/jetbrains-mono/default.nix
@@ -1,14 +1,14 @@
{ lib, fetchzip }:
let
- version = "1.0.2";
+ version = "1.0.3";
in
fetchzip rec {
name = "JetBrainsMono-${version}";
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
- sha256 = "0fyn7yb1m9gkzbbzv25f8v6qzv7w4amqv3z4fpfb262l1f6yq41i";
+ sha256 = "16am5fxvda24jfl8lb9jf8mkcqfc97scj8hvwgd3m771db0dpflf";
postFetch = ''
mkdir -p $out/share/fonts
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 8ab868891b5..6e00bc2d88d 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha";
- version = "2019-11-02";
+ version = "2020-02-06";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "0wci9ahap8kynq8cbyxr7aba9ndb1d4kiq42xvzr34vw1rhcahrr";
+ sha256 = "14kii4dn028yqbsd0pr195di067harh9z2h753856dlxvs8d6vkx";
};
buildInputs = [ gdk-pixbuf librsvg ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A stylish Design theme for GTK based desktop environments";
- homepage = https://vinceliuice.github.io/theme-matcha;
+ homepage = "https://vinceliuice.github.io/theme-matcha";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
index b03678c5d7a..b2a3acd0722 100644
--- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-translations";
- version = "4.4.0";
+ version = "4.4.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- sha256 = "0hh6shfj7vc1mw814l38cakfmh135ba8j604h1rmx4zwspwgvgzh";
+ sha256 = "1n1nkapcgxmbv0l8hrx5cf588pi4ifx12xbz46lq4p1ijrlfivba";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index f0c1ba14c48..afd08f6e96e 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -14,14 +14,14 @@ let
in
with stdenv; mkDerivation rec {
pname = "nextpnr";
- version = "2019.10.13";
+ version = "2020.02.04";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
- rev = "c365dd1cabc3a4308ab9110534918623622c246b";
- sha256 = "1344pyq9xb5y1vxsnfgr488drfjsa6ls1jck0z9hwam6vg55s10r";
+ rev = "ca733561873cd54be047ae30a94efcd71b3f8be5";
+ sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp";
name = "nextpnr";
})
(fetchFromGitHub {
@@ -45,10 +45,11 @@ with stdenv; mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags =
- [ "-DARCH=generic;ice40;ecp5"
+ [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}"
+ "-DARCH=generic;ice40;ecp5"
"-DBUILD_TESTS=ON"
"-DICEBOX_ROOT=${icestorm}/share/icebox"
- "-DTRELLIS_ROOT=${trellis}/share/trellis"
+ "-DTRELLIS_INSTALL_PREFIX=${trellis}"
"-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis"
"-DUSE_OPENMP=ON"
# warning: high RAM usage
@@ -58,12 +59,7 @@ with stdenv; mkDerivation rec {
++ (lib.optional (enableGui && stdenv.isDarwin)
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
- # Fix the version number. This is a bit stupid (and fragile) in practice
- # but works ok. We should probably make this overrideable upstream.
patchPhase = with builtins; ''
- substituteInPlace ./CMakeLists.txt \
- --replace 'git log -1 --format=%h' 'echo ${substring 0 11 (elemAt srcs 0).rev}'
-
# use PyPy for icestorm if enabled
substituteInPlace ./ice40/family.cmake \
--replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index f5bcfa20aa0..250690cefe8 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
pname = "ponyc";
- version = "0.33.1";
+ version = "0.33.2";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
- sha256 = "0wqbnvxdzzwr9q4v9ha9r9jjymr6y8ba1rb2lkzrng4g9p6xqbxy";
+ sha256 = "0jcdr1r3g8sm3q9fcc87d6x98fg581n6hb90hz7r08mzn4bwvysw";
};
buildInputs = [ llvm makeWrapper which libxml2 ];
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 7027c5a0523..739759a67fc 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -15,14 +15,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
- version = "2020.02.01";
+ version = "2020.02.07";
src = fetchFromGitHub {
- owner = "yosyshq";
+ owner = "YosysHQ";
repo = "yosys";
- rev = "a1c840ca5d6e8b580e21ae48550570aa9665741a";
- sha256 = "1vna04dh6l68nifssgs3hxqwn4k529krmm4crj94a8wwhwra52mh";
- name = "yosys";
+ rev = "2e8d6ec0b06b4e51e222c15c8049130bc264ae57";
+ sha256 = "0asnqhxs5r5r2xmvsk9pbgyqgk53j1snh7c9qizcppn4csapda81";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c03825a0f4e..dcf858e6155 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -74,7 +74,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "0s8sv6h90l2a9xdabj0nirhpr6d2k8s5cddjdkm50x395i014w31";
+ sha256 = "1shb1jgm78bx88rbsr1nmimjzzfqw96qdr38mcrr1c2qz5ky820v";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -1236,7 +1236,7 @@ self: super: {
constraints-deriving = dontCheck super.constraints-deriving;
# Use a matching version of ghc-lib-parser.
- ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2; };
+ ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205; };
# https://github.com/sol/hpack/issues/366
hpack = self.hpack_0_33_0;
@@ -1350,7 +1350,7 @@ self: super: {
# There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
matterhorn = doJailbreak (super.matterhorn.override {
brick-skylighting = self.brick-skylighting.override {
- brick = self.brick_0_50_1;
+ brick = self.brick_0_51;
};
});
@@ -1380,7 +1380,7 @@ self: super: {
# Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0)
ormolu = doJailbreak (super.ormolu.override {
- ghc-lib-parser = self.ghc-lib-parser_8_8_2;
+ ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205;
});
# krank-0.1.0 does not accept PyF-0.9.0.0.
@@ -1389,4 +1389,8 @@ self: super: {
# prettyprinter-1.6.0 fails its doctest suite.
prettyprinter_1_6_0 = dontCheck super.prettyprinter_1_6_0;
+ # the test suite has an overly tight restriction on doctest
+ # See https://github.com/ekmett/perhaps/pull/5
+ perhaps = doJailbreak super.perhaps;
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
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 7c0866bfbe5..8d64286402f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -81,4 +81,10 @@ self: super: {
hackage-db = self.hackage-db_2_1_0;
});
+ # cabal2spec needs a recent version of Cabal
+ cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+
+ # Builds only with ghc-8.8.x and beyond.
+ policeman = markBroken super.policeman;
+
}
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 e7f121f979a..d492c69db4d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -70,7 +70,7 @@ self: super: {
xmobar = doJailbreak super.xmobar;
# use latest version to fix the build
- brick = self.brick_0_50_1;
+ brick = self.brick_0_51;
dbus = self.dbus_1_2_11;
doctemplates = self.doctemplates_0_8;
exact-pi = doJailbreak super.exact-pi;
@@ -82,7 +82,7 @@ self: super: {
HaTeX = self.HaTeX_3_22_0_0;
HsYAML = self.HsYAML_0_2_1_0;
json-autotype = doJailbreak super.json-autotype;
- lens = self.lens_4_18_1;
+ lens = self.lens_4_19;
memory = self.memory_0_15_0;
microlens = self.microlens_0_4_11_2;
microlens-ghc = self.microlens-ghc_0_4_12;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c19c1b2792a..db3201eaf97 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -69,7 +69,7 @@ core-packages:
default-package-overrides:
# pandoc-2.9 does not accept the 0.3 version yet
- doclayout < 0.3
- # LTS Haskell 14.22
+ # LTS Haskell 14.23
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -116,7 +116,7 @@ default-package-overrides:
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- aos-signature ==0.1.1
- - apecs ==0.8.2
+ - apecs ==0.8.3
- apecs-gloss ==0.2.3
- apecs-physics ==0.4.2
- api-field-json-th ==0.1.0.2
@@ -132,7 +132,6 @@ default-package-overrides:
- arrow-extras ==0.1.0.1
- asciidiagram ==1.3.3.3
- ascii-progress ==0.3.3.0
- - asif ==6.0.4
- asn1-encoding ==0.9.6
- asn1-parse ==0.9.5
- asn1-types ==0.3.3
@@ -183,7 +182,7 @@ default-package-overrides:
- base-compat-batteries ==0.10.5
- basement ==0.0.11
- base-noprelude ==4.12.0.0
- - base-orphans ==0.8.1
+ - base-orphans ==0.8.2
- base-prelude ==1.3
- base-unicode-symbols ==0.2.3
- basic-prelude ==0.7.0
@@ -202,7 +201,7 @@ default-package-overrides:
- bencoding ==0.4.5.2
- between ==0.11.0.0
- bibtex ==0.1.0.6
- - bifunctors ==5.5.6
+ - bifunctors ==5.5.7
- bimap ==0.4.0
- bimap-server ==0.1.0.1
- binary-bits ==0.5
@@ -406,7 +405,7 @@ default-package-overrides:
- conduit-throttle ==0.3.1.0
- conduit-zstd ==0.0.1.1
- config-ini ==0.2.4.0
- - configuration-tools ==0.4.1
+ - configuration-tools ==0.4.2
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
- configurator-pg ==0.1.0.3
@@ -640,7 +639,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- error-util ==0.0.1.2
- - ersatz ==0.4.7
+ - ersatz ==0.4.8
- esqueleto ==3.0.0
- etc ==0.4.1.0
- eventful-core ==0.2.0
@@ -677,13 +676,13 @@ default-package-overrides:
- fast-logger ==2.4.17
- fast-math ==1.0.2
- fb ==2.0.0
- - fclabels ==2.0.3.3
+ - fclabels ==2.0.4
- feature-flags ==0.1.0.1
- fedora-dists ==1.0.1
- feed ==1.2.0.1
- FenwickTree ==0.1.2.1
- fft ==0.1.8.6
- - fgl ==5.7.0.1
+ - fgl ==5.7.0.2
- fib ==0.1
- filecache ==0.4.1
- file-embed ==0.0.11.1
@@ -709,7 +708,7 @@ default-package-overrides:
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.2
- - flat-mcmc ==1.5.0
+ - flat-mcmc ==1.5.1
- flay ==0.4
- flexible-defaults ==0.0.3
- FloatingHex ==0.4
@@ -742,7 +741,7 @@ default-package-overrides:
- free-vl ==0.1.4
- friendly-time ==0.4.1
- frisby ==0.2.2
- - from-sum ==0.2.2.0
+ - from-sum ==0.2.3.0
- frontmatter ==0.1.0.2
- fsnotify ==0.3.0.1
- fsnotify-conduit ==0.1.1.1
@@ -848,7 +847,7 @@ default-package-overrides:
- graph-core ==0.3.0.0
- graphite ==0.10.0.1
- graphs ==0.7.1
- - graphviz ==2999.20.0.3
+ - graphviz ==2999.20.0.4
- graph-wrapper ==0.2.6.0
- gravatar ==0.8.0
- graylog ==0.1.0.1
@@ -1059,7 +1058,7 @@ default-package-overrides:
- hw-dsv ==0.3.5
- hweblib ==0.6.3
- hw-eliasfano ==0.1.1.0
- - hw-excess ==0.2.2.2
+ - hw-excess ==0.2.2.3
- hw-fingertree ==0.1.1.1
- hw-fingertree-strict ==0.1.1.3
- hw-hedgehog ==0.1.0.5
@@ -1171,7 +1170,7 @@ default-package-overrides:
- js-jquery ==3.3.1
- json ==0.9.3
- json-alt ==1.0.0
- - json-feed ==1.0.7
+ - json-feed ==1.0.8
- jsonpath ==0.1.0.2
- json-rpc ==1.0.1
- json-rpc-client ==0.2.5.0
@@ -1183,13 +1182,13 @@ default-package-overrides:
- justified-containers ==0.3.0.0
- jwt ==0.10.0
- kan-extensions ==5.2
- - kanji ==3.4.0.2
+ - kanji ==3.4.1
- katip ==0.8.3.0
- kawhi ==0.3.0
- kazura-queue ==0.1.0.4
- kdt ==0.2.4
- keycode ==0.2.2
- - keys ==3.12.2
+ - keys ==3.12.3
- kind-apply ==0.3.2.0
- kind-generics ==0.3.0.0
- kind-generics-th ==0.1.1.0
@@ -1199,7 +1198,7 @@ default-package-overrides:
- kraken ==0.1.0
- l10n ==0.1.0.1
- labels ==0.3.3
- - lackey ==1.0.10
+ - lackey ==1.0.11
- lambdabot-core ==5.2
- lambdabot-irc-plugins ==5.2
- LambdaHack ==0.9.5.0
@@ -1211,7 +1210,7 @@ default-package-overrides:
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
- language-javascript ==0.6.0.14
- - language-puppet ==1.4.6.1
+ - language-puppet ==1.4.6.2
- lapack ==0.3.1
- lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.0.1
@@ -1247,10 +1246,10 @@ default-package-overrides:
- libffi ==0.1
- libgit ==0.3.1
- libgraph ==1.14
- - libmpd ==0.9.0.10
+ - libmpd ==0.9.1.0
- liboath-hs ==0.0.1.1
- libraft ==0.5.0.0
- - libyaml ==0.1.1.1
+ - libyaml ==0.1.2
- LibZip ==1.0.1
- lifted-async ==0.10.0.4
- lifted-base ==0.2.3.12
@@ -1278,7 +1277,7 @@ default-package-overrides:
- log-domain ==0.12
- logfloat ==0.13.3.3
- logger-thread ==0.1.0.2
- - logging-effect ==1.3.8
+ - logging-effect ==1.3.9
- logging-facade ==0.3.0
- logging-facade-syslog ==1
- logict ==0.7.0.2
@@ -1404,7 +1403,6 @@ default-package-overrides:
- mono-traversable-keys ==0.1.0
- more-containers ==0.2.2.0
- mountpoints ==1.0.2
- - mpi-hs ==0.5.3.0
- msgpack ==1.0.1.0
- msgpack-aeson ==0.1.0.0
- mtl ==2.2.2
@@ -1438,7 +1436,7 @@ default-package-overrides:
- natural-sort ==0.1.2
- natural-transformation ==0.4
- ndjson-conduit ==0.1.0.5
- - neat-interpolation ==0.3.2.5
+ - neat-interpolation ==0.3.2.6
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1
- netlib-ffi ==0.1.1
@@ -1463,7 +1461,7 @@ default-package-overrides:
- network-simple-tls ==0.3.2
- network-transport ==0.5.4
- network-transport-composed ==0.2.1
- - network-uri ==2.6.1.0
+ - network-uri ==2.6.2.0
- newtype ==0.2.2.0
- newtype-generics ==0.5.4
- nicify-lib ==1.0.1
@@ -1536,7 +1534,7 @@ default-package-overrides:
- palette ==0.3.0.2
- pandoc ==2.7.3
- pandoc-citeproc ==0.16.2
- - pandoc-csv2table ==1.0.7
+ - pandoc-csv2table ==1.0.8
- pandoc-markdown-ghci-filter ==0.1.0.0
- pandoc-pyplot ==2.1.5.1
- pandoc-types ==1.17.6.1
@@ -1587,7 +1585,7 @@ default-package-overrides:
- persistent-iproute ==0.2.4
- persistent-mysql ==2.9.0
- persistent-mysql-haskell ==0.5.2
- - persistent-pagination ==0.1.1.0
+ - persistent-pagination ==0.1.1.1
- persistent-postgresql ==2.9.1
- persistent-qq ==2.9.1
- persistent-sqlite ==2.9.3
@@ -1743,7 +1741,7 @@ default-package-overrides:
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.0
- rank2classes ==1.3.2.1
- - Rasterific ==0.7.5
+ - Rasterific ==0.7.5.1
- rasterific-svg ==0.3.3.2
- ratel ==1.0.9
- ratel-wai ==1.1.1
@@ -1859,7 +1857,7 @@ default-package-overrides:
- scientific ==0.3.6.2
- scotty ==0.11.5
- scrypt ==0.5.0
- - sdl2 ==2.5.0.0
+ - sdl2 ==2.5.1.0
- sdl2-gfx ==0.2
- sdl2-image ==2.0.0
- sdl2-mixer ==1.1.0
@@ -1930,7 +1928,7 @@ default-package-overrides:
- sexpr-parser ==0.1.1.2
- SHA ==1.6.4.4
- shake-language-c ==0.12.0
- - shakespeare ==2.0.23
+ - shakespeare ==2.0.24
- shared-memory ==0.2.0.0
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
@@ -1972,7 +1970,7 @@ default-package-overrides:
- slack-web ==0.2.0.11
- smallcheck ==1.1.5
- smallcheck-series ==0.6.1
- - smoothie ==0.4.2.9
+ - smoothie ==0.4.2.10
- snap-blaze ==0.2.1.5
- snap-core ==1.0.4.1
- snap-server ==1.1.1.1
@@ -2020,10 +2018,9 @@ default-package-overrides:
- stm-split ==0.0.2.1
- stopwatch ==0.1.0.6
- storable-complex ==0.2.3.0
- - storable-record ==0.0.4
+ - storable-record ==0.0.4.1
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13
- - store ==0.5.1.2
- store-core ==0.4.4.2
- Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.40.0
@@ -2054,7 +2051,7 @@ default-package-overrides:
- stripe-signature ==1.0.0.1
- stripe-wreq ==1.0.1.0
- strive ==5.0.9
- - structs ==0.1.2
+ - structs ==0.1.3
- structured-cli ==2.5.2.0
- summoner ==1.3.0.1
- sum-type-boilerplate ==0.1.1
@@ -2102,9 +2099,9 @@ default-package-overrides:
- tasty-hunit ==0.10.0.2
- tasty-kat ==0.0.3
- tasty-leancheck ==0.0.1
- - tasty-lua ==0.2.0.1
+ - tasty-lua ==0.2.2
- tasty-program ==1.0.5
- - tasty-quickcheck ==0.10.1
+ - tasty-quickcheck ==0.10.1.1
- tasty-silver ==3.1.13
- tasty-smallcheck ==0.8.1
- tasty-th ==0.1.7
@@ -2303,7 +2300,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - util ==0.1.17.0
+ - util ==0.1.17.1
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@@ -2322,7 +2319,7 @@ default-package-overrides:
- valor ==0.1.0.0
- vault ==0.3.1.3
- vec ==0.1.1.1
- - vector ==0.12.0.3
+ - vector ==0.12.1.2
- vector-algorithms ==0.8.0.3
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
@@ -2335,7 +2332,7 @@ default-package-overrides:
- vector-split ==1.0.0.2
- vector-th-unbox ==0.2.1.7
- verbosity ==0.3.0.0
- - versions ==3.5.2
+ - versions ==3.5.3
- ViennaRNAParser ==1.3.3
- viewprof ==0.0.0.32
- vinyl ==0.11.0
@@ -2397,7 +2394,7 @@ default-package-overrides:
- wizards ==1.0.3
- wl-pprint-annotated ==0.1.0.1
- wl-pprint-console ==0.1.0.2
- - wl-pprint-text ==1.2.0.0
+ - wl-pprint-text ==1.2.0.1
- word24 ==2.0.1
- word8 ==0.1.3
- wordpress-auth ==1.0.0.0
@@ -2452,13 +2449,13 @@ default-package-overrides:
- yeshql ==4.1.0.1
- yeshql-core ==4.1.0.2
- yeshql-hdbc ==4.1.0.2
- - yesod ==1.6.0
+ - yesod ==1.6.0.1
- yesod-alerts ==0.1.3.0
- - yesod-auth ==1.6.8
+ - yesod-auth ==1.6.8.1
- yesod-auth-hashdb ==1.7.1.2
- yesod-auth-oauth2 ==0.6.1.2
- yesod-bin ==1.6.0.4
- - yesod-core ==1.6.17
+ - yesod-core ==1.6.17.2
- yesod-csp ==0.2.5.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
@@ -3078,6 +3075,7 @@ broken-packages:
- atomic-primops-vector
- atomo
- ats-format
+ - ats-pkg
- ats-setup
- ats-storable
- attic-schedule
@@ -6068,6 +6066,7 @@ broken-packages:
- hs-twitterarchiver
- hs-vcard
- hs-watchman
+ - hs2ats
- hs2bf
- Hs2lib
- hsaml2
@@ -6784,6 +6783,7 @@ broken-packages:
- lame
- lame-tester
- lang
+ - language-ats
- language-bash
- language-boogie
- language-c-comments
@@ -7084,6 +7084,7 @@ broken-packages:
- lxd-client
- lye
- Lykah
+ - lz4-bytes
- lz4-conduit
- lzma-enumerator
- lzma-streams
@@ -7945,7 +7946,6 @@ broken-packages:
- perfect-vector-shuffle
- PerfectHash
- perfecthash
- - perhaps
- periodic
- perm
- permutations
@@ -8950,6 +8950,7 @@ broken-packages:
- sha-streams
- shade
- shadower
+ - shake-ats
- shake-cabal-build
- shake-extras
- shake-minify
@@ -9035,6 +9036,7 @@ broken-packages:
- simseq
- singleton-dict
- singleton-typelits
+ - singletons-presburger
- singnal
- singular-factory
- sink
@@ -10009,6 +10011,7 @@ broken-packages:
- uuagc-bootstrap
- uuagc-diagrams
- uuid-aeson
+ - uuid-bytes
- uuid-orphans
- uvector
- uvector-algorithms
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index b2c65b7f03a..bc78409b3ec 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -530,6 +530,9 @@ self: super: builtins.intersectAttrs super {
'';
});
+ # Break infinite recursion cycle with criterion and network-uri.
+ js-flot = dontCheck super.js-flot;
+
# Break infinite recursion cycle between QuickCheck and splitmix.
splitmix = dontCheck super.splitmix;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cc38a751ac3..d58f51a37ee 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3280,18 +3280,18 @@ self: {
"Color" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
- , data-default-class, deepseq, doctest, hspec, HUnit, QuickCheck
- , random, template-haskell, vector
+ , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
+ , QuickCheck, random, template-haskell, vector
}:
mkDerivation {
pname = "Color";
- version = "0.1.1";
- sha256 = "0jwqyvch7mpg83q57c50qc0visgc0nav6ihb8gr81wdp8i3f680k";
+ version = "0.1.2";
+ sha256 = "078qc0fjzhn4v1zq37hql3b84cnv39kc48hxxk9f3ngl7yn3d8va";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base data-default-class deepseq vector ];
testHaskellDepends = [
- base colour doctest hspec HUnit QuickCheck random template-haskell
- vector
+ base colour doctest hspec HUnit JuicyPixels QuickCheck random
+ template-haskell vector
];
benchmarkHaskellDepends = [ base colour criterion deepseq random ];
description = "Color spaces and conversions between them";
@@ -5958,8 +5958,8 @@ self: {
}:
mkDerivation {
pname = "Fin";
- version = "0.2.8.0";
- sha256 = "1smzghfifiqakbv9308bz5b4mkzmrfvgs6zpry5nw2lbqh7crcc7";
+ version = "0.2.9.0";
+ sha256 = "1wkbdjrpb7ydc659h76yrrhyv7akwx64k7cxv5fmjrwn4vgd0r8a";
libraryHaskellDepends = [
alg base foldable1 natural-induction peano universe-base
];
@@ -16779,23 +16779,6 @@ self: {
}) {};
"Rasterific" = callPackage
- ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
- , free, JuicyPixels, mtl, primitive, transformers, vector
- , vector-algorithms
- }:
- mkDerivation {
- pname = "Rasterific";
- version = "0.7.5";
- sha256 = "158s0w95x0yxhffcccvhil827jmv7mmbh65nbg8qypvw9j4ldb9j";
- libraryHaskellDepends = [
- base bytestring containers dlist FontyFruity free JuicyPixels mtl
- primitive transformers vector vector-algorithms
- ];
- description = "A pure haskell drawing engine";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "Rasterific_0_7_5_1" = callPackage
({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
, free, JuicyPixels, mtl, primitive, transformers, vector
, vector-algorithms
@@ -16810,7 +16793,6 @@ self: {
];
description = "A pure haskell drawing engine";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ReadArgs" = callPackage
@@ -22611,8 +22593,8 @@ self: {
pname = "acme-mutable-package";
version = "0";
sha256 = "16da6pkkdr2g77dn3n4v9x6mwi6yz3xlpisvpn0id2xz0bayipmr";
- revision = "3";
- editedCabalFile = "094kr4ib0hldgccr5bvy9azpfvkf5dmq3hq6xk5hyha6djjkx2gc";
+ revision = "4";
+ editedCabalFile = "1154vbz0yar1xd8jn2v2dl5fc2pkawwp93yd0g5dcrb9bbx6pagf";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base ];
description = "A mutable package";
@@ -23035,6 +23017,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ad_4_4" = callPackage
+ ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
+ , containers, criterion, data-reify, directory, doctest, erf
+ , filepath, free, nats, reflection, semigroups, transformers
+ }:
+ mkDerivation {
+ pname = "ad";
+ version = "4.4";
+ sha256 = "1v7m5nk9aa0sfqfqmv15dq87s2nl7i3v1d5xx0xla9ydhlqizy4x";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ array base comonad containers data-reify erf free nats reflection
+ semigroups transformers
+ ];
+ testHaskellDepends = [ base directory doctest filepath ];
+ benchmarkHaskellDepends = [ base criterion erf ];
+ description = "Automatic Differentiation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"adaptive-containers" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -23153,6 +23156,19 @@ self: {
broken = true;
}) {};
+ "adjunction" = callPackage
+ ({ mkDerivation, base, gauge, hs-functors }:
+ mkDerivation {
+ pname = "adjunction";
+ version = "0.0.0.0";
+ sha256 = "1n83ak423jwyj3w708alj9ngczzll05jyn60d0fgx8bvr3hlmi0i";
+ libraryHaskellDepends = [ base hs-functors ];
+ testHaskellDepends = [ base hs-functors ];
+ benchmarkHaskellDepends = [ base gauge hs-functors ];
+ description = "See README for more info";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"adjunctions" = callPackage
({ mkDerivation, array, base, comonad, containers, contravariant
, distributive, free, generic-deriving, hspec, hspec-discover, mtl
@@ -23547,6 +23563,18 @@ self: {
broken = true;
}) {};
+ "aeson-default" = callPackage
+ ({ mkDerivation, aeson, base, containers }:
+ mkDerivation {
+ pname = "aeson-default";
+ version = "0.9.1.0";
+ sha256 = "0fmjxanahqdkrrgy56i2xbm3547c512k4p4if6c6lvrxcfvb8zjy";
+ libraryHaskellDepends = [ aeson base containers ];
+ testHaskellDepends = [ aeson base containers ];
+ description = "Apply default value to FromJSON instacnes' Maybe fields";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"aeson-diff" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, doctest
, edit-distance-vector, filepath, Glob, hashable, mtl
@@ -23802,8 +23830,8 @@ self: {
}:
mkDerivation {
pname = "aeson-match-qq";
- version = "1.0.0";
- sha256 = "0py6h62a9h7wmrgcc79inbpx5b3jv660jlf5hqc1hdnvmf96prkr";
+ version = "1.1.0";
+ sha256 = "0qkj38b05klzwrgy0vyr9qnkllzz9v225b3d60f6mbx3q3nxdk9x";
libraryHaskellDepends = [
aeson attoparsec base bytestring either haskell-src-meta scientific
template-haskell text unordered-containers vector
@@ -23811,7 +23839,7 @@ self: {
testHaskellDepends = [
aeson aeson-qq base hspec unordered-containers
];
- description = "Matching Aeson values with a quasiquoter";
+ description = "Declarative JSON matchers";
license = stdenv.lib.licenses.bsd2;
}) {};
@@ -24948,10 +24976,8 @@ self: {
}:
mkDerivation {
pname = "alex-meta";
- version = "0.3.0.9";
- sha256 = "0882p9j272dhq94kgmg6pnxzi3qfwa01fk7npsz748rgx6ggycyr";
- revision = "1";
- editedCabalFile = "0p6j9ilvn5gjx0n7v1war0z8rlmcz1qnvpc8lcik8l7baydz6qjl";
+ version = "0.3.0.11";
+ sha256 = "0pb6m2h9r3j71iy8ch8kgvssblidlr6r7k12fa1q2v7wi5q2mq91";
libraryHaskellDepends = [
array base containers haskell-src-meta QuickCheck template-haskell
];
@@ -25170,6 +25196,27 @@ self: {
broken = true;
}) {};
+ "algebraic-graphs_0_5" = callPackage
+ ({ mkDerivation, array, base, containers, deepseq, extra
+ , inspection-testing, mtl, QuickCheck, transformers
+ }:
+ mkDerivation {
+ pname = "algebraic-graphs";
+ version = "0.5";
+ sha256 = "02y5g459zl6hgdyq0kkqv4gz9v2xp7y2al9m4g46wis5hb7zxfc9";
+ libraryHaskellDepends = [
+ array base containers deepseq mtl transformers
+ ];
+ testHaskellDepends = [
+ array base containers deepseq extra inspection-testing mtl
+ QuickCheck transformers
+ ];
+ description = "A library for algebraic graph construction and transformation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"algebraic-prelude" = callPackage
({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
mkDerivation {
@@ -29616,23 +29663,6 @@ self: {
}) {};
"apecs" = callPackage
- ({ mkDerivation, array, base, containers, criterion, linear, mtl
- , QuickCheck, template-haskell, vector
- }:
- mkDerivation {
- pname = "apecs";
- version = "0.8.2";
- sha256 = "06dhq7knzxj48563ll7r1srlgq5nd2kbk5fzrf7x6yjp0w2c9kmp";
- libraryHaskellDepends = [
- array base containers mtl template-haskell vector
- ];
- testHaskellDepends = [ base containers linear QuickCheck vector ];
- benchmarkHaskellDepends = [ base criterion linear ];
- description = "Fast Entity-Component-System library for game programming";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "apecs_0_8_3" = callPackage
({ mkDerivation, array, base, containers, criterion, linear, mtl
, QuickCheck, template-haskell, vector
}:
@@ -29647,7 +29677,6 @@ self: {
benchmarkHaskellDepends = [ base criterion linear ];
description = "Fast Entity-Component-System library for game programming";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"apecs-gloss" = callPackage
@@ -31121,8 +31150,8 @@ self: {
}:
mkDerivation {
pname = "arduino-copilot";
- version = "1.3.0";
- sha256 = "0524xga8r55zpf6fw4vg7al2d6i9q4qinsx3zlqq0825qq8pp5nr";
+ version = "1.4.0";
+ sha256 = "031vi24iz25qrzjw3xha1sajzrgjrkypypy0ngfpffzl5zlarpsb";
libraryHaskellDepends = [
base containers copilot copilot-c99 copilot-language directory
filepath mtl optparse-applicative unix
@@ -33343,6 +33372,8 @@ self: {
doHaddock = false;
description = "A build tool for ATS";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ats-setup" = callPackage
@@ -36399,20 +36430,6 @@ self: {
}) {};
"base-orphans" = callPackage
- ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
- }:
- mkDerivation {
- pname = "base-orphans";
- version = "0.8.1";
- sha256 = "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4";
- libraryHaskellDepends = [ base ghc-prim ];
- testHaskellDepends = [ base hspec QuickCheck ];
- testToolDepends = [ hspec-discover ];
- description = "Backwards-compatible orphan instances for base";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "base-orphans_0_8_2" = callPackage
({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
}:
mkDerivation {
@@ -36424,7 +36441,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Backwards-compatible orphan instances for base";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base-prelude" = callPackage
@@ -36604,8 +36620,10 @@ self: {
}:
mkDerivation {
pname = "base64";
- version = "0.4.0";
- sha256 = "0mq9pnlcmjxalkq6i9shp6652l34qqp6gsahma9pi2rvk1klk7vv";
+ version = "0.4.1";
+ sha256 = "06mwamlqdz90k7nh3x4w0j0mjkbhkns11hvj9zd8d1yw6wy3l4hd";
+ revision = "1";
+ editedCabalFile = "1jvx3wpnfwzxfz5w3bqglqcv539fkk7wivl8ylm126pqh7sjdp5f";
libraryHaskellDepends = [ base bytestring text ];
testHaskellDepends = [
base base64-bytestring bytestring random-bytestring tasty
@@ -36615,7 +36633,7 @@ self: {
base base64-bytestring bytestring deepseq gauge memory
random-bytestring text
];
- description = "RFC 4648-compliant padded and unpadded base64 and base64url encodings";
+ description = "Fast RFC 4648-compliant Base64 encoding";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -36692,6 +36710,8 @@ self: {
pname = "base64-lens";
version = "0.2.0";
sha256 = "0d4lri7wpaxx7hgd7slxj5jl2qkgfairzsga4vajl05g49amyk80";
+ revision = "1";
+ editedCabalFile = "07x38p4zcv05y94gjn5j3j1ydv06vi17fbjnz4ckcgc3ay0dzbzf";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base base64 bytestring lens text ];
testHaskellDepends = [ base doctest lens ];
@@ -38208,28 +38228,6 @@ self: {
}) {};
"bifunctors" = 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.6";
- sha256 = "1jnsnc0rj3vkx8rjwsf2aacla9xzdfy1am9mmjk8crxp2gkazcnc";
- 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;
- }) {};
-
- "bifunctors_5_5_7" = callPackage
({ mkDerivation, base, base-orphans, comonad, containers, hspec
, hspec-discover, QuickCheck, tagged, template-haskell
, th-abstraction, transformers, transformers-compat
@@ -38249,7 +38247,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Bifunctors";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bighugethesaurus" = callPackage
@@ -38912,14 +38909,12 @@ self: {
}) {};
"binary-strict" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, mtl }:
+ ({ mkDerivation, array, base, bytestring, mtl }:
mkDerivation {
pname = "binary-strict";
- version = "0.4.8.3";
- sha256 = "1c9cm428zp8ncrjca5y5i0y91rzppmrk4zpjkp1ppbpxv5dzpf4f";
- revision = "1";
- editedCabalFile = "1y4x4zhqs8lxxy9qcmkf93g9a1fa6bkn9my8pb9ac75qnc8mi42x";
- libraryHaskellDepends = [ array base bytestring containers mtl ];
+ version = "0.4.8.4";
+ sha256 = "07b62k4vqdxwaa8fp3zy2xgzc8j1wgzjh04jij2dabk0329flham";
+ libraryHaskellDepends = [ array base bytestring mtl ];
description = "Binary deserialisation using strict ByteStrings";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -40132,8 +40127,8 @@ self: {
}:
mkDerivation {
pname = "bioinformatics-toolkit";
- version = "0.9.1";
- sha256 = "1blx00zkmw85c4pp36fp6jig8yy1qsc68vn40pglm0j3lgwagv9w";
+ version = "0.9.2";
+ sha256 = "1glf8wnswn60mcyrwn6y1ma6db1k6zckjmzbm28nvr961plp108b";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson aeson-pretty attoparsec base bytestring bytestring-lexing
@@ -43393,7 +43388,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "brick_0_50_1" = callPackage
+ "brick_0_51" = callPackage
({ mkDerivation, base, bytestring, config-ini, containers
, contravariant, data-clist, deepseq, directory, dlist, filepath
, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -43402,8 +43397,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.50.1";
- sha256 = "0wv69pbs4xqfdqw9ag32fhqhmh8djxb14h8jpyblmykirlznx77y";
+ version = "0.51";
+ sha256 = "05phqqq4sb7b11maava7y9by1lz6drzzhggvb2nsxsbajlka41h8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -43638,6 +43633,8 @@ self: {
pname = "brittany";
version = "0.12.1.1";
sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z";
+ revision = "1";
+ editedCabalFile = "0wqg0yl3da1dgpqqv5q0ml3k0njn7pgipaac4vd9gidv3d1pyd74";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -43761,8 +43758,8 @@ self: {
}:
mkDerivation {
pname = "brok";
- version = "0.1.7.0";
- sha256 = "1961s6ccr5x81jym34y1437pa7ml4jsxnw4gd1r496h8mh9lcm99";
+ version = "0.2.0.0";
+ sha256 = "1fsh05433gkm89j4nf9whcif0iiscxbd32q307rjm1fwsfwp9c46";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -45034,7 +45031,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "bytes_0_16" = callPackage
+ "bytes_0_17" = callPackage
({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal
, cabal-doctest, cereal, containers, directory, doctest, filepath
, hashable, mtl, scientific, text, time, transformers
@@ -45042,10 +45039,8 @@ self: {
}:
mkDerivation {
pname = "bytes";
- version = "0.16";
- sha256 = "1m8nkviq4ckqi9v1w1fxzicdzmvb3wfxcmqmppjrrmkwawn4c6i9";
- revision = "1";
- editedCabalFile = "080sdihajl7fbcyp2j4mbq3zlh8jl6dsn51gk89h1r5nl3zzh3gz";
+ version = "0.17";
+ sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base binary binary-orphans bytestring cereal containers hashable
@@ -45100,8 +45095,8 @@ self: {
}:
mkDerivation {
pname = "bytesmith";
- version = "0.3.3.0";
- sha256 = "08q2wpdj3na06n7k1ig27i67csby6yy2vhrgcdpmsi1jx8as9nwh";
+ version = "0.3.4.0";
+ sha256 = "0xl7iigb260z66na22zvwif18a2rng7damvrz53r818kdqmllg4v";
libraryHaskellDepends = [
base byteslice bytestring contiguous primitive run-st text-short
wide-word
@@ -46704,15 +46699,15 @@ self: {
broken = true;
}) {};
- "cabal-rpm_2_0_0" = callPackage
+ "cabal-rpm_2_0_1" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, http-client, http-client-tls, http-conduit, optparse-applicative
, process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
}:
mkDerivation {
pname = "cabal-rpm";
- version = "2.0.0";
- sha256 = "1gr68l5bg2mfl6b8nbfzcinibldk271psxp5wkiw14mclyx7ln8g";
+ version = "2.0.1";
+ sha256 = "0kspqf3lsaczwgidih9f7xlgpdx9asarb3s8s3n2bwq5g68gh2l7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -48193,6 +48188,8 @@ self: {
pname = "capnp";
version = "0.4.0.0";
sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx";
+ revision = "1";
+ editedCabalFile = "16h6xvl3xr91rfn5l9lyg2jq14mffxjnkzhva4gn4bds01g2d2jl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -54921,12 +54918,12 @@ self: {
, http-client, http-client-tls, http-streams, http-types
, io-streams, memory, network, servant, servant-client
, servant-client-core, text, time, transformers, unagi-streams
- , unordered-containers, vector, websockets, wuss
+ , unordered-containers, uuid, vector, websockets, wuss
}:
mkDerivation {
pname = "coinbase-pro";
- version = "0.7.2.0";
- sha256 = "1vkw9pda8pn5kljpv6hx0mdml5yjgz354dvfv02akl81ds3r0lhq";
+ version = "0.8.0.0";
+ sha256 = "021c05qkrvgxlylvrrlb81bjxl49v5varn0fi5wqs5sda15766n3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -54934,14 +54931,14 @@ self: {
cryptonite HsOpenSSL http-api-data http-client http-client-tls
http-streams http-types io-streams memory network servant
servant-client servant-client-core text time transformers
- unagi-streams unordered-containers vector websockets wuss
+ unagi-streams unordered-containers uuid vector websockets wuss
];
executableHaskellDepends = [
aeson aeson-casing async base binary bytestring containers
cryptonite HsOpenSSL http-api-data http-client http-client-tls
http-streams http-types io-streams memory network servant
servant-client servant-client-core text time transformers
- unagi-streams unordered-containers vector websockets wuss
+ unagi-streams unordered-containers uuid vector websockets wuss
];
description = "Client for Coinbase Pro";
license = stdenv.lib.licenses.mit;
@@ -58440,41 +58437,6 @@ self: {
}) {};
"configuration-tools" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
- , base-unicode-symbols, base64-bytestring, bytestring, Cabal
- , case-insensitive, connection, data-default, deepseq, directory
- , dlist, enclosed-exceptions, filepath, http-client
- , http-client-tls, http-types, monad-control, mtl, network-uri
- , optparse-applicative, process, profunctors, semigroupoids
- , semigroups, text, tls, transformers, unordered-containers, wai
- , warp, warp-tls, x509, x509-system, x509-validation, yaml
- }:
- mkDerivation {
- pname = "configuration-tools";
- version = "0.4.1";
- sha256 = "1c6yk6516v4ld8rmhwg4s4f3s6k40gx3dsqfrl2y9lcx3477nlj8";
- setupHaskellDepends = [
- base bytestring Cabal directory filepath process
- ];
- libraryHaskellDepends = [
- aeson ansi-wl-pprint attoparsec base base-unicode-symbols
- base64-bytestring bytestring Cabal case-insensitive connection
- data-default deepseq directory dlist enclosed-exceptions filepath
- http-client http-client-tls http-types monad-control mtl
- network-uri optparse-applicative process profunctors semigroupoids
- semigroups text tls transformers unordered-containers x509
- x509-system x509-validation yaml
- ];
- testHaskellDepends = [
- base base-unicode-symbols bytestring Cabal enclosed-exceptions
- http-types monad-control mtl text transformers unordered-containers
- wai warp warp-tls yaml
- ];
- description = "Tools for specifying and parsing configurations";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "configuration-tools_0_4_2" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
, base-unicode-symbols, base64-bytestring, bytestring, Cabal
, case-insensitive, connection, data-default, deepseq, directory
@@ -58507,7 +58469,6 @@ self: {
];
description = "Tools for specifying and parsing configurations";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"configurator" = callPackage
@@ -59055,15 +59016,15 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "constraints_0_11_2" = callPackage
+ "constraints_0_12" = callPackage
({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
, hspec-discover, mtl, semigroups, transformers
, transformers-compat, type-equality
}:
mkDerivation {
pname = "constraints";
- version = "0.11.2";
- sha256 = "10mnhg7p5gk4i3bzldl07qkrihnvmfkgsp32w7p9i7x8cmj5akjq";
+ version = "0.12";
+ sha256 = "08q2fq2xy2ija164k5a178jjffdii57nrx2x9ddz24zh2ld56szj";
libraryHaskellDepends = [
base binary deepseq ghc-prim hashable mtl semigroups transformers
transformers-compat type-equality
@@ -60365,8 +60326,8 @@ self: {
}:
mkDerivation {
pname = "core-program";
- version = "0.2.4.1";
- sha256 = "0ji0vnk7k4rgib6zpid7fjqy1ggf3m88cm6j23bg0lvmj5rvml5c";
+ version = "0.2.4.2";
+ sha256 = "0zs62mn87fdrjwi1dp11hkr7nbb7v3ikxk1ph6cnjdk0di9hrr6a";
libraryHaskellDepends = [
async base bytestring chronologique core-data core-text directory
exceptions filepath fsnotify hashable hourglass mtl prettyprinter
@@ -64133,8 +64094,8 @@ self: {
}:
mkDerivation {
pname = "daemons";
- version = "0.2.1";
- sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
+ version = "0.3.0";
+ sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -67913,14 +67874,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "decidable_0_2_1_0" = callPackage
+ "decidable_0_3_0_0" = callPackage
({ mkDerivation, base, functor-products, microlens, singletons
, vinyl
}:
mkDerivation {
pname = "decidable";
- version = "0.2.1.0";
- sha256 = "1l307j4n9xagarbqqa48c729fs63qlzy5sqzgfyzfqwnas8yrqhx";
+ version = "0.3.0.0";
+ sha256 = "1phzfp2q82ylxj09150v1gqmk8858qjw9prhn32zjfnyzfzcg3mq";
libraryHaskellDepends = [
base functor-products microlens singletons vinyl
];
@@ -69726,6 +69687,8 @@ self: {
pname = "dhall-bash";
version = "1.0.27";
sha256 = "0mmf53fqgf8g6s80g6wss86lcfkrpjc51w5givy7kg9js00d48px";
+ revision = "1";
+ editedCabalFile = "1w4hbk6xx04q0f1sxgwmp3h5s3cwc3w22vbvdxz052nhdcj3sigw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -73321,8 +73284,8 @@ self: {
}:
mkDerivation {
pname = "dmcc";
- version = "1.1.0.1";
- sha256 = "1agha3ppi1jh08pjn6s7jbfqqll0svwxpq2an69hcgl5kf01y0c7";
+ version = "1.1.0.2";
+ sha256 = "0xm5lxnaqlrsgxvcr4xhf85angv5is1rhy992frkiz75w74adzd7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -76547,6 +76510,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "eccrypto-ed25519-bindings" = callPackage
+ ({ mkDerivation, base, bytestring, eccrypto }:
+ mkDerivation {
+ pname = "eccrypto-ed25519-bindings";
+ version = "0.1.0.0";
+ sha256 = "1yi93a9x5sl3h50cky7l9df3077kwr3grp2iw9s5iykcwi6jdzg7";
+ libraryHaskellDepends = [ base bytestring eccrypto ];
+ description = "provides \"ed25519\" API using \"eccrypto\"";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ecdsa" = callPackage
({ mkDerivation, base, bytestring, crypto-api, crypto-pubkey-types
, hecc
@@ -77325,8 +77299,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "either-list-functions";
- version = "0.0.0.3";
- sha256 = "1b01aj05dbx51hgyhmggh1zgcbwfvyijkxj7knqpbgpj7hymv00y";
+ version = "0.0.2.0";
+ sha256 = "04xl2xrlrmf0znic1vx521d73i6znyyjijp58h6ak0sx45kclw39";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Functions involving lists of Either";
@@ -79474,14 +79448,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "envy_2_1_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, hspec, mtl
+ , QuickCheck, quickcheck-instances, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "envy";
+ version = "2.1.0.0";
+ sha256 = "0s6jp2npnp0x5hndnhkjwc9bhdghzlpl0n38804afiwxai9bawy8";
+ libraryHaskellDepends = [
+ base bytestring containers mtl text time transformers
+ ];
+ testHaskellDepends = [
+ base bytestring hspec mtl QuickCheck quickcheck-instances text time
+ transformers
+ ];
+ description = "An environmentally friendly way to deal with environment variables";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"envy-extensible" = callPackage
({ mkDerivation, base, doctest, envy, extensible, hspec
, hspec-discover, main-tester, QuickCheck
}:
mkDerivation {
pname = "envy-extensible";
- version = "0.1.0.0";
- sha256 = "1m5qly9la0b3rxp8amni7nhgisg5vmp3zi76hc1586c202cnsl70";
+ version = "0.2.0.1";
+ sha256 = "0800a7drik9h3bxnkqriwjg2j31j8k3pw5fsmswnmfh4wwv2bb6v";
libraryHaskellDepends = [ base envy extensible ];
testHaskellDepends = [
base doctest envy extensible hspec main-tester QuickCheck
@@ -79743,21 +79737,23 @@ self: {
}) {};
"erd" = callPackage
- ({ mkDerivation, base, bytestring, containers, graphviz, hspec
- , parsec, QuickCheck, raw-strings-qq, tasty, tasty-hunit, text
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , gitrev, graphviz, parsec, raw-strings-qq, tasty, tasty-hunit
+ , text, yaml
}:
mkDerivation {
pname = "erd";
- version = "0.2.0.0";
- sha256 = "1lxqjvsmkqhqaw63r6qp6z9kjz73ki6y3vr85bjs5i0m7ff87799";
+ version = "0.2.1.0";
+ sha256 = "1p21q4x5l29mhnm17j77b4w5rqc9n4jd24czawz7p1srmzvl67hs";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring containers graphviz parsec text
+ base bytestring containers directory filepath gitrev graphviz
+ parsec raw-strings-qq text yaml
];
testHaskellDepends = [
- base bytestring containers graphviz hspec parsec QuickCheck
- raw-strings-qq tasty tasty-hunit text
+ base bytestring containers directory filepath gitrev graphviz
+ parsec raw-strings-qq tasty tasty-hunit text yaml
];
description = "An entity-relationship diagram generator from a plain text description";
license = stdenv.lib.licenses.publicDomain;
@@ -80072,34 +80068,6 @@ self: {
}) {};
"ersatz" = callPackage
- ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
- , cabal-doctest, containers, data-default, directory, doctest, fail
- , filepath, lens, mtl, parsec, process, semigroups, temporary
- , transformers, unordered-containers
- }:
- mkDerivation {
- pname = "ersatz";
- version = "0.4.7";
- sha256 = "0kddsh02yrpn7xack6xcs0c93hmf4gkmh56zip2n6q7j0xgdrl6d";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- array attoparsec base bytestring containers data-default lens mtl
- process semigroups temporary transformers unordered-containers
- ];
- executableHaskellDepends = [
- array base containers fail lens mtl parsec semigroups
- ];
- testHaskellDepends = [ array base directory doctest filepath mtl ];
- description = "A monad for expressing SAT or QSAT problems using observable sharing";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "ersatz_0_4_8" = callPackage
({ mkDerivation, array, attoparsec, base, bytestring, Cabal
, cabal-doctest, containers, data-default, directory, doctest, fail
, filepath, lens, mtl, parsec, process, semigroups, temporary
@@ -83461,6 +83429,26 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "fast-digits_0_3_0_0" = callPackage
+ ({ mkDerivation, base, digits, gauge, integer-gmp, QuickCheck
+ , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "fast-digits";
+ version = "0.3.0.0";
+ sha256 = "1vlmjlkmv1nmw1rriafm2hzkmqd5xnwgzmvrg6xxqj1ab5sdsafs";
+ libraryHaskellDepends = [ base integer-gmp ];
+ testHaskellDepends = [
+ base digits QuickCheck smallcheck tasty tasty-quickcheck
+ tasty-smallcheck
+ ];
+ benchmarkHaskellDepends = [ base digits gauge ];
+ doHaddock = false;
+ description = "Integer-to-digits conversion";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fast-downward" = callPackage
({ mkDerivation, base, containers, mtl, process, temporary, text
, transformers
@@ -84119,13 +84107,13 @@ self: {
({ mkDerivation, base, doctest, first-class-families, Glob }:
mkDerivation {
pname = "fcf-containers";
- version = "0.1.0";
- sha256 = "1rvchhv59640iiwx2f9byf5klayx150aws1wz54v85bfcsxwsrac";
+ version = "0.2.0";
+ sha256 = "02ymhc7ms6k7ms966px8a4zhgsd71ncyb4c08b0x51n6v442cwmh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base first-class-families ];
executableHaskellDepends = [ base first-class-families ];
- testHaskellDepends = [ base doctest Glob ];
+ testHaskellDepends = [ base doctest first-class-families Glob ];
description = "Data structures and algorithms for first-class-families";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -84158,25 +84146,6 @@ self: {
}) {};
"fclabels" = callPackage
- ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell
- , transformers
- }:
- mkDerivation {
- pname = "fclabels";
- version = "2.0.3.3";
- sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
- revision = "4";
- editedCabalFile = "09pn1q4gjlhw956asmhzva1rhrafmn69xmd1sc80fh3c8vjd3icz";
- libraryHaskellDepends = [ base mtl template-haskell transformers ];
- testHaskellDepends = [
- base HUnit mtl template-haskell transformers
- ];
- benchmarkHaskellDepends = [ base criterion ];
- description = "First class accessor labels implemented as lenses";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "fclabels_2_0_4" = callPackage
({ mkDerivation, base, base-orphans, criterion, HUnit, mtl
, template-haskell, transformers
}:
@@ -84193,7 +84162,6 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "First class accessor labels implemented as lenses";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fclabels-monadlib" = callPackage
@@ -85139,23 +85107,6 @@ self: {
}) {};
"fgl" = callPackage
- ({ mkDerivation, array, base, containers, deepseq, hspec
- , microbench, QuickCheck, transformers
- }:
- mkDerivation {
- pname = "fgl";
- version = "5.7.0.1";
- sha256 = "04793yh778ck3kz1z2svnfdwwls2kisbnky4lzvf4zjfgpv7mkpz";
- libraryHaskellDepends = [
- array base containers deepseq transformers
- ];
- testHaskellDepends = [ base containers hspec QuickCheck ];
- benchmarkHaskellDepends = [ base deepseq microbench ];
- description = "Martin Erwig's Functional Graph Library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "fgl_5_7_0_2" = callPackage
({ mkDerivation, array, base, containers, deepseq, hspec
, microbench, QuickCheck, transformers
}:
@@ -85170,7 +85121,6 @@ self: {
benchmarkHaskellDepends = [ base deepseq microbench ];
description = "Martin Erwig's Functional Graph Library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fgl-arbitrary" = callPackage
@@ -86181,6 +86131,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "first-class-instances" = callPackage
+ ({ mkDerivation, base, Cabal, containers, hspec, hspec-discover
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "first-class-instances";
+ version = "0.1.0.0";
+ sha256 = "0d3pay7x31a5d9g4rkb0sflk97qcnpyg3fh81247b6r21gl5qbr3";
+ libraryHaskellDepends = [ base Cabal containers template-haskell ];
+ testHaskellDepends = [
+ base Cabal containers hspec hspec-discover template-haskell
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "First class typeclass instances";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"first-class-patterns" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -86926,26 +86893,6 @@ self: {
}) {};
"flat-mcmc" = callPackage
- ({ mkDerivation, base, formatting, mcmc-types, monad-par
- , monad-par-extras, mwc-probability, pipes, primitive, text
- , transformers, vector
- }:
- mkDerivation {
- pname = "flat-mcmc";
- version = "1.5.0";
- sha256 = "1zgi69vgwss7hhv893n5z3av0byb5hiblha7k3ck4bbfmkgakkl7";
- revision = "1";
- editedCabalFile = "1pjkyvs4c6yx6jva08zw2b1qfhhv9q71sy806f5lddjsknnym2fn";
- libraryHaskellDepends = [
- base formatting mcmc-types monad-par monad-par-extras
- mwc-probability pipes primitive text transformers vector
- ];
- testHaskellDepends = [ base vector ];
- description = "Painless general-purpose sampling";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "flat-mcmc_1_5_1" = callPackage
({ mkDerivation, base, formatting, mcmc-types, monad-par
, monad-par-extras, mwc-probability, pipes, primitive, text
, transformers, vector
@@ -86961,7 +86908,6 @@ self: {
testHaskellDepends = [ base vector ];
description = "Painless general-purpose sampling";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"flat-tex" = callPackage
@@ -90127,18 +90073,6 @@ self: {
}) {};
"from-sum" = callPackage
- ({ mkDerivation, base, doctest, Glob, transformers }:
- mkDerivation {
- pname = "from-sum";
- version = "0.2.2.0";
- sha256 = "05fppk2hkxn67xfl6kdzdp2a5mfz63dv4yx7mvr9fbdrarxrf326";
- libraryHaskellDepends = [ base transformers ];
- testHaskellDepends = [ base doctest Glob ];
- description = "Canonical fromMaybeM and fromEitherM functions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "from-sum_0_2_3_0" = callPackage
({ mkDerivation, base, doctest, Glob, transformers }:
mkDerivation {
pname = "from-sum";
@@ -90148,7 +90082,6 @@ self: {
testHaskellDepends = [ base doctest Glob ];
description = "Combinators for working with Maybe and Either";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fromhtml" = callPackage
@@ -90167,18 +90100,18 @@ self: {
"front" = callPackage
({ mkDerivation, aeson, async, base, blaze-html, blaze-markup
- , bytestring, conduit, fay, fay-dom, fay-websockets, mtl, stm
- , stm-lifted, text, websockets
+ , bytestring, conduit, fay, fay-dom, fay-websockets, mtl, stm, text
+ , websockets
}:
mkDerivation {
pname = "front";
- version = "0.0.0.2";
- sha256 = "106y0qnz5lyvxy69s24fapqkys6i373kl2v51bpkvfwq5ppax0b0";
+ version = "0.0.0.3";
+ sha256 = "0n2w3rcl20njqrxx9ws2jrw3yjrxhxzl6q916apyh07bricmmkw9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson async base blaze-html blaze-markup bytestring conduit fay
- fay-dom fay-websockets mtl stm stm-lifted text websockets
+ fay-dom fay-websockets mtl stm text websockets
];
description = "A reactive frontend web framework";
license = stdenv.lib.licenses.bsd3;
@@ -91360,15 +91293,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "fused-effects_1_0_0_0" = callPackage
+ "fused-effects_1_0_0_1" = callPackage
({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
, inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
, tasty-hunit, transformers
}:
mkDerivation {
pname = "fused-effects";
- version = "1.0.0.0";
- sha256 = "120jvgh35wl5vb2qad8c1dhpr1ddlbhm5b03dy9kcb7d8s89qfs6";
+ version = "1.0.0.1";
+ sha256 = "1v11m8i4ffadfiy3bxwgjcrx5z5gzxv4ciniqzv01b0jxajfkg9g";
libraryHaskellDepends = [ base transformers ];
testHaskellDepends = [
base containers hedgehog hedgehog-fn inspection-testing mtl tasty
@@ -91480,6 +91413,17 @@ self: {
broken = true;
}) {};
+ "fusion-plugin" = callPackage
+ ({ mkDerivation, base, ghc, syb }:
+ mkDerivation {
+ pname = "fusion-plugin";
+ version = "0.1.0";
+ sha256 = "0qns66bakz2vlvglglz3qjg8f7483sldlm25v5lph8fdkj2psrfx";
+ libraryHaskellDepends = [ base ghc syb ];
+ description = "GHC plugin to make stream fusion more predictable";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"futhark" = callPackage
({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
, blaze-html, bytestring, containers, data-binary-ieee754
@@ -91497,6 +91441,8 @@ self: {
pname = "futhark";
version = "0.14.1";
sha256 = "1bg0r9b0jg9j12lcc6wa684yjm58l020m9x5abpc54cghigywswj";
+ revision = "1";
+ editedCabalFile = "0iqg18jz8lgbh9iq1zgs8j9q5smzzi8w1asryz4dx8y6dl7n97p5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -94504,7 +94450,7 @@ self: {
sed -i "s|\"-s\"|\"\"|" ./Setup.hs
sed -i "s|numJobs (bf bi)++||" ./Setup.hs
'';
- preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH'';
+ preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';
description = "Grammatical Framework";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
@@ -95047,15 +94993,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-lib_8_8_2" = callPackage
+ "ghc-lib_8_8_2_20200205" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
, hpc, pretty, process, time, transformers, unix
}:
mkDerivation {
pname = "ghc-lib";
- version = "8.8.2";
- sha256 = "0dsb41vk9agywzw7nayraq9hhi95vz6aw9yz8jgggh1an4vkg833";
+ version = "8.8.2.20200205";
+ sha256 = "13sq702fv3p8jwvsswxz51lp0h33hd1abxrrflxyqlhz84hn9lk9";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
@@ -95086,15 +95032,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-lib-parser_8_8_2" = callPackage
+ "ghc-lib-parser_8_8_2_20200205" = 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.2";
- sha256 = "0q9pxdwmzm5hr6snpbkn1d3165h0lrdncgid5aqffqwz2hc1d2z0";
+ version = "8.8.2.20200205";
+ sha256 = "17rhzlwya0v6l146hmg6z3j224sr31s2pszspwyab790pncyrxgq";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
@@ -95112,8 +95058,8 @@ self: {
}:
mkDerivation {
pname = "ghc-lib-parser-ex";
- version = "8.8.3.0";
- sha256 = "01xlp9drkwdh5n822x2pvga95lpvwa195lf9wpnx8z9v5sj2lksa";
+ version = "8.8.4.0";
+ sha256 = "17vvqk2kkh8rd7shpdzassijfrdljbgbgm955l75569chsbf5xma";
libraryHaskellDepends = [
base bytestring ghc-lib-parser uniplate
];
@@ -95285,6 +95231,8 @@ self: {
pname = "ghc-paths";
version = "0.1.0.12";
sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf";
+ revision = "1";
+ editedCabalFile = "1gb4hn87a78j1c2y1adi81y03irzkaxywscjkphfajsxc7f0ydw5";
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base ];
description = "Knowledge of GHC's installation directories";
@@ -95648,6 +95596,30 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-typelits-extra_0_3_3" = callPackage
+ ({ mkDerivation, base, containers, ghc, ghc-prim
+ , ghc-tcplugins-extra, ghc-typelits-knownnat
+ , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
+ , transformers
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-extra";
+ version = "0.3.3";
+ sha256 = "0gdnp7pp3v5742qs9vkg2bh1sws9bcc11z4119fdapflglqq22mc";
+ libraryHaskellDepends = [
+ base containers ghc ghc-prim ghc-tcplugins-extra
+ ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
+ transformers
+ ];
+ testHaskellDepends = [
+ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+ tasty-hunit
+ ];
+ description = "Additional type-level operations on GHC.TypeLits.Nat";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-typelits-knownnat" = callPackage
({ mkDerivation, base, ghc, ghc-tcplugins-extra
, ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -95668,15 +95640,15 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "ghc-typelits-knownnat_0_7_1" = callPackage
+ "ghc-typelits-knownnat_0_7_2" = 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.1";
- sha256 = "00pfkb6iw4isfmp0jmcqsqyb84xf6b4xnljn3bmax2x8ci9vpm0c";
+ version = "0.7.2";
+ sha256 = "1wdippdn029rpd1v3mk470gyp8v13d2bna8p8q6cn7q7nhm1dhhc";
libraryHaskellDepends = [
base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise
template-haskell transformers
@@ -95705,16 +95677,18 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "ghc-typelits-natnormalise_0_7" = callPackage
+ "ghc-typelits-natnormalise_0_7_1" = callPackage
({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
- , integer-gmp, tasty, tasty-hunit, template-haskell, transformers
+ , integer-gmp, syb, tasty, tasty-hunit, template-haskell
+ , transformers
}:
mkDerivation {
pname = "ghc-typelits-natnormalise";
- version = "0.7";
- sha256 = "1rfw67hhhka3ga8v3224ain7jvdc390glz5cr7vvxm1yqs1wgwx4";
+ version = "0.7.1";
+ sha256 = "1sbwzbs3bnvyla44kcsxs6h12sdfqzbm6n0swy2scp5p271fr0i3";
libraryHaskellDepends = [
- base containers ghc ghc-tcplugins-extra integer-gmp transformers
+ base containers ghc ghc-tcplugins-extra integer-gmp syb
+ transformers
];
testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
@@ -95723,19 +95697,18 @@ self: {
}) {};
"ghc-typelits-presburger" = callPackage
- ({ mkDerivation, base, containers, equational-reasoning, ghc
- , ghc-tcplugins-extra, mtl, pretty, reflection, singletons, syb
- , transformers
+ ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl
+ , pretty, reflection, syb, transformers
}:
mkDerivation {
pname = "ghc-typelits-presburger";
- version = "0.2.0.5";
- sha256 = "03n6ddvn6p1nk6yw141zdw60iqda7k3sbaacc9s04mmnmshvia1n";
+ version = "0.3.0.0";
+ sha256 = "1jahwmy2cywnnlvrjizak1wqih7pki9r35qazcz7mih68pd9gnhz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers equational-reasoning ghc ghc-tcplugins-extra mtl
- pretty reflection singletons syb transformers
+ base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
+ transformers
];
description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
license = stdenv.lib.licenses.bsd3;
@@ -96017,15 +95990,16 @@ self: {
, haddock-library, hashable, haskell-lsp, haskell-lsp-types
, hie-bios, hslogger, lens, lsp-test, mtl, network-uri
, optparse-applicative, parser-combinators, prettyprinter
- , prettyprinter-ansi-terminal, regex-tdfa, rope-utf16-splay
- , safe-exceptions, shake, sorted-list, stm, syb, tasty
- , tasty-expected-failure, tasty-hunit, text, time, transformers
- , unix, unordered-containers, utf8-string
+ , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
+ , regex-tdfa, rope-utf16-splay, safe-exceptions, shake, sorted-list
+ , stm, syb, tasty, tasty-expected-failure, tasty-hunit
+ , tasty-quickcheck, text, time, transformers, unix
+ , unordered-containers, utf8-string
}:
mkDerivation {
pname = "ghcide";
- version = "0.0.6";
- sha256 = "1vp0x4z0444zz8zaibk1r8lb0xjymdqpagm87xsf3csbzkqfhsjb";
+ version = "0.1.0";
+ sha256 = "0yb8k64wnm9dx93925ddlwy8kimd6a44m9azs9d5x6nahigi406m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -96043,8 +96017,10 @@ self: {
];
testHaskellDepends = [
aeson base bytestring containers directory extra filepath ghc
- ghc-typelits-knownnat haskell-lsp-types lens lsp-test
- parser-combinators tasty tasty-expected-failure tasty-hunit text
+ ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types
+ lens lsp-test parser-combinators QuickCheck quickcheck-instances
+ rope-utf16-splay tasty tasty-expected-failure tasty-hunit
+ tasty-quickcheck text
];
description = "The core of an IDE";
license = stdenv.lib.licenses.asl20;
@@ -97682,8 +97658,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "7.20191230";
- sha256 = "1xsd4vhiv3zkcqjh2pxhbkjx75hcalcc9bpdlfc27wzxsxyrwz12";
+ version = "7.20200204";
+ sha256 = "09jf3hbi8gvv0zwyhyyidc3mqjz9p4ji3wg9kh4f0hgx5vcwzsms";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -97738,8 +97714,8 @@ self: {
}:
mkDerivation {
pname = "git-brunch";
- version = "1.1.0.0";
- sha256 = "0nkyq5bgq6mc27j4qrydwjyb8zhhgiyjdbpk9d1xfb0z4c817131";
+ version = "1.1.2.0";
+ sha256 = "02swvnwa5iqnrsw6r709qxy1hjp7df4i0qlhkqhshfdva6xy3376";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -103980,32 +103956,6 @@ self: {
}) {};
"graphviz" = callPackage
- ({ mkDerivation, base, bytestring, colour, containers, criterion
- , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz
- , hspec, hspec-discover, mtl, polyparse, process, QuickCheck
- , temporary, text, wl-pprint-text
- }:
- mkDerivation {
- pname = "graphviz";
- version = "2999.20.0.3";
- sha256 = "04k26zw61nfv1pkd00iaq89pgsaiym0sf4cbzkmm2k2fj5xa587g";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring colour containers directory dlist fgl filepath mtl
- polyparse process temporary text wl-pprint-text
- ];
- testHaskellDepends = [
- base containers fgl fgl-arbitrary filepath hspec QuickCheck text
- ];
- testSystemDepends = [ graphviz ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [ base criterion deepseq text ];
- description = "Bindings to Graphviz for graph visualisation";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) graphviz;};
-
- "graphviz_2999_20_0_4" = callPackage
({ mkDerivation, base, bytestring, colour, containers, criterion
, deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz
, hspec, hspec-discover, mtl, polyparse, process, QuickCheck
@@ -104029,7 +103979,6 @@ self: {
benchmarkHaskellDepends = [ base criterion deepseq text ];
description = "Bindings to Graphviz for graph visualisation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) graphviz;};
"graql" = callPackage
@@ -107525,8 +107474,8 @@ self: {
}:
mkDerivation {
pname = "hackport";
- version = "0.6.3";
- sha256 = "1bj4jafr81xl2dvc8ym29dnp9vmbv7njaqkkfypzvm0ws09mcvh1";
+ version = "0.6.4";
+ sha256 = "185b2mincqzla8j675lv4ydi8fvsj3ikyq4g8jivygbkcpawi5f5";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -107540,7 +107489,7 @@ self: {
testHaskellDepends = [
array base binary bytestring containers deepseq directory
extensible-exceptions filepath HUnit parsec pretty process split
- time unix xml
+ text time transformers unix xml
];
description = "Hackage and Portage integration tool";
license = "GPL";
@@ -107879,17 +107828,14 @@ self: {
}:
mkDerivation {
pname = "haeredes";
- version = "0.5.1";
- sha256 = "1y4r487z2k6l7xi5bi1rb3rz0i7yki2j2mmpnpfdy2bba1s51a6n";
+ version = "0.5.2";
+ sha256 = "0qqz22aghl00hy240hvws3sgaw2jvhqicms0c1y76b68af1dlkyh";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring cmdargs dns iproute parallel-io
];
- testHaskellDepends = [
- base bytestring cmdargs dns doctest filemanip iproute parallel-io
- process
- ];
+ testHaskellDepends = [ base doctest filemanip process ];
description = "Confirm delegation of NS and MX records";
license = stdenv.lib.licenses.agpl3;
}) {};
@@ -109111,8 +109057,8 @@ self: {
({ mkDerivation, base, containers, random }:
mkDerivation {
pname = "hanabi-dealer";
- version = "0.4.0.1";
- sha256 = "1baxmy5lz8w8yjnaslzrmpnwx7rgqixkwbkzfb034024wlb9w0am";
+ version = "0.5.0.0";
+ sha256 = "01dhx6il56pvl9iwaxylyy4sg2gs67w2sr6svahx32lbrnyxnkp8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers random ];
@@ -110214,17 +110160,15 @@ self: {
}) {};
"happy-meta" = callPackage
- ({ mkDerivation, array, base, containers, happy, haskell-src-meta
- , mtl, template-haskell
+ ({ mkDerivation, array, base, containers, fail, happy
+ , haskell-src-meta, mtl, template-haskell
}:
mkDerivation {
pname = "happy-meta";
- version = "0.2.0.9";
- sha256 = "1w3bmwnsg9714kyqxzfrbw0az4i2dqprn2hms3kbdq5984yhi9bg";
- revision = "1";
- editedCabalFile = "1mq8gdq11bqgii498as0078pf8s1mnawh4rvys6hjnd77iaf9nfk";
+ version = "0.2.0.10";
+ sha256 = "1w6shcydpca5g9dgnki0w2xqr9mf17xa18s8hxxm3z3dd0sp1db9";
libraryHaskellDepends = [
- array base containers haskell-src-meta mtl template-haskell
+ array base containers fail haskell-src-meta mtl template-haskell
];
libraryToolDepends = [ happy ];
description = "Quasi-quoter for Happy parsers";
@@ -112172,7 +112116,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp_0_19_0_0" = callPackage
+ "haskell-lsp_0_20_0_1" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, bytestring
, containers, data-default, directory, filepath, hashable
, haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
@@ -112181,8 +112125,8 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.19.0.0";
- sha256 = "0cjmjrcd3rg8jc6rfk73jirmvay07jps9gdjd97clxz90w3mm24i";
+ version = "0.20.0.1";
+ sha256 = "1yy9j61hlar4y8p58q8a0i3c6qmv5h9f53kk48jsvfa59c3dz92b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -112194,7 +112138,7 @@ self: {
testHaskellDepends = [
aeson base bytestring containers data-default directory filepath
hashable hspec lens network-uri QuickCheck quickcheck-instances
- rope-utf16-splay sorted-list stm text
+ rope-utf16-splay sorted-list stm text unordered-containers
];
testToolDepends = [ hspec-discover ];
description = "Haskell library for the Microsoft Language Server Protocol";
@@ -112241,15 +112185,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp-types_0_19_0_0" = callPackage
+ "haskell-lsp-types_0_20_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, deepseq
, filepath, hashable, lens, network-uri, scientific, text
, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.19.0.0";
- sha256 = "089rxcdz02hq68ihc26r7dwsn8hl7f7096vcb0dyd2jda0ganhm9";
+ version = "0.20.0.0";
+ sha256 = "09p0d4vibrm06kj8i1yq9zhnkxl87yg5085l1sy9m20z8j988waq";
libraryHaskellDepends = [
aeson base bytestring data-default deepseq filepath hashable lens
network-uri scientific text unordered-containers
@@ -115584,8 +115528,8 @@ self: {
}:
mkDerivation {
pname = "hasql-th";
- version = "0.4.0.3";
- sha256 = "0j850460d2sz6zwvawyv9913b03iqf58b737y6imgd6k7ddq82hn";
+ version = "0.4.0.4";
+ sha256 = "1kd12vw98wml58sp1dqfq58z0vjjqdssb6q7f6ngs7q6ig27kxfb";
libraryHaskellDepends = [
base bytestring case-insensitive containers contravariant
fast-builder foldl hashable hasql headed-megaparsec megaparsec
@@ -116436,6 +116380,8 @@ self: {
pname = "hblas";
version = "0.4.0.1";
sha256 = "1jclawfvykdsd5b5wmqyz6fb0kx6yr626w4g86w9q1127k8l102k";
+ revision = "1";
+ editedCabalFile = "0085hyl5hcnxjf83vis34qklv6xajsk5z0mzrirgp03nzyf55l7r";
libraryHaskellDepends = [ base primitive storable-complex vector ];
librarySystemDepends = [ blas liblapack ];
testHaskellDepends = [ base hspec primitive vector ];
@@ -117652,8 +117598,8 @@ self: {
pname = "hedgehog";
version = "1.0.2";
sha256 = "1058d5fcv3hhvlx34a8xkg8r75p93l2yhacdbga8d4radiayy34f";
- revision = "1";
- editedCabalFile = "0rcga61rs098y4h44d5144qa7ismibvb44vw97ykazmz5yfg1n9l";
+ revision = "2";
+ editedCabalFile = "1qh7yaijp04li1i10cd5j6bc58fcagynxxmvs32wc8m1fvgzi05w";
libraryHaskellDepends = [
ansi-terminal async base bytestring concurrent-output containers
directory erf exceptions fail lifted-async mmorph monad-control mtl
@@ -117891,6 +117837,16 @@ self: {
broken = true;
}) {};
+ "hedis-envy" = callPackage
+ ({ mkDerivation, base, envy, hedis, scientific, time }:
+ mkDerivation {
+ pname = "hedis-envy";
+ version = "0.1.0.1";
+ sha256 = "165a7pw1i1i9gxljmx03zavza5qjyir09bwk067cfr5an9razvq6";
+ libraryHaskellDepends = [ base envy hedis scientific time ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hedis-monadic" = callPackage
({ mkDerivation, base, hedis, monad-control, mtl, transformers
, transformers-base, transformers-compat
@@ -118612,8 +118568,8 @@ self: {
}:
mkDerivation {
pname = "heredocs";
- version = "0.1.5";
- sha256 = "1bmih3jwmx8dv128rb9w1682fp3w0f6i7hhyyakswy7a04q34ryi";
+ version = "0.1.6";
+ sha256 = "12qsa6vcdc255dx7dc4nfmgy3aam7w6qy92x4811mxx4mxrsr81r";
libraryHaskellDepends = [
base bytestring doctest parsec template-haskell text
];
@@ -120291,27 +120247,28 @@ self: {
}) {};
"hie-bios" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, conduit
- , conduit-extra, containers, cryptohash-sha1, deepseq, directory
- , extra, file-embed, filepath, ghc, hslogger, process, tasty
- , tasty-hunit, temporary, text, time, transformers, unix-compat
- , unordered-containers, vector, yaml
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
+ , directory, extra, file-embed, filepath, ghc, hslogger, process
+ , tasty, tasty-hunit, temporary, text, time, transformers
+ , unix-compat, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hie-bios";
- version = "0.3.2";
- sha256 = "1609rvjgh1laqxl4c1bh0j3bq5yysbbaflx6hn8npr0ckq2ckvir";
+ version = "0.4.0";
+ sha256 = "1pa8wjj6sml39371f355z46304jzzwpcr62q0qzrpqq8w9017241";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base base16-bytestring bytestring conduit conduit-extra containers
- cryptohash-sha1 deepseq directory extra file-embed filepath ghc
- hslogger process temporary text time transformers unix-compat
- unordered-containers vector yaml
+ aeson base base16-bytestring bytestring conduit conduit-extra
+ containers cryptohash-sha1 deepseq directory extra file-embed
+ filepath ghc hslogger process temporary text time transformers
+ unix-compat unordered-containers vector yaml
];
executableHaskellDepends = [ base directory filepath ghc ];
testHaskellDepends = [
- base directory filepath ghc tasty tasty-hunit
+ base directory extra filepath ghc tasty tasty-hunit text
+ unordered-containers yaml
];
description = "Set up a GHC API session";
license = stdenv.lib.licenses.bsd3;
@@ -121815,18 +121772,6 @@ self: {
license = "(BSD-2-Clause OR Apache-2.0)";
}) {};
- "hkd-default" = callPackage
- ({ mkDerivation, aeson, base }:
- mkDerivation {
- pname = "hkd-default";
- version = "1.1.0.0";
- sha256 = "1ff8sfd68a06s7kfc85ww6w5wm7m0f70vd2bi0lbkj0r14rsn7vg";
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ aeson base ];
- description = "Apply default value for optional field of HKD";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
"hkd-delta" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -122089,8 +122034,8 @@ self: {
}:
mkDerivation {
pname = "hledger-flow";
- version = "0.12.4.0";
- sha256 = "1j5hhh06xrdzdpzvvk8gg2mzhsmyk9xvxbpvjy0sg3mmpa27vr6f";
+ version = "0.13.0.0";
+ sha256 = "0lgjb35mpjnyqdc4lr5g2q88nhjbh4znkw9xmlc7vlf1bpa27a8a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -122410,8 +122355,8 @@ self: {
}:
mkDerivation {
pname = "hlint";
- version = "2.2.9";
- sha256 = "1six65y2x89q4a1kz5vm3pcjpwpp423h8nzp6kjka6cm5hn5ahdp";
+ version = "2.2.10";
+ sha256 = "1zna80g34zzxz0cazg0w3cqx2cmlvzd82ajyhypwp9anbc10l7h4";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -123543,15 +123488,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hoauth2_1_10_2" = callPackage
+ "hoauth2_1_11_0" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, exceptions
, http-conduit, http-types, microlens, text, unordered-containers
, uri-bytestring, uri-bytestring-aeson
}:
mkDerivation {
pname = "hoauth2";
- version = "1.10.2";
- sha256 = "04kdz01pg32p1ci9rqnkkbk2ch6bgyqq9v7cbfpdxqp0hyfhv2jl";
+ version = "1.11.0";
+ sha256 = "0pf558n93gqksfgsjlvwcly2lq86adkcbqjqsq4p73kwwzs6dka8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -125576,6 +125521,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hpc-codecov" = callPackage
+ ({ mkDerivation, array, base, bytestring, directory, filepath, hpc
+ , tar, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "hpc-codecov";
+ version = "0.1.0.0";
+ sha256 = "1kr245qsdq60lvg1y9krpd19z9svwi2w9843b39hbv9fxzs7zcia";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bytestring directory filepath hpc
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base directory filepath tar tasty tasty-hunit
+ ];
+ description = "Generate codecov report from hpc data";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hpc-coveralls" = callPackage
({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
, containers, curl, directory, directory-tree, hpc, HUnit, process
@@ -125801,8 +125767,8 @@ self: {
}:
mkDerivation {
pname = "hpqtypes";
- version = "1.8.0.0";
- sha256 = "07n4w2ylmx1swdqvd1hbrh2bch6qx54vxdzw0px6n0b01nadn2gr";
+ version = "1.8.0.1";
+ sha256 = "1zn6qzpxvpdiim12lma7viq96j3jadvlcw188iknjqyn15kri9my";
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
aeson async base bytestring containers exceptions lifted-base
@@ -125830,8 +125796,8 @@ self: {
}:
mkDerivation {
pname = "hpqtypes-extras";
- version = "1.10.1.0";
- sha256 = "13ja18jk0w3c9jzys72fddpgx74cr4p5bap6l0jckb61wbj1m6zl";
+ version = "1.10.2.0";
+ sha256 = "16x7innivjrnsamn6lrjg1a2v0wy1w6r3ariw3ncrwfpcfdmr45n";
libraryHaskellDepends = [
base base16-bytestring bytestring containers cryptohash exceptions
fields-json hpqtypes lifted-base log-base monad-control mtl safe
@@ -127172,6 +127138,8 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "Create ATS types from Haskell types";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hs2bf" = callPackage
@@ -133707,7 +133675,7 @@ self: {
broken = true;
}) {};
- "hw-balancedparens_0_3_0_3" = callPackage
+ "hw-balancedparens_0_3_0_4" = callPackage
({ mkDerivation, base, criterion, deepseq, doctest
, doctest-discover, hedgehog, hspec, hspec-discover, hw-bits
, hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim
@@ -133715,8 +133683,8 @@ self: {
}:
mkDerivation {
pname = "hw-balancedparens";
- version = "0.3.0.3";
- sha256 = "07jng6plapizb0kazqfd4x7y5yazhggwvagkwc273a92ynw57bsi";
+ version = "0.3.0.4";
+ sha256 = "1f25czr55c8fsb1l2ljfr93x2fp888g78ngf45xampnr6m3468j3";
libraryHaskellDepends = [
base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
hw-rankselect-base vector
@@ -134036,8 +134004,8 @@ self: {
}:
mkDerivation {
pname = "hw-excess";
- version = "0.2.2.2";
- sha256 = "1iwml6il5vanx06vbn2apf1vcmimg7mw2ddqq1xy40ma7brirxsz";
+ version = "0.2.2.3";
+ sha256 = "1rlw53nbhjdvjqb1f0kacnmiiwhx04az6p4mf0iv5fwxcjh94q2r";
libraryHaskellDepends = [
base hw-bits hw-prim hw-rankselect-base safe vector
];
@@ -134660,17 +134628,18 @@ self: {
broken = true;
}) {};
- "hw-rankselect_0_13_3_1" = callPackage
+ "hw-rankselect_0_13_3_2" = callPackage
({ mkDerivation, base, bytestring, conduit, criterion, deepseq
- , directory, generic-lens, hedgehog, hspec, hspec-discover
- , hw-balancedparens, hw-bits, hw-fingertree, hw-hedgehog
- , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens, mmap, mtl
- , optparse-applicative, QuickCheck, resourcet, transformers, vector
+ , directory, doctest, doctest-discover, generic-lens, hedgehog
+ , hspec, hspec-discover, hw-balancedparens, hw-bits, hw-fingertree
+ , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
+ , mmap, mtl, optparse-applicative, QuickCheck, resourcet
+ , transformers, vector
}:
mkDerivation {
pname = "hw-rankselect";
- version = "0.13.3.1";
- sha256 = "05bhc8i6k59zv90r00c6vy4vx99dpc4dh85dinwklh8yqnfwf5ks";
+ version = "0.13.3.2";
+ sha256 = "1p4b5nm8mgxlc7p5gcwh6dy85xgydpbw999zv27755dbfcv9nk4v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -134682,10 +134651,11 @@ self: {
mmap mtl optparse-applicative vector
];
testHaskellDepends = [
- base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
- hw-prim hw-rankselect-base mmap QuickCheck transformers vector
+ base directory doctest doctest-discover hedgehog hspec hw-bits
+ hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap
+ QuickCheck transformers vector
];
- testToolDepends = [ hspec-discover ];
+ testToolDepends = [ doctest-discover hspec-discover ];
benchmarkHaskellDepends = [
base bytestring conduit criterion directory hw-bits hw-prim
hw-rankselect-base mmap resourcet vector
@@ -143983,25 +143953,6 @@ self: {
}) {};
"json-feed" = callPackage
- ({ mkDerivation, aeson, base, bytestring, filepath, hspec
- , mime-types, network-uri, tagsoup, text, time
- }:
- mkDerivation {
- pname = "json-feed";
- version = "1.0.7";
- sha256 = "0rjszis4l0sb15v2gjiwnq6avl4bkqp186v449ms4qwbbqz11sc7";
- libraryHaskellDepends = [
- aeson base bytestring mime-types network-uri tagsoup text time
- ];
- testHaskellDepends = [
- aeson base bytestring filepath hspec mime-types network-uri tagsoup
- text time
- ];
- description = "JSON Feed";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "json-feed_1_0_8" = callPackage
({ mkDerivation, aeson, base, bytestring, filepath, hspec
, mime-types, network-uri, tagsoup, text, time
}:
@@ -144018,7 +143969,6 @@ self: {
];
description = "JSON Feed";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"json-fu" = callPackage
@@ -145402,32 +145352,6 @@ self: {
}) {};
"kanji" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
- , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
- , optparse-applicative, tasty, tasty-hunit, text, transformers
- }:
- mkDerivation {
- pname = "kanji";
- version = "3.4.0.2";
- sha256 = "017j8nwmwfbkxyaxjfp75js578kv6g5k7szsc46kidbw4l68dwmy";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base containers deepseq hashable text
- ];
- executableHaskellDepends = [
- aeson aeson-pretty base containers microlens microlens-aeson
- optparse-applicative text transformers
- ];
- testHaskellDepends = [
- aeson base containers HUnit-approx tasty tasty-hunit text
- ];
- benchmarkHaskellDepends = [ aeson base containers criterion text ];
- description = "Perform æ¼¢å—検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "kanji_3_4_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
, deepseq, hashable, HUnit-approx, microlens, microlens-aeson
, optparse-applicative, tasty, tasty-hunit, text, transformers
@@ -145451,7 +145375,6 @@ self: {
benchmarkHaskellDepends = [ aeson base containers criterion text ];
description = "Perform æ¼¢å—検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"kansas-comet" = callPackage
@@ -146630,26 +146553,6 @@ self: {
}) {};
"keys" = callPackage
- ({ mkDerivation, array, base, comonad, containers, free, hashable
- , semigroupoids, semigroups, tagged, transformers
- , transformers-compat, unordered-containers
- }:
- mkDerivation {
- pname = "keys";
- version = "3.12.2";
- sha256 = "1mw4c0dd21hmzhidf84p6fxrin7k05l2iz8iar3m7k5vbxihlldj";
- revision = "1";
- editedCabalFile = "1cx5bwd32mpqdgllrkld254a8ydks196m3j9dvm3razg8mxnz2x6";
- libraryHaskellDepends = [
- array base comonad containers free hashable semigroupoids
- semigroups tagged transformers transformers-compat
- unordered-containers
- ];
- description = "Keyed functors and containers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "keys_3_12_3" = callPackage
({ mkDerivation, array, base, comonad, containers, free, hashable
, semigroupoids, semigroups, tagged, transformers
, transformers-compat, unordered-containers
@@ -146665,7 +146568,6 @@ self: {
];
description = "Keyed functors and containers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"keysafe" = callPackage
@@ -147492,6 +147394,22 @@ self: {
broken = true;
}) {};
+ "kubernetes-webhook-haskell" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+ , text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "kubernetes-webhook-haskell";
+ version = "0.2.0.0";
+ sha256 = "0yxavjq6xxia81yfw7skgdmirbq0wmlvbsklppq6a6y1m6drbyww";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring binary bytestring text
+ unordered-containers
+ ];
+ description = "Create Kubernetes Admission Webhooks in Haskell";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"kuifje" = callPackage
({ mkDerivation, base, boxes, containers, lens }:
mkDerivation {
@@ -147746,18 +147664,6 @@ self: {
}) {};
"lackey" = callPackage
- ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
- mkDerivation {
- pname = "lackey";
- version = "1.0.10";
- sha256 = "13nvrsw29l25ysln0di0bd5lrwnwwp0mkwvymdgf2kc2jg7x46dj";
- libraryHaskellDepends = [ base servant servant-foreign text ];
- testHaskellDepends = [ base hspec servant servant-foreign text ];
- description = "Generate Ruby clients from Servant APIs";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "lackey_1_0_11" = callPackage
({ mkDerivation, base, hspec, servant, servant-foreign, text }:
mkDerivation {
pname = "lackey";
@@ -147767,7 +147673,6 @@ self: {
testHaskellDepends = [ base hspec servant servant-foreign text ];
description = "Generate Ruby clients from Servant APIs";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lacroix" = callPackage
@@ -148729,16 +148634,16 @@ self: {
({ mkDerivation, alex, ansi-wl-pprint, array, base
, composition-prelude, containers, criterion, deepseq, happy, hspec
, hspec-dirstream, microlens, recursion, system-filepath
- , transformers
+ , these-skinny, transformers
}:
mkDerivation {
pname = "language-ats";
- version = "1.7.7.0";
- sha256 = "17p0wv3zbs8jj9jdcc6cg0g5snfyj418mx4b5299wddr5s99jmfi";
+ version = "1.7.7.1";
+ sha256 = "13d1hna3kgvyfihjn3639j8i1drpw65j3ksb5zh3dqi999ia6zs2";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint array base composition-prelude containers deepseq
- microlens recursion transformers
+ microlens recursion these-skinny transformers
];
libraryToolDepends = [ alex happy ];
testHaskellDepends = [
@@ -148747,6 +148652,24 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "Parser and pretty-printer for ATS";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "language-avro" = callPackage
+ ({ mkDerivation, avro, base, filepath, hspec, megaparsec, text
+ , vector
+ }:
+ mkDerivation {
+ pname = "language-avro";
+ version = "0.1.0.0";
+ sha256 = "1nns0qlzrcmlfivv2p4qdhni6ngx3r0926z6kmybmqi3jk7wibhw";
+ libraryHaskellDepends = [
+ avro base filepath megaparsec text vector
+ ];
+ testHaskellDepends = [ avro base hspec megaparsec text vector ];
+ description = "Language definition and parser for AVRO files";
+ license = stdenv.lib.licenses.asl20;
}) {};
"language-bash" = callPackage
@@ -149627,57 +149550,14 @@ self: {
({ mkDerivation, base, megaparsec, text }:
mkDerivation {
pname = "language-protobuf";
- version = "1.0";
- sha256 = "1qg9c862srf7klcan53sa92ylnfx6xz8b1jqgw6rmpznfsw4h2c8";
+ version = "1.0.1";
+ sha256 = "1wxihyf320xsqi114dbl2cwylkc261d5wgd7migb1lh23gxnhhz2";
libraryHaskellDepends = [ base megaparsec text ];
description = "Language definition and parser for Protocol Buffers";
license = stdenv.lib.licenses.asl20;
}) {};
"language-puppet" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
- , base16-bytestring, bytestring, case-insensitive, containers
- , cryptonite, directory, filecache, filepath, formatting, Glob
- , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
- , http-client, lens, lens-aeson, megaparsec, memory, mtl
- , operational, optparse-applicative, parsec, parser-combinators
- , pcre-utils, protolude, random, regex-pcre-builtin, scientific
- , servant, servant-client, split, stm, strict-base-types, temporary
- , text, time, transformers, unix, unordered-containers, vector
- , yaml
- }:
- mkDerivation {
- pname = "language-puppet";
- version = "1.4.6.1";
- sha256 = "0w1ffflnzlcwfc4zhn1zlrdhapdniy67wy0z2pa6qgkvxv52rlxd";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
- case-insensitive containers cryptonite directory filecache filepath
- formatting hashable hruby hslogger http-api-data http-client lens
- lens-aeson megaparsec memory mtl operational parsec
- parser-combinators pcre-utils protolude random regex-pcre-builtin
- scientific servant servant-client split stm strict-base-types text
- time transformers unix unordered-containers vector yaml
- ];
- executableHaskellDepends = [
- aeson ansi-wl-pprint async base bytestring containers Glob hslogger
- http-client lens mtl optparse-applicative regex-pcre-builtin
- strict-base-types text transformers unordered-containers vector
- yaml
- ];
- testHaskellDepends = [
- base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
- pcre-utils scientific strict-base-types temporary text transformers
- unordered-containers vector
- ];
- description = "Tools to parse and evaluate the Puppet DSL";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "language-puppet_1_4_6_2" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
, base16-bytestring, bytestring, case-insensitive, containers
, cryptonite, directory, filecache, filepath, formatting, Glob
@@ -149718,7 +149598,6 @@ self: {
];
description = "Tools to parse and evaluate the Puppet DSL";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"language-python" = callPackage
@@ -149985,6 +149864,17 @@ self: {
broken = true;
}) {};
+ "laop" = callPackage
+ ({ mkDerivation, base, deepseq }:
+ mkDerivation {
+ pname = "laop";
+ version = "0.1.0.3";
+ sha256 = "0fhn7gl2mfm14bmqvay8wrzqcszgnh94byxr065hsxy2zq6kmyc6";
+ libraryHaskellDepends = [ base deepseq ];
+ testHaskellDepends = [ base deepseq ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lapack" = callPackage
({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms
, comfort-array, data-ref, deepseq, fixed-length
@@ -151334,29 +151224,29 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "lens_4_18_1" = callPackage
- ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
- , Cabal, cabal-doctest, call-stack, comonad, containers
+ "lens_4_19" = callPackage
+ ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+ , bytestring, Cabal, cabal-doctest, call-stack, comonad, containers
, contravariant, criterion, deepseq, directory, distributive
, doctest, exceptions, filepath, free, generic-deriving, ghc-prim
, hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
, QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
, tagged, template-haskell, test-framework, test-framework-hunit
, test-framework-quickcheck2, test-framework-th, text
- , th-abstraction, transformers, transformers-compat, type-equality
+ , th-abstraction, transformers, transformers-compat
, unordered-containers, vector
}:
mkDerivation {
pname = "lens";
- version = "4.18.1";
- sha256 = "1lmxjaj32v06l12gy00rpjp2lk1cblh3k7kwklk655ss2vas61ri";
+ version = "4.19";
+ sha256 = "1696835nvzfgvkwrhka2lmjbq08dhkqpcp9iqj5ws7bws7ja3xaf";
setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
libraryHaskellDepends = [
array base base-orphans bifunctors bytestring call-stack comonad
containers contravariant distributive exceptions filepath free
ghc-prim hashable kan-extensions mtl parallel profunctors
reflection semigroupoids tagged template-haskell text
- th-abstraction transformers transformers-compat type-equality
+ th-abstraction transformers transformers-compat
unordered-containers vector
];
testHaskellDepends = [
@@ -151367,7 +151257,7 @@ self: {
unordered-containers vector
];
benchmarkHaskellDepends = [
- base bytestring comonad containers criterion deepseq
+ base base-compat bytestring comonad containers criterion deepseq
generic-deriving transformers unordered-containers vector
];
description = "Lenses, Folds and Traversals";
@@ -151488,6 +151378,17 @@ self: {
broken = true;
}) {};
+ "lens-csv" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, lens }:
+ mkDerivation {
+ pname = "lens-csv";
+ version = "0.1.0.0";
+ sha256 = "1sfglf9g6ac14f85bjabbmvjijrd76asm8kzbrlvkzvv7bhiw8sk";
+ libraryHaskellDepends = [ base bytestring cassava lens ];
+ testHaskellDepends = [ base bytestring cassava lens ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lens-datetime" = callPackage
({ mkDerivation, base, lens, time }:
mkDerivation {
@@ -152693,28 +152594,6 @@ self: {
}) {};
"libmpd" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers
- , data-default-class, filepath, hspec, mtl, network, old-locale
- , QuickCheck, safe-exceptions, text, time, unix, utf8-string
- }:
- mkDerivation {
- pname = "libmpd";
- version = "0.9.0.10";
- sha256 = "0vy287mn1vk8kvij5i3hc0p02l886cpsq5dds7kl6g520si3abkb";
- libraryHaskellDepends = [
- attoparsec base bytestring containers data-default-class filepath
- mtl network old-locale safe-exceptions text time utf8-string
- ];
- testHaskellDepends = [
- attoparsec base bytestring containers data-default-class filepath
- hspec mtl network old-locale QuickCheck safe-exceptions text time
- unix utf8-string
- ];
- description = "An MPD client library";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "libmpd_0_9_1_0" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, data-default-class, filepath, hspec, mtl, network, old-locale
, QuickCheck, safe-exceptions, text, time, unix, utf8-string
@@ -152734,7 +152613,6 @@ self: {
];
description = "An MPD client library";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"libnix" = callPackage
@@ -153226,8 +153104,8 @@ self: {
({ mkDerivation, base, bytestring, conduit, resourcet }:
mkDerivation {
pname = "libyaml";
- version = "0.1.1.1";
- sha256 = "0qjq0w8gqzzg3lf53mg9avkdd6z609kaacyyzjz0rbjjks4gl1db";
+ version = "0.1.2";
+ sha256 = "1dcpbsjg6n305l07isxmavgp01lbv1qggy16acjyxjlz35pxchlg";
libraryHaskellDepends = [ base bytestring conduit resourcet ];
description = "Low-level, streaming YAML interface";
license = stdenv.lib.licenses.bsd3;
@@ -153558,25 +153436,31 @@ self: {
"lightstep-haskell" = callPackage
({ mkDerivation, async, base, bytestring, chronos, containers
- , http-types, http2-client, http2-client-grpc
+ , deepseq, hashable, http-types, http2-client, http2-client-grpc
, http2-grpc-proto-lens, lens, mtl, proto-lens
, proto-lens-protobuf-types, proto-lens-runtime, random
- , safe-exceptions, stm, text, transformers, unordered-containers
- , wai
+ , safe-exceptions, stm, tasty, tasty-discover, tasty-hunit
+ , tasty-quickcheck, text, transformers, unordered-containers, wai
}:
mkDerivation {
pname = "lightstep-haskell";
- version = "0.5.2";
- sha256 = "0j4dlvw4hhbawwfaxfqmh2bmhqha7902rainvbwi1xw2v73pqwdg";
+ version = "0.6.1";
+ sha256 = "0c3z44wnx67k7n7gw8zs35g79al76fbjk6z20fpvjhmk49gsaspk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- async base bytestring chronos containers http-types http2-client
- http2-client-grpc http2-grpc-proto-lens lens mtl proto-lens
- proto-lens-protobuf-types proto-lens-runtime random safe-exceptions
- stm text transformers unordered-containers wai
+ async base bytestring chronos containers hashable http-types
+ http2-client http2-client-grpc http2-grpc-proto-lens lens mtl
+ proto-lens proto-lens-protobuf-types proto-lens-runtime random
+ safe-exceptions stm text transformers unordered-containers wai
];
executableHaskellDepends = [ async base text ];
+ testHaskellDepends = [
+ base deepseq lens proto-lens proto-lens-protobuf-types
+ proto-lens-runtime tasty tasty-discover tasty-hunit
+ tasty-quickcheck
+ ];
+ testToolDepends = [ tasty-discover ];
description = "LightStep OpenTracing client library";
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -153763,35 +153647,33 @@ self: {
"line-bot-sdk" = callPackage
({ mkDerivation, aeson, aeson-qq, base, base64-bytestring
- , bytestring, cryptohash-sha256, errors, exceptions, free, hspec
+ , bytestring, cryptohash-sha256, deepseq, free, hspec
, hspec-expectations, hspec-wai, http-api-data, http-client
- , http-client-tls, http-types, monad-control, mtl, scientific
- , servant, servant-client, servant-client-core, servant-server
- , streaming, string-conversions, text, time, transformers
- , transformers-base, wai, wai-extra, warp
+ , http-client-tls, http-media, http-types, mtl, scientific, servant
+ , servant-client, servant-client-core, servant-server
+ , string-conversions, text, time, transformers, wai, wai-extra
+ , warp
}:
mkDerivation {
pname = "line-bot-sdk";
- version = "0.5.0.2";
- sha256 = "0b33z5h22mbzxa812phpi73nmilzyvdslh355802wv625br3ljq5";
+ version = "0.5.2";
+ sha256 = "1vrfq9v8lv5nwdmy7n99p7dnm10b35ng5n24ncjq54i0ci2ldi75";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base base64-bytestring bytestring cryptohash-sha256 errors
- exceptions http-api-data http-client http-client-tls http-types
- monad-control mtl scientific servant servant-client
- servant-client-core servant-server streaming string-conversions
- text time transformers transformers-base wai wai-extra
+ aeson base base64-bytestring bytestring cryptohash-sha256 deepseq
+ http-api-data http-client http-client-tls http-media http-types mtl
+ scientific servant servant-client servant-client-core
+ servant-server string-conversions text time transformers wai
];
executableHaskellDepends = [
- base servant servant-client servant-server time transformers wai
- wai-extra warp
+ base servant servant-server transformers wai wai-extra warp
];
testHaskellDepends = [
aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256
- free hspec hspec-expectations hspec-wai http-client http-types
- servant servant-client servant-client-core servant-server text time
- transformers wai warp
+ deepseq free hspec hspec-expectations hspec-wai http-client
+ http-types servant servant-client servant-client-core
+ servant-server text time transformers wai warp
];
description = "Haskell SDK for LINE Messaging API";
license = stdenv.lib.licenses.bsd3;
@@ -153881,6 +153763,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "linear_1_21" = callPackage
+ ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
+ , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq
+ , distributive, doctest, ghc-prim, hashable, HUnit, lens, random
+ , reflection, semigroupoids, semigroups, simple-reflect, tagged
+ , template-haskell, test-framework, test-framework-hunit
+ , transformers, transformers-compat, unordered-containers, vector
+ , void
+ }:
+ mkDerivation {
+ pname = "linear";
+ version = "1.21";
+ sha256 = "1i00j740fpxrbdy1kjzwjxqixk975rd0dh6jxk0da622spabym5a";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ adjunctions base base-orphans binary bytes cereal containers
+ deepseq distributive ghc-prim hashable lens random reflection
+ semigroupoids semigroups tagged template-haskell transformers
+ transformers-compat unordered-containers vector void
+ ];
+ testHaskellDepends = [
+ base binary bytestring deepseq doctest HUnit lens reflection
+ simple-reflect test-framework test-framework-hunit vector
+ ];
+ description = "Linear Algebra";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"linear-accelerate" = callPackage
({ mkDerivation, accelerate, base, Cabal, cabal-doctest
, distributive, doctest, lens, linear
@@ -156429,8 +156340,8 @@ self: {
}:
mkDerivation {
pname = "log-elasticsearch";
- version = "0.10.1.0";
- sha256 = "10a7p0z9bqjfmc04xvqsflwqrhhnxk72kbhk62sh8l1is0i94vcs";
+ version = "0.10.2.0";
+ sha256 = "0kcixyklnak34v8vmmpw8vpm1mvf3wll6xpcdvfg1c75wc9n1hqy";
libraryHaskellDepends = [
aeson aeson-pretty base base64-bytestring bloodhound bytestring
deepseq http-client http-client-tls log-base semigroups text
@@ -156542,29 +156453,30 @@ self: {
}) {};
"log4hs" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers
- , criterion, data-default, directory, filepath, generic-lens, hspec
- , hspec-core, lens, mtl, process, QuickCheck, template-haskell
+ ({ mkDerivation, aeson, aeson-default, aeson-qq, base, bytestring
+ , containers, criterion, directory, filepath, generic-lens, hspec
+ , hspec-core, microlens, mtl, process, QuickCheck, template-haskell
, text, time, vformat, vformat-aeson, vformat-time, yaml
}:
mkDerivation {
pname = "log4hs";
- version = "0.8.0.0";
- sha256 = "15a3xz9bg29ci4yfxmn7dhnblz48cf7ijl27fvqgr8j4b3m8z4hn";
+ version = "0.9.0.0";
+ sha256 = "0hr6qm721jlpz6f45rb1d6wh4y5gk0n94a0l9wflwz6vnr77147x";
libraryHaskellDepends = [
- aeson base bytestring containers data-default directory filepath
- generic-lens lens mtl template-haskell text time vformat
+ aeson aeson-default base bytestring containers directory filepath
+ generic-lens microlens mtl template-haskell text time vformat
vformat-aeson vformat-time yaml
];
testHaskellDepends = [
- aeson aeson-qq base bytestring containers data-default directory
- filepath generic-lens hspec hspec-core lens mtl process QuickCheck
- template-haskell text time vformat vformat-aeson vformat-time yaml
+ aeson aeson-default aeson-qq base bytestring containers directory
+ filepath generic-lens hspec hspec-core microlens mtl process
+ QuickCheck template-haskell text time vformat vformat-aeson
+ vformat-time yaml
];
benchmarkHaskellDepends = [
- aeson aeson-qq base bytestring containers criterion data-default
- directory filepath generic-lens lens mtl template-haskell text time
- vformat vformat-aeson vformat-time yaml
+ aeson aeson-default aeson-qq base bytestring containers criterion
+ directory filepath generic-lens microlens mtl template-haskell text
+ time vformat vformat-aeson vformat-time yaml
];
description = "A python logging style log library";
license = stdenv.lib.licenses.bsd3;
@@ -156658,29 +156570,6 @@ self: {
}) {};
"logging-effect" = callPackage
- ({ mkDerivation, async, base, bytestring, criterion, exceptions
- , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
- , prettyprinter, semigroups, stm, stm-delay, text, time
- , transformers, transformers-base, unliftio-core
- }:
- mkDerivation {
- pname = "logging-effect";
- version = "1.3.8";
- sha256 = "0ksavyvcz0c9fadik9yksm4zskzh313srf3713migwrdza5ci5q3";
- libraryHaskellDepends = [
- async base exceptions free monad-control mtl prettyprinter
- semigroups stm stm-delay text time transformers transformers-base
- unliftio-core
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion fast-logger lifted-async monad-logger
- prettyprinter text time
- ];
- description = "A mtl-style monad transformer for general purpose & compositional logging";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "logging-effect_1_3_9" = callPackage
({ mkDerivation, async, base, bytestring, criterion, exceptions
, fast-logger, free, lifted-async, monad-control, monad-logger, mtl
, prettyprinter, semigroups, stm, stm-delay, text, time
@@ -156701,7 +156590,6 @@ self: {
];
description = "A mtl-style monad transformer for general purpose & compositional logging";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"logging-effect-extra" = callPackage
@@ -157656,7 +157544,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "lsp-test_0_10_0_0" = callPackage
+ "lsp-test_0_10_1_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
, bytestring, conduit, conduit-parse, containers, data-default
, Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
@@ -157665,8 +157553,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.10.0.0";
- sha256 = "0fs4zq5xz42jp2x42p8nbswahfb5g0mmdwbrc8i65nx81q6fpxjg";
+ version = "0.10.1.0";
+ sha256 = "1f1ab7gn5bgdlhlayrrrhk6d8iyf971pia6hb23jjyqz9j0vl7ac";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -158318,6 +158206,8 @@ self: {
];
description = "Bindings to LZ4";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lz4-conduit" = callPackage
@@ -158358,15 +158248,17 @@ self: {
"lzlib" = callPackage
({ mkDerivation, base, bytestring, c2hs, criterion, directory
- , filepath, hspec, temporary
+ , filepath, hspec, pathological-bytestrings, temporary
}:
mkDerivation {
pname = "lzlib";
- version = "0.3.3.0";
- sha256 = "140m7rivdrak5vcg473gp3ns54xy47k2xyv5z86z2s0ncf204ak6";
+ version = "1.0.1.0";
+ sha256 = "0zajkhck36p4fgy40rsd2zsd3ja7i9fkizwix38xpwdi1ygrfjxf";
libraryHaskellDepends = [ base bytestring ];
libraryToolDepends = [ c2hs ];
- testHaskellDepends = [ base bytestring directory hspec ];
+ testHaskellDepends = [
+ base bytestring directory hspec pathological-bytestrings
+ ];
benchmarkHaskellDepends = [
base bytestring criterion filepath temporary
];
@@ -159133,8 +159025,8 @@ self: {
}:
mkDerivation {
pname = "mailbox-count";
- version = "0.0.2";
- sha256 = "1zd3vd0sj4pq8nhjn768rpfyn9a06a9c3j2fnhxsb9d800ilpvvf";
+ version = "0.0.5";
+ sha256 = "0g1kbb4pmh1vs8ddswpcmqb9fhfkhlffwp9y7r4dq5wcsdihwm8c";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -159147,7 +159039,7 @@ self: {
tasty-hunit
];
description = "Count mailboxes in a SQL database";
- license = stdenv.lib.licenses.gpl3;
+ license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -160054,14 +159946,14 @@ self: {
}) {};
"mapalgebra" = callPackage
- ({ mkDerivation, base, bytestring, containers, criterion, deepseq
- , hmatrix, HUnit-approx, massiv, massiv-io, QuickCheck, tasty
- , tasty-hunit, tasty-quickcheck, vector
+ ({ mkDerivation, base, bytestring, containers, deepseq, hmatrix
+ , HUnit-approx, massiv, massiv-io, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, vector
}:
mkDerivation {
pname = "mapalgebra";
- version = "0.2.0";
- sha256 = "1bz4dg7wh66zpghsdb7d7hdqj5413005m3mcfb73gl7xncf21mk5";
+ version = "0.2.1";
+ sha256 = "0ymcbq3mb46qx61zl0yfvbk65lx1cqhshnpwsf8cnwysv3b38vhl";
libraryHaskellDepends = [
base bytestring containers deepseq hmatrix massiv massiv-io vector
];
@@ -160069,9 +159961,6 @@ self: {
base containers hmatrix HUnit-approx massiv QuickCheck tasty
tasty-hunit tasty-quickcheck vector
];
- benchmarkHaskellDepends = [
- base criterion hmatrix massiv massiv-io vector
- ];
description = "Efficient, polymorphic Map Algebra";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -160651,6 +160540,31 @@ self: {
broken = true;
}) {};
+ "massiv-io_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
+ , data-default-class, deepseq, doctest, exceptions, filepath, hspec
+ , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
+ , template-haskell, unliftio, vector
+ }:
+ mkDerivation {
+ pname = "massiv-io";
+ version = "0.2.0.0";
+ sha256 = "1gypn2srqsnzmx1jd28632w34n7z4x5wadi4m7srxdhwk14vqg2m";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bytestring Color data-default-class deepseq exceptions
+ filepath JuicyPixels massiv netpbm unliftio vector
+ ];
+ testHaskellDepends = [
+ base bytestring doctest hspec JuicyPixels massiv massiv-test
+ QuickCheck random template-haskell
+ ];
+ description = "Import/export of Image files into massiv Arrays";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"massiv-scheduler" = callPackage
({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
, deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell
@@ -167350,7 +167264,7 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
- "mongoDB_2_6_0_0" = callPackage
+ "mongoDB_2_6_0_1" = callPackage
({ mkDerivation, array, base, base16-bytestring, base64-bytestring
, binary, bson, bytestring, conduit, conduit-extra, containers
, criterion, cryptohash, data-default-class, dns, fail, hashtables
@@ -167361,8 +167275,8 @@ self: {
}:
mkDerivation {
pname = "mongoDB";
- version = "2.6.0.0";
- sha256 = "14vf47ss02hf50fd3db48jiqhw51q6fpg7ps03kx45ab1cc527kn";
+ version = "2.6.0.1";
+ sha256 = "1kradm8baaqwp4zniy9ga3a3vwqc2gcz21z0559ffja7y4d757my";
libraryHaskellDepends = [
array base base16-bytestring base64-bytestring binary bson
bytestring conduit conduit-extra containers cryptohash
@@ -170507,18 +170421,18 @@ self: {
"musicScroll" = callPackage
({ mkDerivation, async, base, bytestring, containers, dbus, gi-gtk
- , gi-gtk-hs, gtk3, req, stm, tagsoup, text
+ , gi-gtk-hs, gtk3, mtl, req, stm, tagsoup, text, transformers
}:
mkDerivation {
pname = "musicScroll";
- version = "0.1.1.0";
- sha256 = "0f1i3ys1pfylb5igqwkap0k7v47a2c5vfnhc2flxw9h6aim8yh6h";
+ version = "0.1.2.0";
+ sha256 = "0n0s9vkhfwykghniillih5qgdz4cg1rn4vn86hinxaqfgzv6m96w";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- async base bytestring containers dbus gi-gtk gi-gtk-hs req stm
- tagsoup text
+ async base bytestring containers dbus gi-gtk gi-gtk-hs mtl req stm
+ tagsoup text transformers
];
executableHaskellDepends = [ base ];
executablePkgconfigDepends = [ gtk3 ];
@@ -172376,21 +172290,42 @@ self: {
}) {};
"neat-interpolation" = callPackage
- ({ mkDerivation, base, base-prelude, HTF, megaparsec
- , template-haskell, text
+ ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
+ , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , text
}:
mkDerivation {
pname = "neat-interpolation";
- version = "0.3.2.5";
- sha256 = "09nb0bypjpfxcm71012c2xxfrq5drvd1nhdmnmhk8wc0r8254g8c";
- libraryHaskellDepends = [
- base base-prelude megaparsec template-haskell text
+ version = "0.3.2.6";
+ sha256 = "10k5x47i84nycl54p61l8v1bpvi7mw663vnj8nn1qjpn03anz8z2";
+ libraryHaskellDepends = [ base megaparsec template-haskell text ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
];
- testHaskellDepends = [ base-prelude HTF ];
description = "A quasiquoter for neat and simple multiline text interpolation";
license = stdenv.lib.licenses.mit;
}) {};
+ "neat-interpolation_0_5_1" = callPackage
+ ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
+ , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , text
+ }:
+ mkDerivation {
+ pname = "neat-interpolation";
+ version = "0.5.1";
+ sha256 = "0hfyd74f83mxakahgj6q3wy2r1yg1zbsw1750k7zmwaqn3f8gzjz";
+ libraryHaskellDepends = [ base megaparsec template-haskell text ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "A quasiquoter for neat and simple multiline text interpolation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"needle" = callPackage
({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
, parsec-extra, template-haskell, text, vector
@@ -173648,6 +173583,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "network-byte-order_0_1_4_0" = callPackage
+ ({ mkDerivation, base, bytestring, doctest }:
+ mkDerivation {
+ pname = "network-byte-order";
+ version = "0.1.4.0";
+ sha256 = "1wm59kdvxcjhsl1y1ajmj8w8nq6qdvin6933n374za39lhkb13f9";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [ base bytestring doctest ];
+ description = "Network byte order utilities";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"network-bytestring" = callPackage
({ mkDerivation, base, bytestring, network, unix }:
mkDerivation {
@@ -174433,33 +174381,14 @@ self: {
}) {};
"network-uri" = callPackage
- ({ mkDerivation, base, deepseq, HUnit, parsec, test-framework
- , test-framework-hunit, test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "network-uri";
- version = "2.6.1.0";
- sha256 = "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2";
- revision = "1";
- editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32";
- libraryHaskellDepends = [ base deepseq parsec ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit
- test-framework-quickcheck2
- ];
- description = "URI manipulation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "network-uri_2_7_0_0" = callPackage
({ mkDerivation, base, criterion, deepseq, HUnit, parsec
, template-haskell, test-framework, test-framework-hunit
, test-framework-quickcheck2
}:
mkDerivation {
pname = "network-uri";
- version = "2.7.0.0";
- sha256 = "0sgqw1bi6dv28a3cw2kjxiy1sfjjfwdk5ikmnk1v828inlk7zwgz";
+ version = "2.6.2.0";
+ sha256 = "0fmjc4p6pnzjxyg32pp7xh4wdbpqzp0rya80mccixyracvs1q3nw";
libraryHaskellDepends = [ base deepseq parsec template-haskell ];
testHaskellDepends = [
base criterion deepseq HUnit test-framework test-framework-hunit
@@ -174467,7 +174396,6 @@ self: {
];
description = "URI manipulation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-uri-flag" = callPackage
@@ -175270,8 +175198,8 @@ self: {
}:
mkDerivation {
pname = "niv";
- version = "0.2.12";
- sha256 = "0lbkc49ddkxb6x3miimcd2c4ajwf7d9z0hay54n0gmz7d92ha8q0";
+ version = "0.2.13";
+ sha256 = "11znn37j15gzwg6nh6z4k5ijxyyc7gbirnrwlhh4b8868d9axjfy";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -175282,6 +175210,12 @@ self: {
unliftio unordered-containers
];
executableHaskellDepends = [
+ aeson aeson-pretty ansi-terminal base bytestring directory
+ file-embed filepath hashable http-conduit mtl optparse-applicative
+ process profunctors pureMD5 string-qq text unliftio
+ unordered-containers
+ ];
+ testHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring directory
file-embed filepath hashable http-conduit mtl optparse-applicative
process profunctors pureMD5 string-qq tasty text unliftio
@@ -175357,8 +175291,8 @@ self: {
}:
mkDerivation {
pname = "nix-diff";
- version = "1.0.7";
- sha256 = "0zf09wffmzkk6rbk5nx4qhygpb6m492mz422w9a71dzv1icxkbfs";
+ version = "1.0.8";
+ sha256 = "0073802yrd5f1zfhnbsll9cqcycihw9bac1psfwvcwvihsh3j413";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -177069,6 +177003,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "numhask_0_4_0" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "numhask";
+ version = "0.4.0";
+ sha256 = "1wwhpsrbnaa0nmb9x31wnk66dbvajd54mflvbnifff2dkaha89x1";
+ libraryHaskellDepends = [ base ];
+ description = "numeric classes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"numhask-array" = callPackage
({ mkDerivation, adjunctions, base, deepseq, distributive, doctest
, hedgehog, hmatrix, numhask, numhask-hedgehog, numhask-prelude
@@ -177076,8 +177022,8 @@ self: {
}:
mkDerivation {
pname = "numhask-array";
- version = "0.5.0.0";
- sha256 = "0gx2p7b7xb1x5nfp5szdvsbylqsci9bmmz5jmy86c4z13srxmkkq";
+ version = "0.5.1";
+ sha256 = "1nrk6j4kw0l09b8f7k3sx47ri6i1vy5qygl9zbhhdz8z75s0fzn8";
libraryHaskellDepends = [
adjunctions base deepseq distributive hmatrix numhask
numhask-prelude protolude vector
@@ -177097,8 +177043,8 @@ self: {
}:
mkDerivation {
pname = "numhask-hedgehog";
- version = "0.3.1";
- sha256 = "1glg0lapr0fm06z5s8k4xsi99yx3khay4ynvic3kb1xf0iqay818";
+ version = "0.3.2";
+ sha256 = "1cfvkq5v88d8zhkj8bgn18hmlg52nsprvrmyan9ndxppyzljphan";
libraryHaskellDepends = [
base hedgehog numhask numhask-prelude numhask-space
];
@@ -177131,8 +177077,8 @@ self: {
({ mkDerivation, base, doctest, numhask, protolude }:
mkDerivation {
pname = "numhask-prelude";
- version = "0.3.2";
- sha256 = "1884pm13wyhqwwl9n2k9wv7r7q86x4c682m78291sh6yinrymazk";
+ version = "0.3.3";
+ sha256 = "0r9qf3yrm0lf1jhiyhvgsfc8zyfsllc8xmjwdqx2vsn9vy15p7aw";
libraryHaskellDepends = [ base numhask protolude ];
testHaskellDepends = [ doctest ];
description = "A numeric prelude";
@@ -177299,6 +177245,8 @@ self: {
pname = "nvim-hs";
version = "2.1.0.2";
sha256 = "0amlvrh213n9cfqax5gcy7zq3fd8q9hcskhjkbayvzsyf5hhr1rn";
+ revision = "1";
+ editedCabalFile = "1v52rmk7hbdn40964r50jjz3lanfc5q8xrdqpv1wmwviw3j4rip8";
libraryHaskellDepends = [
base bytestring cereal cereal-conduit conduit containers
data-default deepseq foreign-store hslogger megaparsec messagepack
@@ -179312,19 +179260,21 @@ self: {
}) {};
"opentelemetry" = callPackage
- ({ mkDerivation, async, base, clock, exceptions, hashable, random
- , tasty, tasty-discover, tasty-quickcheck, text
- , unordered-containers
+ ({ mkDerivation, async, attoparsec, base, bytestring, clock
+ , exceptions, hashable, random, tasty, tasty-discover, tasty-hunit
+ , tasty-quickcheck, text, unordered-containers
}:
mkDerivation {
pname = "opentelemetry";
- version = "0.0.0.0";
- sha256 = "14k1lskdan3p7pddch9h0vr56ksyb4vnkm79rn4nlv4m9ycbxs7l";
+ version = "0.0.0.2";
+ sha256 = "15x7swbr18xks8a9xf1hjwibgqxsjigcyrahbnk72p1n1gxkarjr";
libraryHaskellDepends = [
- base clock exceptions hashable random text unordered-containers
+ attoparsec base bytestring clock exceptions hashable random text
+ unordered-containers
];
testHaskellDepends = [
- async base tasty tasty-discover tasty-quickcheck
+ async base bytestring tasty tasty-discover tasty-hunit
+ tasty-quickcheck
];
testToolDepends = [ tasty-discover ];
license = stdenv.lib.licenses.asl20;
@@ -181750,21 +181700,6 @@ self: {
}) {};
"pandoc-csv2table" = callPackage
- ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
- mkDerivation {
- pname = "pandoc-csv2table";
- version = "1.0.7";
- sha256 = "0b6ycr50n24cjlli7jk3dh1shfsl9wqykvmdgabk1s8n2w1ps8sa";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
- executableHaskellDepends = [ base csv pandoc pandoc-types ];
- description = "Convert CSV to Pandoc Table Markdown";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "pandoc-csv2table_1_0_8" = callPackage
({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
mkDerivation {
pname = "pandoc-csv2table";
@@ -181777,7 +181712,6 @@ self: {
executableHaskellDepends = [ base csv pandoc pandoc-types ];
description = "Convert CSV to Pandoc Table Markdown";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pandoc-emphasize-code" = callPackage
@@ -184269,8 +184203,8 @@ self: {
}:
mkDerivation {
pname = "patch";
- version = "0.0.2.0";
- sha256 = "0c9wf996k8py90ld6353hynb96fdird7lm4kx3djaild6iiyiaal";
+ version = "0.0.3.1";
+ sha256 = "1dkms6ngr01d4gvyjbl6z30b6qz4cnxnh0y7advrc9fib0237gnl";
libraryHaskellDepends = [
base constraints-extras containers dependent-map dependent-sum lens
monoidal-containers semialign semigroupoids these transformers
@@ -185866,8 +185800,6 @@ self: {
testHaskellDepends = [ base doctest ];
description = "Perhaps, a monad";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"period" = callPackage
@@ -186117,7 +186049,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
- "persistent_2_10_5" = callPackage
+ "persistent_2_10_5_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, base64-bytestring
, blaze-html, bytestring, conduit, containers, fast-logger, hspec
, http-api-data, monad-logger, mtl, path-pieces, resource-pool
@@ -186127,8 +186059,8 @@ self: {
}:
mkDerivation {
pname = "persistent";
- version = "2.10.5";
- sha256 = "1xrfl7yrjppgbyw5msiayn54k3my4wh77pgmlv3kmp5vybhbfjzj";
+ version = "2.10.5.1";
+ sha256 = "0q95ik7agbld7dhzbr79nqh0v5vg8hk9sl61306y7kknyyy4inbw";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html bytestring
conduit containers fast-logger http-api-data monad-logger mtl
@@ -186385,7 +186317,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "persistent-mysql_2_10_2_2" = callPackage
+ "persistent-mysql_2_10_2_3" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
, containers, fast-logger, hspec, HUnit, monad-logger, mysql
, mysql-simple, persistent, persistent-qq, persistent-template
@@ -186394,8 +186326,8 @@ self: {
}:
mkDerivation {
pname = "persistent-mysql";
- version = "2.10.2.2";
- sha256 = "1b1x673nzqdv3i2rwn4fp4ky9a49dc6vfif1xjajzwf75mffabfb";
+ version = "2.10.2.3";
+ sha256 = "0ymh1gmcslwd8fp2wq71fswjgbmjdxl2mx4xf30j71h0744r2jbf";
libraryHaskellDepends = [
aeson base blaze-builder bytestring conduit containers monad-logger
mysql mysql-simple persistent resource-pool resourcet text
@@ -186492,27 +186424,6 @@ self: {
}) {};
"persistent-pagination" = callPackage
- ({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec
- , hspec-discover, microlens, mtl, persistent, persistent-sqlite
- , persistent-template, QuickCheck, time
- }:
- mkDerivation {
- pname = "persistent-pagination";
- version = "0.1.1.0";
- sha256 = "1g2mn2gv9dygx4rrpxi81421dyyy9pdnzrdpqcb5sygcjsqi17ha";
- libraryHaskellDepends = [
- base conduit esqueleto foldl microlens mtl persistent
- ];
- testHaskellDepends = [
- base conduit containers esqueleto hspec hspec-discover mtl
- persistent persistent-sqlite persistent-template QuickCheck time
- ];
- testToolDepends = [ hspec-discover ];
- description = "Efficient and correct pagination for persistent or esqueleto queries";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "persistent-pagination_0_1_1_1" = callPackage
({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec
, hspec-discover, microlens, mtl, persistent, persistent-sqlite
, persistent-template, QuickCheck, time
@@ -186531,7 +186442,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Efficient and correct pagination for persistent or esqueleto queries";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"persistent-parser" = callPackage
@@ -186865,7 +186775,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
- "persistent-template_2_8_2_1" = callPackage
+ "persistent-template_2_8_2_2" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, deepseq, deepseq-generics, file-embed, hspec, http-api-data
, monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -186874,8 +186784,8 @@ self: {
}:
mkDerivation {
pname = "persistent-template";
- version = "2.8.2.1";
- sha256 = "1w39n6164l99k1p8fk5c9aawbps6p3cmi4xgn123qmcmc1cw0nrj";
+ version = "2.8.2.2";
+ sha256 = "1ka5s373q50q4nqn1w5jqgcvh21m89gmq7i0jcdhidkz5ynvx51k";
libraryHaskellDepends = [
aeson base bytestring containers http-api-data monad-control
monad-logger path-pieces persistent template-haskell text
@@ -188818,8 +188728,8 @@ self: {
pname = "pipes-extras";
version = "1.0.15";
sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82";
- revision = "1";
- editedCabalFile = "0xrd5zwkr1c7lswzi91gxl3ndra8y9g2b4j00sszyy3w187a2zwi";
+ revision = "2";
+ editedCabalFile = "1aprq51r83v5qja9vy01s8d17bnncnvp1mw6h6maxgzh2xppim8b";
libraryHaskellDepends = [ base foldl lens pipes transformers ];
testHaskellDepends = [
base HUnit pipes test-framework test-framework-hunit transformers
@@ -191343,10 +191253,8 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "polyvariadic";
- version = "0.3.0.3";
- sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
- revision = "5";
- editedCabalFile = "1pzqc1hppzlj03wr2hrlm7liq9kcf650mpsrm4chr6msq491na9c";
+ version = "0.3.0.4";
+ sha256 = "17895458cfciv5lkcd26b5a96d9mwklish8xjhn14bd2himyczx0";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base ];
description = "Creation and application of polyvariadic functions";
@@ -194283,6 +194191,8 @@ self: {
pname = "pretty-sop";
version = "0.2.0.3";
sha256 = "10vybwbkqgr3fi13c5qwwhrwns9sdj7zvlkz6vag966pk238gnxy";
+ revision = "1";
+ editedCabalFile = "04gr1aaqaq347rv5vqh93qcnbc53y55hrds73js5329z2j1gbmng";
libraryHaskellDepends = [ base generics-sop pretty-show ];
testHaskellDepends = [ base generics-sop pretty-show ];
testToolDepends = [ markdown-unlit ];
@@ -194482,8 +194392,8 @@ self: {
({ mkDerivation, base, graphviz, prettyprinter, text }:
mkDerivation {
pname = "prettyprinter-graphviz";
- version = "0.1.0.1";
- sha256 = "1h6jr4vh60j54ajsylh41y0iskz5yjgh2879v25z1mw7vfi40kww";
+ version = "0.1.1.0";
+ sha256 = "1x69lgxkby1bvsl91j4a94f1ylsl1imll3lqqpjig7yrxn9wi9xq";
libraryHaskellDepends = [ base graphviz prettyprinter text ];
description = "a prettyprinter backend for graphviz";
license = stdenv.lib.licenses.bsd3;
@@ -194664,6 +194574,8 @@ self: {
pname = "primitive";
version = "0.7.0.0";
sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq";
+ revision = "1";
+ editedCabalFile = "1g10dsdadv8sy9mhhwx4jknzshvxc4qx6z9lmgqy7060prlbqnn4";
libraryHaskellDepends = [ base ghc-prim transformers ];
testHaskellDepends = [
base base-orphans ghc-prim QuickCheck semigroups tagged tasty
@@ -197165,6 +197077,24 @@ self: {
broken = true;
}) {};
+ "provenience" = callPackage
+ ({ mkDerivation, aeson, base, blaze-markup, containers
+ , data-default, fgl, mtl, pandoc, text, time
+ }:
+ mkDerivation {
+ pname = "provenience";
+ version = "0.1.0.1";
+ sha256 = "0z2lsyx59wk663y4p0xwl5sjrl1h3aqlqwig2xhvv9a1cf2bzzd3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base blaze-markup containers data-default fgl mtl pandoc text
+ time
+ ];
+ description = "Computations that automatically track data dependencies";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"proxied" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -200034,6 +199964,18 @@ self: {
broken = true;
}) {};
+ "quiet" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "quiet";
+ version = "0.2";
+ sha256 = "0k2y6aa5c7d0sils11m0r1nk1fmck7iq10wr35v77r6wg5rzd2qi";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "Generic deriving of Read/Show with no record labels";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"quipper" = callPackage
({ mkDerivation, base, quipper-language, quipper-libraries
, quipper-tools
@@ -202066,15 +202008,15 @@ self: {
"raven-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl
, network, random, resourcet, text, time, unordered-containers
- , uuid
+ , uuid-types
}:
mkDerivation {
pname = "raven-haskell";
- version = "0.1.3.0";
- sha256 = "0jd0xxrliqc85mifkqzblc3fi6xjgkwkqxijqjx42r5jc0m1qs7f";
+ version = "0.1.4.0";
+ sha256 = "136vszzvfmhpxzavl7smnbyn45w026j005cdknapxhb6v495b7qz";
libraryHaskellDepends = [
aeson base bytestring http-conduit mtl network random resourcet
- text time unordered-containers uuid
+ text time unordered-containers uuid-types
];
testHaskellDepends = [
aeson base bytestring hspec time unordered-containers
@@ -206948,12 +206890,12 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "replace-megaparsec_1_2_0_0" = callPackage
+ "replace-megaparsec_1_2_1_0" = callPackage
({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
mkDerivation {
pname = "replace-megaparsec";
- version = "1.2.0.0";
- sha256 = "0s9iqx4skv4dgj126b1g8903hi2g967pka695jmhi35sdwjsqc7l";
+ version = "1.2.1.0";
+ sha256 = "1k00a6xqdk8fgcja0v0flydk3afrpdrn4cf1csin7waqkl2kwvrb";
libraryHaskellDepends = [ base bytestring megaparsec text ];
testHaskellDepends = [ base bytestring Cabal megaparsec text ];
description = "Find, replace, and edit text patterns with Megaparsec parsers";
@@ -208741,12 +208683,10 @@ self: {
({ mkDerivation, base, Only, postgresql-simple, text, time }:
mkDerivation {
pname = "ribbit";
- version = "0.4.1.0";
- sha256 = "1pgyh7ar03k62mpn09g8qm13m1j07wq257hpva3f9sx9n5qd8z2a";
- revision = "1";
- editedCabalFile = "11ky88hgkys3bzsqr3sl9j685h6l97r2zccpz1ylinsrvinwnq8s";
+ version = "1.0.0.1";
+ sha256 = "0zixx1xmqc8893rczhdzcplmdcx5dx1c4ykf7rg7w8h5yvni1r0y";
libraryHaskellDepends = [ base Only postgresql-simple text time ];
- description = "Type-level Relational DB language";
+ description = "Type-level Relational DB combinators";
license = stdenv.lib.licenses.mit;
}) {};
@@ -209581,18 +209521,18 @@ self: {
}) {};
"rock" = callPackage
- ({ mkDerivation, base, dependent-map, dependent-sum
+ ({ mkDerivation, base, containers, dependent-map, dependent-sum
, deriving-compat, mtl, protolude, transformers
}:
mkDerivation {
pname = "rock";
- version = "0.1.0.1";
- sha256 = "1a70c55k10algfbc77maaa8p2l16xkml6kddza52ab0vv8dn98d3";
+ version = "0.2.0.0";
+ sha256 = "0h4z2ss4g9zshxpfallmbqw121jk1dv7q5s3ww39rhglw3j4dj9k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base dependent-map dependent-sum deriving-compat mtl protolude
- transformers
+ base containers dependent-map dependent-sum deriving-compat mtl
+ protolude transformers
];
description = "A build system for incremental, parallel, and demand-driven computations";
license = stdenv.lib.licenses.bsd3;
@@ -211227,17 +211167,19 @@ self: {
}) {};
"safe-decimal" = callPackage
- ({ mkDerivation, base, deepseq, exceptions, hspec, hspec-discover
- , QuickCheck, scientific
+ ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
+ , exceptions, hspec, hspec-discover, QuickCheck, scientific
+ , template-haskell
}:
mkDerivation {
pname = "safe-decimal";
- version = "0.1.0.0";
- sha256 = "10y618swfxvz38fm95i6jbki5ax6w6xxhrdizqlrbwnqdjlsj681";
- revision = "1";
- editedCabalFile = "0449df25rah097rsbrbkb8sb4n80yms06isg0g8mp7v8ah4ssrs3";
+ version = "0.2.0.0";
+ sha256 = "03id56ib8m7gja2g5a8d6b26cz3h3zf3f3gq2ss7paxvwvn6wfib";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base deepseq exceptions scientific ];
- testHaskellDepends = [ base deepseq hspec QuickCheck scientific ];
+ testHaskellDepends = [
+ base deepseq doctest hspec QuickCheck scientific template-haskell
+ ];
testToolDepends = [ hspec-discover ];
description = "Safe and very efficient arithmetic operations on fixed decimal point numbers";
license = stdenv.lib.licenses.bsd3;
@@ -213105,6 +213047,37 @@ self: {
pname = "scheduler";
version = "1.4.2.1";
sha256 = "074m037ksjl7kgpgfldimaadhc4f6mmv40y6cq54m9shhg7rxw1c";
+ revision = "1";
+ editedCabalFile = "0gz7mkd0nj2bxcjnn50jgyiaks5dbvpm6wy8ygp2c61nnddbv4xx";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ atomic-primops base deepseq exceptions primitive unliftio-core
+ ];
+ testHaskellDepends = [
+ base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
+ template-haskell unliftio vector
+ ];
+ benchmarkHaskellDepends = [
+ async base criterion deepseq monad-par parallel streamly unliftio
+ ];
+ description = "Work stealing scheduler";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "scheduler_1_4_2_2" = callPackage
+ ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
+ , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec
+ , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly
+ , template-haskell, unliftio, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "scheduler";
+ version = "1.4.2.2";
+ sha256 = "0mzwm7lr089hbv08c58l3ahiid8w1cysvjl9q6vb46x3wpa3fwia";
+ revision = "1";
+ editedCabalFile = "0a6xcidya383ygzmz76di3dj1c8xm6ra5zb8fp517lk50s3ly3kl";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
atomic-primops base deepseq exceptions primitive unliftio-core
@@ -214207,8 +214180,8 @@ self: {
}:
mkDerivation {
pname = "sdl2";
- version = "2.5.0.0";
- sha256 = "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8";
+ version = "2.5.1.0";
+ sha256 = "087df61fsmfsdc7pdn6sgsp5lf20nampa41illszii5jfr13s7gw";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -214738,21 +214711,19 @@ self: {
"secret-sharing" = callPackage
({ mkDerivation, base, binary, bytestring, dice-entropy-conduit
- , finite-field, polynomial, QuickCheck, test-framework
+ , finite-field, QuickCheck, test-framework
, test-framework-quickcheck2, vector
}:
mkDerivation {
pname = "secret-sharing";
- version = "1.0.0.3";
- sha256 = "0q315gmfnhpzgi4r0p3li8vvrdl2a0xgh0gxdin6s3nkh6hjpbv2";
- revision = "1";
- editedCabalFile = "1q8r31bjvjm1j11pp9xqxwh53gi2skm6lqxcja5v8gzs7hl1kkb1";
+ version = "1.0.1.0";
+ sha256 = "16j4xz4kkcicqfl9r8831il310ns02kxwj7mga8pvssfnhzv9zpv";
libraryHaskellDepends = [
- base binary bytestring dice-entropy-conduit finite-field polynomial
- vector
+ base binary bytestring dice-entropy-conduit finite-field vector
];
testHaskellDepends = [
- base QuickCheck test-framework test-framework-quickcheck2
+ base bytestring QuickCheck test-framework
+ test-framework-quickcheck2
];
description = "Information-theoretic secure secret sharing";
license = stdenv.lib.licenses.lgpl21;
@@ -216339,8 +216310,8 @@ self: {
pname = "servant-auth-client";
version = "0.4.0.0";
sha256 = "1kh4kq3cc9fn49vmh304zyzn7idb4k1j0803yp7a6qc733panf9g";
- revision = "2";
- editedCabalFile = "0c67m1ckksnmwkya78nn9hy65xb7c4023fy7d3pp6zyq8izrp1v8";
+ revision = "3";
+ editedCabalFile = "1f6x5dja9czj78zn9n4jrfpk6hzhbif3in48f6w24i45jpmysx98";
libraryHaskellDepends = [
base bytestring containers servant servant-auth servant-client-core
];
@@ -216475,6 +216446,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-auth-server_0_4_5_1" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+ , bytestring, case-insensitive, cookie, data-default-class, entropy
+ , hspec, hspec-discover, http-client, http-types, jose, lens
+ , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck
+ , servant, servant-auth, servant-server, tagged, text, time
+ , transformers, unordered-containers, wai, warp, wreq
+ }:
+ mkDerivation {
+ pname = "servant-auth-server";
+ version = "0.4.5.1";
+ sha256 = "10kcxdh9ba37jra6brrg11rzmx16jmwsk0yib92l0s3mkqp9was6";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring blaze-builder bytestring
+ case-insensitive cookie data-default-class entropy http-types jose
+ lens memory monad-time mtl servant servant-auth servant-server
+ tagged text time unordered-containers wai
+ ];
+ testHaskellDepends = [
+ aeson base bytestring case-insensitive hspec http-client http-types
+ jose lens lens-aeson mtl QuickCheck servant servant-auth
+ servant-server time transformers wai warp wreq
+ ];
+ testToolDepends = [ hspec-discover markdown-unlit ];
+ description = "servant-server/servant-auth compatibility";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-auth-swagger" = callPackage
({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
, servant, servant-auth, servant-swagger, swagger2, text
@@ -218812,6 +218812,8 @@ self: {
pname = "servant-waargonaut";
version = "0.7.0.0";
sha256 = "0fn7ph0805n297nzi3ig9wfx27kz6bmn4r914ibx44927xifms59";
+ revision = "1";
+ editedCabalFile = "1xavy6k93ncvcnb4rp1p33gxaqbhjil6mz9qk8li1ibhyi29yjxh";
libraryHaskellDepends = [
base bytestring http-media lens servant text waargonaut
wl-pprint-annotated
@@ -220044,8 +220046,8 @@ self: {
}:
mkDerivation {
pname = "shake";
- version = "0.18.4";
- sha256 = "0vpgs6f365p1s09h30g2a6qy4y0rxi3pyxcg14kiag9k504af9i0";
+ version = "0.18.5";
+ sha256 = "03r4rapkcyy04wf7ljikjbsjc29fpydbv5zbrrkiy1dqadzvasjp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -220085,6 +220087,8 @@ self: {
];
description = "Utilities for building ATS projects with shake";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"shake-c" = callPackage
@@ -220339,31 +220343,6 @@ self: {
}) {};
"shakespeare" = callPackage
- ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
- , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
- , process, scientific, template-haskell, text, time, transformers
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "shakespeare";
- version = "2.0.23";
- sha256 = "0i1k6ahpvc45z05lycxs0f70ngm8xrazp6ayyxv1bzw8q8d4bkz3";
- libraryHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim parsec process scientific template-haskell text
- time transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim hspec HUnit parsec process template-haskell
- text time transformers
- ];
- description = "A toolkit for making compile-time interpolated templates";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ psibi ];
- }) {};
-
- "shakespeare_2_0_24" = callPackage
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
, containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
, process, scientific, template-haskell, text, time, transformers
@@ -220385,7 +220364,6 @@ self: {
];
description = "A toolkit for making compile-time interpolated templates";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
@@ -221479,6 +221457,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shwifty" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , mtl, primitive, template-haskell, text, th-abstraction, time
+ , unordered-containers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "shwifty";
+ version = "0.0.1.0";
+ sha256 = "1xipwh2cw4n608spxg011hnmima3badz6l8biry7q1nygc6mnc9a";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers mtl primitive
+ template-haskell text th-abstraction time unordered-containers
+ uuid-types vector
+ ];
+ description = "Generate swift types from haskell types";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"si-clock" = callPackage
({ mkDerivation, base, bytestring, hsI2C, time, transformers }:
mkDerivation {
@@ -221905,6 +221901,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "simple-cmd-args_0_1_5" = callPackage
+ ({ mkDerivation, base, optparse-applicative }:
+ mkDerivation {
+ pname = "simple-cmd-args";
+ version = "0.1.5";
+ sha256 = "097b8qv0755p0iq6bcw6ndvvvv017x9hgf6l2zvb3sgqdg9wlj88";
+ libraryHaskellDepends = [ base optparse-applicative ];
+ description = "Simple command args parsing and execution";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-conduit" = callPackage
({ mkDerivation, base, bifunctors, bytestring, CC-delcont
, chunked-data, conduit, conduit-combinators, conduit-extra
@@ -222998,6 +223006,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "singletons-presburger" = callPackage
+ ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection
+ , singletons
+ }:
+ mkDerivation {
+ pname = "singletons-presburger";
+ version = "0.3.0.0";
+ sha256 = "06djkc6y5clv0q903i04gaq0vri3nkk307znb418y0rfdh6czzwx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base ghc ghc-typelits-presburger reflection singletons
+ ];
+ description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"singnal" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -223241,8 +223268,8 @@ self: {
}:
mkDerivation {
pname = "sized";
- version = "0.3.0.0";
- sha256 = "1w00s0wgbr1n2x2ariixixy07bhxiyp5728givdrz0xg63gnw1s7";
+ version = "0.3.0.1";
+ sha256 = "1f31sfimji95bip88y9vn8mdlgbrikh0xc4w6vy2ydh1902rdiks";
libraryHaskellDepends = [
base constraints containers deepseq equational-reasoning
ghc-typelits-presburger hashable lens ListLike mono-traversable
@@ -224589,8 +224616,8 @@ self: {
({ mkDerivation, aeson, base, linear, text, vector }:
mkDerivation {
pname = "smoothie";
- version = "0.4.2.9";
- sha256 = "0kra42nh86dfp66ngr4bmb8d530nh7b9pra1vlykc0sx9b1zpjnk";
+ version = "0.4.2.10";
+ sha256 = "059r2igvqidganwn0d907f6zv9h7ggwa6hgaaxh2car3kyi7425l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ aeson base linear text vector ];
description = "Smooth curves via several interpolation modes";
@@ -227587,8 +227614,8 @@ self: {
}:
mkDerivation {
pname = "sparse-tensor";
- version = "0.2.1.2";
- sha256 = "0rkq0la7l12x9ck96ra8inlz81fcj5z8sxa90sgd082jhrq7jq94";
+ version = "0.2.1.3";
+ sha256 = "1fcckwp9k3ky669ai62x26pgz0irir4ngk0m6g1659fsn3f2gdc8";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
ad base bytestring cereal containers deepseq ghc-typelits-knownnat
@@ -231763,8 +231790,8 @@ self: {
({ mkDerivation, base, semigroups, transformers, utility-ht }:
mkDerivation {
pname = "storable-record";
- version = "0.0.4";
- sha256 = "0hjs1km0fc9ch0i1rbycxia5w3939hk4p4md73ikgg4aipqb5zyf";
+ version = "0.0.4.1";
+ sha256 = "1waj81810ywbrzizifsrjd0n3803scl8sr248z9nlrc94fz8vg58";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -231852,57 +231879,6 @@ self: {
}) {};
"store" = callPackage
- ({ mkDerivation, array, async, base, base-orphans
- , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
- , clock, containers, contravariant, criterion, cryptohash, deepseq
- , directory, filepath, free, ghc-prim, hashable, hspec
- , hspec-smallcheck, integer-gmp, lifted-base, monad-control
- , mono-traversable, network, primitive, resourcet, safe, semigroups
- , smallcheck, store-core, syb, template-haskell, text, th-lift
- , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
- , transformers, unordered-containers, vector
- , vector-binary-instances, void, weigh
- }:
- mkDerivation {
- pname = "store";
- version = "0.5.1.2";
- sha256 = "1abwlcj0z17hj5h94cbg1sgqfdsdgjhgfgd2aaspsn4zdfk5bjc5";
- libraryHaskellDepends = [
- array async base base-orphans base64-bytestring bifunctors
- bytestring containers contravariant cryptohash deepseq directory
- filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
- lifted-base monad-control mono-traversable network primitive
- resourcet safe semigroups smallcheck store-core syb
- template-haskell text th-lift th-lift-instances th-orphans
- th-reify-many th-utilities time transformers unordered-containers
- vector void
- ];
- testHaskellDepends = [
- array async base base-orphans base64-bytestring bifunctors
- bytestring clock containers contravariant cryptohash deepseq
- directory filepath free ghc-prim hashable hspec hspec-smallcheck
- integer-gmp lifted-base monad-control mono-traversable network
- primitive resourcet safe semigroups smallcheck store-core syb
- template-haskell text th-lift th-lift-instances th-orphans
- th-reify-many th-utilities time transformers unordered-containers
- vector void
- ];
- benchmarkHaskellDepends = [
- array async base base-orphans base64-bytestring bifunctors
- bytestring cereal cereal-vector containers contravariant criterion
- cryptohash deepseq directory filepath free ghc-prim hashable hspec
- hspec-smallcheck integer-gmp lifted-base monad-control
- mono-traversable network primitive resourcet safe semigroups
- smallcheck store-core syb template-haskell text th-lift
- th-lift-instances th-orphans th-reify-many th-utilities time
- transformers unordered-containers vector vector-binary-instances
- void weigh
- ];
- description = "Fast binary serialization";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "store_0_7_1" = callPackage
({ mkDerivation, array, async, base, base-orphans
, base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
, clock, containers, contravariant, criterion, cryptohash, deepseq
@@ -231951,7 +231927,6 @@ self: {
];
description = "Fast binary serialization";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"store-core" = callPackage
@@ -232049,15 +232024,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_48_0" = callPackage
+ "stratosphere_0_49_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.48.0";
- sha256 = "1g6z2yfafa9h1nr3kzg4mblgl7n8dmyja8zyq888m99lh4h8qdf2";
+ version = "0.49.0";
+ sha256 = "18qw7m0h9nlg0vicg3rr7dghmpdfnrpd0ayqyi60c1ifzk4ys4sf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -233816,29 +233791,6 @@ self: {
}) {};
"structs" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
- , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
- , tasty, tasty-hunit, tasty-quickcheck, template-haskell
- }:
- mkDerivation {
- pname = "structs";
- version = "0.1.2";
- sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4";
- revision = "2";
- editedCabalFile = "0ma2s0by622kaq7p57g859pxha02bqrd7n86cczfb2gzcm7kqma7";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base deepseq ghc-prim primitive template-haskell
- ];
- testHaskellDepends = [
- base directory doctest filepath parallel primitive QuickCheck tasty
- tasty-hunit tasty-quickcheck
- ];
- description = "Strict GC'd imperative object-oriented programming with cheap pointers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "structs_0_1_3" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
, doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -233857,7 +233809,6 @@ self: {
];
description = "Strict GC'd imperative object-oriented programming with cheap pointers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"structural-induction" = callPackage
@@ -238374,8 +238325,8 @@ self: {
}:
mkDerivation {
pname = "taskell";
- version = "1.9.1.0";
- sha256 = "07hkkx71xb6k89ylis58lcv69ab1avggb4347ppzv2wxp6qljn5l";
+ version = "1.9.2.0";
+ sha256 = "1nm150ffvwmxid9jzg2r0yj995s39lsfd85rhpsbpbhprpx6wf4s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -238696,6 +238647,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tasty-hunit-compat" = callPackage
+ ({ mkDerivation, base, HUnit, tasty, tasty-hunit }:
+ mkDerivation {
+ pname = "tasty-hunit-compat";
+ version = "0.1.0";
+ sha256 = "0894pi60ncyfcgvnpm39mcklbqbabgln19qvf9mjcphcnxvpxlvx";
+ libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
+ description = "Tasty integration with the existing HUnit package";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"tasty-integrate" = callPackage
({ mkDerivation, aeson, base, bytestring, cmdargs, containers
, deepseq, directory, either, haskell-src-exts
@@ -238815,24 +238777,6 @@ self: {
}) {};
"tasty-lua" = callPackage
- ({ mkDerivation, base, bytestring, directory, file-embed, filepath
- , hslua, tasty, tasty-hunit, text
- }:
- mkDerivation {
- pname = "tasty-lua";
- version = "0.2.0.1";
- sha256 = "0xlj36rrhkx312h7smx6ay20rhlhxvw2ma2ckdnzv1pvmdn6p5qx";
- libraryHaskellDepends = [
- base bytestring file-embed hslua tasty text
- ];
- testHaskellDepends = [
- base directory filepath hslua tasty tasty-hunit
- ];
- description = "Write tests in Lua, integrate into tasty";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "tasty-lua_0_2_2" = callPackage
({ mkDerivation, base, bytestring, directory, file-embed, filepath
, hslua, tasty, tasty-hunit, text
}:
@@ -238848,7 +238792,6 @@ self: {
];
description = "Write tests in Lua, integrate into tasty";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tasty-program" = callPackage
@@ -238866,24 +238809,6 @@ self: {
}) {};
"tasty-quickcheck" = callPackage
- ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
- , random, tagged, tasty, tasty-hunit
- }:
- mkDerivation {
- pname = "tasty-quickcheck";
- version = "0.10.1";
- sha256 = "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh";
- revision = "1";
- editedCabalFile = "1ms8ph2vp8x1icqiw468zlpsj4pii7xjm6g3k6ikkcy7cx3vnv4s";
- libraryHaskellDepends = [
- base optparse-applicative QuickCheck random tagged tasty
- ];
- testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
- description = "QuickCheck support for the Tasty test framework";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "tasty-quickcheck_0_10_1_1" = callPackage
({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
, random, tagged, tasty, tasty-hunit
}:
@@ -238897,7 +238822,6 @@ self: {
testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
description = "QuickCheck support for the Tasty test framework";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tasty-quickcheck-laws" = callPackage
@@ -242446,6 +242370,21 @@ self: {
license = stdenv.lib.licenses.isc;
}) {};
+ "th-abstraction_0_3_2_0" = callPackage
+ ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+ mkDerivation {
+ pname = "th-abstraction";
+ version = "0.3.2.0";
+ sha256 = "0ygbky8sk0nk4jyfjf6rj1ghv83rflcfcbsmnn7rnjzks0xg7zin";
+ libraryHaskellDepends = [
+ base containers ghc-prim template-haskell
+ ];
+ testHaskellDepends = [ base containers template-haskell ];
+ description = "Nicer interface for reified information about data types";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-alpha" = callPackage
({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
, tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -243273,8 +243212,8 @@ self: {
pname = "these-skinny";
version = "0.7.4";
sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr";
- revision = "1";
- editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c";
+ revision = "2";
+ editedCabalFile = "0q1izcz4kxrnl7sh0sxamxxq02mkxww88vr6v04pwj8alyhkd4z2";
libraryHaskellDepends = [ base deepseq ];
description = "A fork of the 'these' package without the dependency bloat";
license = stdenv.lib.licenses.bsd3;
@@ -243947,8 +243886,8 @@ self: {
}:
mkDerivation {
pname = "tidal";
- version = "1.4.7";
- sha256 = "01v6p4by2scn9wxyv14hal7pd7hkr7psr3kaj8xsnc924xpxmwak";
+ version = "1.4.8";
+ sha256 = "163ndsx6spicipsy52iqsrm97z6pfr4mm93d2dz7ffckbzsklmdb";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bifunctors bytestring clock colour containers deepseq hosc
@@ -250566,8 +250505,10 @@ self: {
}:
mkDerivation {
pname = "type-natural";
- version = "0.8.2.0";
- sha256 = "1n5mavlnqjvyn1dr9iq16lyv0zhxbqab1rw7rl2i345kb1qpzini";
+ version = "0.8.3.1";
+ sha256 = "0nq54098jyrx6zz8vn0pw3kg9b6bwpxhnhxk3f5m18rpjjjjw4xs";
+ revision = "1";
+ editedCabalFile = "1nhv7wh3cgy5hhkgs3bgg3659qf3lpy8rm89ikbb0p69bbxdpmfa";
libraryHaskellDepends = [
base constraints equational-reasoning ghc-typelits-natnormalise
ghc-typelits-presburger singletons template-haskell
@@ -254799,8 +254740,8 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "util";
- version = "0.1.17.0";
- sha256 = "1wyjxrnzianif6msk7qvib92lksy66hx4rkdb7sda0a4h704960c";
+ version = "0.1.17.1";
+ sha256 = "1qhx4r27sny25sykacf5xi5br4msq4335ghp5zc3fq0lii3866s7";
libraryHaskellDepends = [ base transformers ];
description = "Utilities";
license = stdenv.lib.licenses.bsd3;
@@ -255129,6 +255070,29 @@ self: {
broken = true;
}) {};
+ "uuid-bytes" = callPackage
+ ({ mkDerivation, base, byteslice, bytesmith, HUnit
+ , natural-arithmetic, primitive, small-bytearray-builder, tasty
+ , tasty-hunit, wide-word
+ }:
+ mkDerivation {
+ pname = "uuid-bytes";
+ version = "0.1.0.1";
+ sha256 = "0gzw6dn84xg0ndkhsnqpr1qn858cr0627hkdq0rijv932b0z4yvs";
+ libraryHaskellDepends = [
+ base byteslice bytesmith natural-arithmetic primitive
+ small-bytearray-builder wide-word
+ ];
+ testHaskellDepends = [
+ base byteslice HUnit natural-arithmetic primitive tasty tasty-hunit
+ wide-word
+ ];
+ description = "UUID parsing using byteverse packages";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"uuid-crypto" = callPackage
({ mkDerivation, base, binary, bytestring, cryptoids
, cryptoids-class, cryptoids-types, exceptions, uuid
@@ -256344,20 +256308,17 @@ self: {
"vector" = callPackage
({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
- , primitive, QuickCheck, random, template-haskell, test-framework
- , test-framework-hunit, test-framework-quickcheck2, transformers
+ , primitive, QuickCheck, random, semigroups, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, transformers
}:
mkDerivation {
pname = "vector";
- version = "0.12.0.3";
- sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq";
- revision = "2";
- editedCabalFile = "1kjs6jnbxziv1q0md2jiqic0r19ry8xlg7wdr8b52rz7yjyb08hl";
+ version = "0.12.1.2";
+ sha256 = "1g8i806ph9l789pv2k665bbxlmsbwfwzml1mi9xv683g7xl2fviv";
libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
testHaskellDepends = [
- base base-orphans HUnit primitive QuickCheck random
- template-haskell test-framework test-framework-hunit
- test-framework-quickcheck2 transformers
+ base base-orphans HUnit primitive QuickCheck random semigroups
+ tasty tasty-hunit tasty-quickcheck template-haskell transformers
];
description = "Efficient Arrays";
license = stdenv.lib.licenses.bsd3;
@@ -257115,24 +257076,6 @@ self: {
}) {};
"versions" = callPackage
- ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
- , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
- , tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "versions";
- version = "3.5.2";
- sha256 = "0a2ymd7wmpakcrm1fz9xwmjqlka7jmd8kb6385frd36nbi9bx78h";
- libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
- testHaskellDepends = [
- base base-prelude checkers megaparsec microlens QuickCheck tasty
- tasty-hunit tasty-quickcheck text
- ];
- description = "Types and parsers for software version numbers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "versions_3_5_3" = callPackage
({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
, megaparsec, microlens, QuickCheck, tasty, tasty-hunit
, tasty-quickcheck, text
@@ -257148,7 +257091,6 @@ self: {
];
description = "Types and parsers for software version numbers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"vflow-types" = callPackage
@@ -257181,6 +257123,8 @@ self: {
pname = "vformat";
version = "0.14.1.0";
sha256 = "0wg419mqdqsi6msgy4k7jgqdqba96pmv58dpyd6ar6hq7b90na69";
+ revision = "1";
+ editedCabalFile = "074y0nkygj8klkpm3rpdp7z2yj9np9y6rzhc7i62j0mykd27h8hq";
libraryHaskellDepends = [
base containers exceptions template-haskell
];
@@ -257199,6 +257143,8 @@ self: {
pname = "vformat-aeson";
version = "0.1.0.1";
sha256 = "1cj3zp5n1j86jds906r9yrhanl8xq08gk97x6i64d651pry4h11v";
+ revision = "1";
+ editedCabalFile = "1p85qlv9w11mqybcf81xix0lhbgc2bzy9gw83ywci5kmd1s7a2a5";
libraryHaskellDepends = [
aeson base bytestring scientific text unordered-containers vector
vformat
@@ -257217,6 +257163,8 @@ self: {
pname = "vformat-time";
version = "0.1.0.0";
sha256 = "0s3b9ryyzmvy1fpxdnxdgrpi5faz67r8immm30pv6njy741k1l36";
+ revision = "1";
+ editedCabalFile = "0i11kkr8xwrffqz6jb68xfgvsbdkfxzxmw9k1bjc42x9hidgxv47";
libraryHaskellDepends = [ base time vformat ];
testHaskellDepends = [ base time vformat ];
description = "Extend vformat to time datatypes";
@@ -259041,6 +258989,8 @@ self: {
pname = "wai-middleware-auth";
version = "0.1.2.1";
sha256 = "0x3x3vc2l7glvfv6xcmqq0bw4mm8w2l577zx6qhx4399b03j56a1";
+ revision = "1";
+ editedCabalFile = "06pd7qk160m17nn3v61hmcnkfwm5qy6bjr1yhx4s2vsqyqvxgbaw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -259071,6 +259021,8 @@ self: {
pname = "wai-middleware-auth";
version = "0.2.1.0";
sha256 = "16gm0r4jlmzx5qd4s03whqlc8siy139fwrb6q26a053c85n5lw0f";
+ revision = "1";
+ editedCabalFile = "14aicx9vvp5p77hxmx0zqmqmz4qgv7adr7rsvxy76k0rszz8s8d6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -262642,8 +262594,8 @@ self: {
}:
mkDerivation {
pname = "withdependencies";
- version = "0.2.5";
- sha256 = "13xdcn9fp1nc5378vmjbjwpw4n19bnnfrgr729yh5s366f2cfiv1";
+ version = "0.3.0";
+ sha256 = "1hjld3ndafnaxwx1c6s88dc3bimbc5vwfdf6lcsq22apzh1gmdm6";
libraryHaskellDepends = [
base conduit containers mtl profunctors
];
@@ -262882,17 +262834,6 @@ self: {
}) {};
"wl-pprint-text" = callPackage
- ({ mkDerivation, base, base-compat, text }:
- mkDerivation {
- pname = "wl-pprint-text";
- version = "1.2.0.0";
- sha256 = "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0";
- libraryHaskellDepends = [ base base-compat text ];
- description = "A Wadler/Leijen Pretty Printer for Text values";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "wl-pprint-text_1_2_0_1" = callPackage
({ mkDerivation, base, base-compat, text }:
mkDerivation {
pname = "wl-pprint-text";
@@ -262901,7 +262842,6 @@ self: {
libraryHaskellDepends = [ base base-compat text ];
description = "A Wadler/Leijen Pretty Printer for Text values";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wlc-hs" = callPackage
@@ -267276,8 +267216,8 @@ self: {
}:
mkDerivation {
pname = "yaml-light-lens";
- version = "0.3.3.5";
- sha256 = "11q6g00qycpr29n1yxpsgpailzk216pr3cfjy7pyrlvfpl4wx24f";
+ version = "0.3.3.6";
+ sha256 = "034dj7k0719lkhwgrz91wk2dfpxg4kvyj9ax7cpz9q6qa8jn0zp7";
libraryHaskellDepends = [
base bytestring bytestring-lexing containers lens yaml-light
];
@@ -267993,29 +267933,6 @@ self: {
}) {};
"yesod" = callPackage
- ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
- , conduit, data-default-class, directory, fast-logger, monad-logger
- , resourcet, semigroups, shakespeare, streaming-commons
- , template-haskell, text, transformers, unix, unordered-containers
- , wai, wai-extra, wai-logger, warp, yaml, yesod-core, yesod-form
- , yesod-persistent
- }:
- mkDerivation {
- pname = "yesod";
- version = "1.6.0";
- sha256 = "0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a";
- libraryHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring conduit
- data-default-class directory fast-logger monad-logger resourcet
- semigroups shakespeare streaming-commons template-haskell text
- transformers unix unordered-containers wai wai-extra wai-logger
- warp yaml yesod-core yesod-form yesod-persistent
- ];
- description = "Creation of type-safe, RESTful web applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod_1_6_0_1" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit
, data-default-class, directory, fast-logger, monad-logger
, semigroups, shakespeare, streaming-commons, template-haskell
@@ -268034,7 +267951,6 @@ self: {
];
description = "Creation of type-safe, RESTful web applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-alerts" = callPackage
@@ -268116,34 +268032,6 @@ self: {
}) {};
"yesod-auth" = callPackage
- ({ mkDerivation, aeson, authenticate, base, base16-bytestring
- , base64-bytestring, binary, blaze-builder, blaze-html
- , blaze-markup, bytestring, conduit, conduit-extra, containers
- , cryptonite, data-default, email-validate, file-embed, http-client
- , http-client-tls, http-conduit, http-types, memory, network-uri
- , nonce, persistent, random, safe, shakespeare, template-haskell
- , text, time, transformers, unliftio, unliftio-core
- , unordered-containers, wai, yesod-core, yesod-form
- , yesod-persistent
- }:
- mkDerivation {
- pname = "yesod-auth";
- version = "1.6.8";
- sha256 = "0d2nrzrqymbbp5hfwp7c6k6gr0vn6ladq0dl7wgwrybfx8nqgf65";
- libraryHaskellDepends = [
- aeson authenticate base base16-bytestring base64-bytestring binary
- blaze-builder blaze-html blaze-markup bytestring conduit
- conduit-extra containers cryptonite data-default email-validate
- file-embed http-client http-client-tls http-conduit http-types
- memory network-uri nonce persistent random safe shakespeare
- template-haskell text time transformers unliftio unliftio-core
- unordered-containers wai yesod-core yesod-form yesod-persistent
- ];
- description = "Authentication for Yesod";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-auth_1_6_8_1" = callPackage
({ mkDerivation, aeson, authenticate, base, base16-bytestring
, base64-bytestring, binary, blaze-builder, blaze-html
, blaze-markup, bytestring, conduit, conduit-extra, containers
@@ -268169,7 +268057,6 @@ self: {
];
description = "Authentication for Yesod";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-auth-account" = callPackage
@@ -268718,43 +268605,6 @@ self: {
}) {};
"yesod-core" = callPackage
- ({ mkDerivation, aeson, async, auto-update, base, blaze-html
- , blaze-markup, bytestring, case-insensitive, cereal, clientsession
- , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
- , gauge, hspec, hspec-expectations, http-types, HUnit, memory
- , monad-logger, mtl, network, parsec, path-pieces, primitive
- , random, resourcet, shakespeare, streaming-commons
- , template-haskell, text, time, transformers, unix-compat, unliftio
- , unordered-containers, vector, wai, wai-extra, wai-logger, warp
- , word8
- }:
- mkDerivation {
- pname = "yesod-core";
- version = "1.6.17";
- sha256 = "1i31xx9ili9r9il0mqpb04pgnq67rfsfr61pw9xmc163akgdfi4l";
- libraryHaskellDepends = [
- aeson auto-update base blaze-html blaze-markup bytestring
- case-insensitive cereal clientsession conduit conduit-extra
- containers cookie deepseq fast-logger http-types memory
- monad-logger mtl parsec path-pieces primitive random resourcet
- shakespeare template-haskell text time transformers unix-compat
- unliftio unordered-containers vector wai wai-extra wai-logger warp
- word8
- ];
- testHaskellDepends = [
- async base bytestring clientsession conduit conduit-extra
- containers cookie hspec hspec-expectations http-types HUnit network
- path-pieces random resourcet shakespeare streaming-commons
- template-haskell text transformers unliftio wai wai-extra warp
- ];
- benchmarkHaskellDepends = [
- base blaze-html bytestring gauge shakespeare text
- ];
- description = "Creation of type-safe, RESTful web applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-core_1_6_17_2" = callPackage
({ mkDerivation, aeson, async, auto-update, base, blaze-html
, blaze-markup, bytestring, case-insensitive, cereal, clientsession
, conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -268789,7 +268639,6 @@ self: {
];
description = "Creation of type-safe, RESTful web applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-crud" = callPackage
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index df8ad2fbe4d..e7741ed81ec 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "joker";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "1b38alajxs89a9x3f3ldk1nlynp6j90qhl1m2c6561rsm41sqfz0";
+ sha256 = "0da07fswj7x87njd9bi3gf8rzfyaq3zfcszgyb37w7q0ng4gg25n";
};
modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
@@ -17,6 +17,8 @@ buildGoModule rec {
go generate ./...
'';
+ subPackages = [ "." ];
+
meta = with stdenv.lib; {
homepage = https://github.com/candid82/joker;
description = "A small Clojure interpreter and linter written in Go";
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 22ad25a8bbe..37e85617fb7 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cimg";
- version = "2.8.0";
+ version = "2.8.3";
src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
- sha256 = "1nm9zpx9k3pb1p726ihw13y0d3y3xqafml7mhnx6wrkg9sfgs17n";
+ sha256 = "0k7cra95v46i1q3rvklrxxhz3z10yql1ysvfrapcas0m4z6f94ld";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix
index 8a02ea1598c..4f5e4148baa 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/pkgs/development/libraries/dnnl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dnnl";
- version = "1.1.2";
+ version = "1.2";
src = fetchFromGitHub {
owner = "intel";
repo = "mkl-dnn";
rev = "v${version}";
- sha256 = "150cdyfiw4izvzmbmdqidwadppb1qjmzhpaqjczm397ygi1m92l1";
+ sha256 = "17xpdwqjfb2bq586gnk3hq94r06jd8pk6qfs703qqd7155fkbil9";
};
# Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix
index 6bfb694a41b..14704cee01c 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/pkgs/development/libraries/libuchardet/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3";
};
- buildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index 50e0c576e69..e6c5cac77d2 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "20200115";
+ version = "20200125";
pname = "m4ri";
src = fetchFromBitbucket {
owner = "malb";
repo = "m4ri";
rev = "release-${version}";
- sha256 = "1c17casrw6dvwj067kfcgyjjajfisz56s30wjv7fwaw55mqrny19";
+ sha256 = "1dxgbv6zdyki3h61qlv7003wzhy6x14zmcaz9x19md1i7ng07w1k";
};
doCheck = true;
diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix
index 00e35b64f5f..2b82cc2c0ae 100644
--- a/pkgs/development/misc/h3/default.nix
+++ b/pkgs/development/misc/h3/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "h3";
- version = "3.6.2";
+ version = "3.6.3";
src = fetchFromGitHub {
owner = "uber";
repo = "h3";
rev = "v${version}";
- sha256 = "0mlv3jk0j340l0bhr3brxm3hbdcfmyp86h7d85537c81cl64y7kg";
+ sha256 = "1zgq496m2pk2c1l0r1di0p39nxwza00kxzqa971qd4xgbrvd4w55";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 83237fd5fc7..5ebc8b231f2 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -12,10 +12,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
- cocoapods (1.9.0.beta.2)
+ cocoapods (1.9.0.beta.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.9.0.beta.2)
+ cocoapods-core (= 1.9.0.beta.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
- cocoapods-core (1.9.0.beta.2)
+ cocoapods-core (1.9.0.beta.3)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
@@ -54,7 +54,7 @@ GEM
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
- ffi (1.11.3)
+ ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
@@ -62,7 +62,7 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.0)
- minitest (5.13.0)
+ minitest (5.14.0)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
@@ -71,9 +71,9 @@ GEM
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
- tzinfo (1.2.5)
+ tzinfo (1.2.6)
thread_safe (~> 0.1)
- xcodeproj (1.14.0)
+ xcodeproj (1.15.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 68c251481e9..a5760106862 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -57,10 +57,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lx1h0i1rly9rnzl3szr0mws9b1l6ik1k84rcfwmhppfacc8bp15";
+ sha256 = "0dd2a4m7axnqk2rj8piwprqrg91dp8gmyj2rala4viawfq0mj5mf";
type = "gem";
};
- version = "1.9.0.beta.2";
+ version = "1.9.0.beta.3";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
@@ -68,10 +68,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h364ayikbicm6fy1faznwlnqnahqf330dnqjcb0vszqhxw0xq59";
+ sha256 = "0pf54634zi03vbi2m7n1g6kj0k2azgk2pahh9p2mqx814wka99nr";
type = "gem";
};
- version = "1.9.0.beta.2";
+ version = "1.9.0.beta.3";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -191,10 +191,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd";
+ sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
type = "gem";
};
- version = "1.11.3";
+ version = "1.12.2";
};
fourflusher = {
groups = ["default"];
@@ -262,10 +262,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
+ sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
type = "gem";
};
- version = "5.13.0";
+ version = "5.14.0";
};
molinillo = {
groups = ["default"];
@@ -344,10 +344,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+ sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
type = "gem";
};
- version = "1.2.5";
+ version = "1.2.6";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
@@ -355,9 +355,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb";
+ sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z";
type = "gem";
};
- version = "1.14.0";
+ version = "1.15.0";
};
}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
index 2d47e0669d8..93eedc73a6f 100644
--- a/pkgs/development/python-modules/fx2/default.nix
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage {
pname = "fx2";
- version = "unstable-2019-09-23";
+ version = "unstable-2020-01-25";
src = fetchFromGitHub {
owner = "whitequark";
repo = "libfx2";
- rev = "3adb4fc842f174b0686ed122c0309d68356edc11";
- sha256 = "0b3zp50mschsxi2v3192dmnpw32gwblyl8aswlz9a0vx1qg3ibzn";
+ rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e";
+ sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg";
};
nativeBuildInputs = [ sdcc ];
diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix
index 7717682afda..94ae2a1258e 100644
--- a/pkgs/development/python-modules/glasgow/default.nix
+++ b/pkgs/development/python-modules/glasgow/default.nix
@@ -18,15 +18,15 @@
buildPythonPackage rec {
pname = "glasgow";
- version = "unstable-2019-10-16";
+ version = "unstable-2020-02-08";
# python software/setup.py --version
- realVersion = "0.1.dev1286+g${lib.substring 0 7 src.rev}";
+ realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "GlasgowEmbedded";
repo = "glasgow";
- rev = "4f968dbe6cf4e9d8e2d0a5163d82e996c24d5e30";
- sha256 = "1b50n12dc0b3jmim5ywg7daq62k5j4wkgmwzk88ric5ri3b8dl2r";
+ rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498";
+ sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m";
};
nativeBuildInputs = [ setuptools_scm sdcc ];
@@ -44,6 +44,8 @@ buildPythonPackage rec {
checkInputs = [ yosys icestorm nextpnr ];
+ enableParallelBuilding = true;
+
preBuild = ''
make -C firmware LIBFX2=${fx2}/share/libfx2
cp firmware/glasgow.ihex software/glasgow
@@ -55,7 +57,7 @@ buildPythonPackage rec {
doInstallCheck = false;
checkPhase = ''
- python -m unittest discover
+ python -W ignore::DeprecationWarning test.py
'';
makeWrapperArgs = [
diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix
index 6e51ae07731..e40624b7a5c 100644
--- a/pkgs/development/python-modules/nmigen-boards/default.nix
+++ b/pkgs/development/python-modules/nmigen-boards/default.nix
@@ -8,15 +8,15 @@
buildPythonPackage rec {
pname = "nmigen-boards";
- version = "unstable-2019-10-13";
+ version = "unstable-2020-02-06";
# python setup.py --version
- realVersion = "0.1.dev79+g${lib.substring 0 7 src.rev}";
+ realVersion = "0.1.dev92+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
- owner = "m-labs";
+ owner = "nmigen";
repo = "nmigen-boards";
- rev = "835c175d7cf9d143aea2c7dbc0c870ede655cfc2";
- sha256 = "1mbxgfv6k9i3668lr1b3hrvial2vznvgn4ckjzc36hhizp47ypzw";
+ rev = "f37fe0295035db5f1bf82ed086b2eb349ab3a530";
+ sha256 = "16112ahil100anfwggj64nyrj3pf7mngwrjyqyhf2ggxx9ir24cc";
};
nativeBuildInputs = [ setuptools_scm ];
@@ -28,8 +28,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Board and connector definitions for nMigen";
- homepage = https://github.com/m-labs/nmigen-boards;
- license = licenses.bsd0;
+ homepage = https://github.com/nmigen/nmigen-boards;
+ license = licenses.bsd2;
maintainers = with maintainers; [ emily ];
};
}
diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix
new file mode 100644
index 00000000000..bcd3deece54
--- /dev/null
+++ b/pkgs/development/python-modules/nmigen-soc/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nmigen
+, setuptools
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+ pname = "nmigen-soc";
+ version = "unstable-2020-02-08";
+ # python setup.py --version
+ realVersion = "0.1.dev24+g${lib.substring 0 7 src.rev}";
+
+ src = fetchFromGitHub {
+ owner = "nmigen";
+ repo = "nmigen-soc";
+ rev = "f1b009c7e075bca461d10ec963a7eaa3bf4dfc14";
+ sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ setuptools nmigen ];
+
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
+ '';
+
+ meta = with lib; {
+ description = "System on Chip toolkit for nMigen";
+ homepage = https://github.com/nmigen/nmigen-soc;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix
index 8269c07cba0..010b4472966 100644
--- a/pkgs/development/python-modules/nmigen/default.nix
+++ b/pkgs/development/python-modules/nmigen/default.nix
@@ -5,7 +5,6 @@
, setuptools
, setuptools_scm
, pyvcd
-, bitarray
, jinja2
# for tests
@@ -16,22 +15,22 @@
buildPythonPackage rec {
pname = "nmigen";
- version = "unstable-2019-10-17";
+ version = "unstable-2019-02-08";
# python setup.py --version
- realVersion = "0.1.rc2.dev5+g${lib.substring 0 7 src.rev}";
+ realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
- owner = "m-labs";
+ owner = "nmigen";
repo = "nmigen";
- rev = "9fba5ccb513cfbd53f884b1efca699352d2471b9";
- sha256 = "02bjry4sqjsrhl0s42zl1zl06gk5na9i6br6vmz7fvxic29vl83v";
+ rev = "66f4510c4465be5d0763d7835770553434e4ee91";
+ sha256 = "19y39c4ywckm4yzrpjzcdl9pqy9d1sf1zsb4zpzajpmnfqccc3b0";
};
disabled = pythonOlder "3.6";
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ setuptools pyvcd bitarray jinja2 ];
+ propagatedBuildInputs = [ setuptools pyvcd jinja2 ];
checkInputs = [ yosys symbiyosys yices ];
@@ -41,8 +40,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "A refreshed Python toolbox for building complex digital hardware";
- homepage = https://github.com/m-labs/nmigen;
- license = licenses.bsd0;
+ homepage = https://github.com/nmigen/nmigen;
+ license = licenses.bsd2;
maintainers = with maintainers; [ emily ];
};
}
diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix
index aff3280e86c..be6d10d0a0e 100644
--- a/pkgs/development/python-modules/pyvcd/default.nix
+++ b/pkgs/development/python-modules/pyvcd/default.nix
@@ -3,15 +3,16 @@
, fetchPypi
, setuptools_scm
, six
-, pytest }:
+, pytest
+}:
buildPythonPackage rec {
- version = "0.1.6";
+ version = "0.1.7";
pname = "pyvcd";
src = fetchPypi {
inherit pname version;
- sha256 = "285fcd96c3ee482e7b222bdd01d5dd19c2f5a0ad9b8e950baa98d386a2758c8f";
+ sha256 = "1ixpdl0qiads81h8s9h9r9z0cyc9dlmvi01nfjggxixvbb17305y";
};
buildInputs = [ setuptools_scm ];
@@ -26,7 +27,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python package for writing Value Change Dump (VCD) files";
homepage = https://github.com/SanDisk-Open-Source/pyvcd;
+ changelog = "https://github.com/SanDisk-Open-Source/pyvcd/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
- maintainers = [ maintainers.sb0 ];
+ maintainers = [ maintainers.sb0 maintainers.emily ];
};
}
diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix
index 63425d2b8bd..29e278c211a 100644
--- a/pkgs/development/python-modules/sipsimple/default.nix
+++ b/pkgs/development/python-modules/sipsimple/default.nix
@@ -25,7 +25,10 @@ buildPythonPackage rec {
};
preConfigure = ''
+ # TODO: Executable bits are set by upstream with the next release
+ # see AGProjects/python-sipsimple/commit/a36d66cf758afb43c59f7ac48b193c4148eb1848
chmod +x ./deps/pjsip/configure ./deps/pjsip/aconfigure
+
export LD=$CC
'';
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 985dd8dfd8c..5ac52c71abe 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "8.28";
+ version = "8.29";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
- sha256 = "014jsj6pbpf3y4c1vx606f82c7pic6q4lcsbl7wwqn67dr0g0v1m";
+ sha256 = "1rbipf4031inv34ci0rczz7dipi3b12cpn45h949i095gdh37pgh";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index e5770800199..fbe85307b0b 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.0.0";
+ version = "2.0.2";
dontConfigure = true;
dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "1v6wzjdhfws77fr5r15s03f1ipzc1gh7sl8gvw1fb4pplpa2d08s";
+ sha256 = "11siv8qmj4arl6qxks7bqnhx5669r3kxqcxq37ai7sf9f7v78k1i";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
index e8e3168e937..9c318b0a454 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- version = "3.1.5";
+ version = "4.2.1";
pname = "randoop";
src = fetchurl {
url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
- sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx";
+ sha256 = "0sq6zyagb8qrj629rq7amzi0dnm6q00mll6gd5yx1nqdnjbfb4qd";
};
buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 486f44d8c64..5d2a713cfc4 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "sbt";
- version = "1.3.7";
+ version = "1.3.8";
src = fetchurl {
urls = [
"https://piccolo.link/sbt-${version}.tgz"
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
];
- sha256 = "054qfbvhkh1w66f2nvsv1mvrkjc9qddzsnfrhmaqx79gglxllgc1";
+ sha256 = "0pcrbpsvccyxdwc7f8h87rkn0kalar0iypnh3gygw4c0fm4yvci7";
};
patchPhase = ''
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 2711dafa689..c9287b7b96e 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,16 +1,16 @@
{ stdenv, buildGoPackage, fetchFromGitHub
-, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux, libseccomp
}:
buildGoPackage rec {
pname = "buildah";
- version = "1.13.2";
+ version = "1.14.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "0860ynv93gbicpczfapvrd558dzbqicy9rv4ivyjhb6yyfgy4qai";
+ sha256 = "0nbcrhfd0c14d0m9a4mkd01jxk5i503z38kv2qfz5cvfghx517qq";
};
outputs = [ "bin" "man" "out" ];
@@ -19,7 +19,7 @@ buildGoPackage rec {
excludedPackages = [ "tests" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
+ buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ];
patches = [ ./disable-go-module-mode.patch ];
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 67d408505db..dc9abdbcccc 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
- version = "6.1.3";
+ version = "6.2.2";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "0hd5gkfjhxb1ny8y0pqn7vs34bqk4w5k7vcygd6iz1d57q0giwp6";
+ sha256 = "09x62dbid9gx26q8m7gz4b21kinsx1ag3961krbxks28ihmwlm6a";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 83df38cf7db..a779f753d9b 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "git-quick-stats";
- version = "2.0.12";
+ version = "2.0.13";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
- sha256 = "1diisgz8xc2ghsfdz3vh6z4vn13vvb9gf0i6qml0a46a5fqf32zb";
+ sha256 = "0j0a4y50wlwban40lj8y89ch4xnmm1ag8klkl8smbrn972d5d0cy";
};
PREFIX = builtins.placeholder "out";
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index a7af74a8dc8..58ccb5d4cef 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
pname = "icestorm";
version = "2019.09.13";
- pythonPkg = if usePyPy then pypy3 else python3;
- pythonInterp = pythonPkg.interpreter;
+ passthru = rec {
+ pythonPkg = if usePyPy then pypy3 else python3;
+ pythonInterp = pythonPkg.interpreter;
+ };
src = fetchFromGitHub {
owner = "cliffordwolf";
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ pythonPkg libftdi1 ];
+ buildInputs = [ passthru.pythonPkg libftdi1 ];
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;
@@ -39,12 +41,12 @@ stdenv.mkDerivation rec {
--replace /usr/local/share "$out/share"
for x in icefuzz/Makefile icebox/Makefile icetime/Makefile; do
- substituteInPlace "$x" --replace python3 "${pythonInterp}"
+ substituteInPlace "$x" --replace python3 "${passthru.pythonInterp}"
done
for x in $(find . -type f -iname '*.py'); do
substituteInPlace "$x" \
- --replace '/usr/bin/env python3' '${pythonInterp}'
+ --replace '/usr/bin/env python3' '${passthru.pythonInterp}'
done
'';
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index f2bb771f217..53c2bf9a6bc 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
- version = "20200117T215443";
+ version = "20200121T234305";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
- sha256 = "0ccn3700lam5m5yh5hdcm6wkazyr3dhvhyc9bc08basjwk09lfkp";
+ sha256 = "04598vxay85q2blr49xh4pb58i4rsgjbznnn2cszcqgyzh05fs4y";
};
dontUnpack = true;
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 3e5c12e183a..e66341b5f8c 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -72,15 +72,15 @@ let
};
in stdenv.mkDerivation rec {
pname = "hydra";
- version = "2019-11-13";
+ version = "2020-02-06";
inherit stdenv;
src = fetchFromGitHub {
owner = "NixOS";
repo = pname;
- rev = "20dd0bbe6a90d9066e635ee82e98efec23b17e51";
- sha256 = "06chiaa7p54zxngmy2q3ps7bbiqpdv9h2rfmprh83qz36xps9rs2";
+ rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc";
+ sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick";
};
buildInputs =
diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix
index 10d067e2c61..580414f4d9d 100644
--- a/pkgs/development/tools/misc/tinyprog/default.nix
+++ b/pkgs/development/tools/misc/tinyprog/default.nix
@@ -6,13 +6,13 @@
with python3Packages; buildPythonApplication rec {
pname = "tinyprog";
# `python setup.py --version` from repo checkout
- version = "1.0.24.dev99+ga77f828";
+ version = "1.0.24.dev114+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "tinyfpga";
repo = "TinyFPGA-Bootloader";
- rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7";
- sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q";
+ rev = "97f6353540bf7c0d27f5612f202b48f41da75299";
+ sha256 = "0zbrvvb957z2lwbfd39ixqdsnd2w4wfjirwkqdrqm27bjz308731";
};
sourceRoot = "source/programmer";
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index e283c3bd02f..957f691d225 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -1,17 +1,17 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
-, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux
+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux
, go-md2man }:
with stdenv.lib;
let
- version = "0.1.40";
+ version = "0.1.41";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
- sha256 = "1bagirzdzjhicn5dr691092ac3q6lhz3xngjzgqiqkxnvpz7p6cn";
+ sha256 = "0aqw17irj2wn4a8g9hzfm5z5azqq33z6r1dbg1gyn2c8qxy1vfxs";
};
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
@@ -29,7 +29,7 @@ buildGoPackage {
excludedPackages = "integration";
nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
- buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ];
+ buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ];
buildFlagsArray = ''
-ldflags=
@@ -51,7 +51,7 @@ buildGoPackage {
meta = {
description = "A command line utility for various operations on container images and image repositories";
- homepage = https://github.com/projectatomic/skopeo;
+ homepage = "https://github.com/containers/skopeo";
maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ];
license = stdenv.lib.licenses.asl20;
};
diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 007f97753cd..130aa87f7ce 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,24 +8,24 @@ let
in
stdenv.mkDerivation rec {
pname = "trellis";
- version = "2019.10.13";
+ version = "2020.02.04";
# git describe --tags
realVersion = with stdenv.lib; with builtins;
- "1.0-95-g${substring 0 7 (elemAt srcs 0).rev}";
+ "1.0-130-g${substring 0 7 (elemAt srcs 0).rev}";
srcs = [
(fetchFromGitHub {
owner = "SymbiFlow";
repo = "prjtrellis";
- rev = "e2e10bfdfaa29fed5d19e83dc7460be9880f5af4";
- sha256 = "0l59nliv75rdxnajl2plilib0r0bzbr3qqzc88cdal841x1m0izs";
+ rev = "4e4b95c8e03583d48d76d1229f9c7825e2ee5be1";
+ sha256 = "02kg48393bjiys56r62b4ks2xvfarw9phi5bips2xsnj9c99pmg0";
name = "trellis";
})
(fetchFromGitHub {
owner = "SymbiFlow";
repo = "prjtrellis-db";
- rev = "5b5bb70bae13e6b8c971b4b2d26931f4a64b51bc";
- sha256 = "1fi963zdny3gxdvq564037qs22i7b4y7mxc3yij2a1ww8rzrnpdj";
+ rev = "717478b757a702bbc7e3e11a5fbecee2a64f7922";
+ sha256 = "0q4j8qz3m2hissn2a82ck542cx62bp4f0wwzl3g22yv59i13yg83";
name = "trellis-database";
})
];
@@ -33,7 +33,12 @@ stdenv.mkDerivation rec {
buildInputs = [ boostWithPython3 ];
nativeBuildInputs = [ cmake python3 ];
- cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" ];
+ cmakeFlags = [
+ "-DCURRENT_GIT_VERSION=${realVersion}"
+ # TODO: should this be in stdenv instead?
+ "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
+ ];
+ enableParallelBuilding = true;
preConfigure = with builtins; ''
rmdir database && ln -sfv ${elemAt srcs 1} ./database
@@ -50,7 +55,7 @@ stdenv.mkDerivation rec {
to provide sufficient information to develop a free and
open Verilog to bitstream toolchain for these devices.
'';
- homepage = https://github.com/symbiflow/prjtrellis;
+ homepage = https://github.com/SymbiFlow/prjtrellis;
license = stdenv.lib.licenses.isc;
maintainers = with maintainers; [ q3k thoughtpolice emily ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 154b228e0e1..daf46ec4896 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yarn";
- version = "1.21.1";
+ version = "1.22.0";
src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
- sha256 = "1yw3v62a6309f9hr189870i9jw2a15pkians1nnfjqczzh7r5pih";
+ sha256 = "0hbsdbrqx5xhr171ik862v51xwjzbfncic92pgbnhnlmxy2y974x";
};
buildInputs = [ nodejs ];
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index ea23ad06cd2..dce8479d219 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -61,18 +61,18 @@ in
configureFlags = let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
host = stdenv.hostPlatform.platform;
- isArm = stdenv.hostPlatform.isArm;
+ isAarch32 = stdenv.hostPlatform.isAarch32;
in sharedConfigureFlags ++ [
"--without-dtrace"
] ++ (optionals isCross [
"--cross-compiling"
"--without-intl"
"--without-snapshot"
- ]) ++ (optionals (isCross && isArm && hasAttr "fpu" host.gcc) [
+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
"--with-arm-fpu=${host.gcc.fpu}"
- ]) ++ (optionals (isCross && isArm && hasAttr "float-abi" host.gcc) [
+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
"--with-arm-float-abi=${host.gcc.float-abi}"
- ]) ++ (optionals (isCross && isArm) [
+ ]) ++ (optionals (isCross && isAarch32) [
"--dest-cpu=arm"
]) ++ extraConfigFlags;
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index c0aea8927b9..15d2ff5d57e 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gzdoom";
- version = "4.3.1";
+ version = "4.3.3";
src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
- sha256 = "1fpdwgm6qx66q1kqg1x32lcm61hk3a033lhagk819kicdsib90b7";
+ sha256 = "1c4vhnvvwy1rs8xm01kqd486h5xsiccwkf95fjx7912zr49yalks";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index 13ebeb1d2a9..58a6a1dd442 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -1,11 +1,14 @@
-{stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}:
+{stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}:
stdenv.mkDerivation {
- name = "fceux-2.2.3";
+ pname = "fceux-unstable";
+ version = "2020-01-29";
- src = fetchurl {
- url = mirror://sourceforge/fceultra/Source%20Code/2.2.3%20src/fceux-2.2.3.src.tar.gz;
- sha256 = "0gl2i3qdmcm7v9m5kpfz98w05d8m33990jiwka043ya7lflxvrjb";
+ src = fetchFromGitHub {
+ owner = "TASVideos";
+ repo = "fceux";
+ rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337";
+ sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992";
};
nativeBuildInputs = [ pkgconfig scons ];
@@ -30,6 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "A Nintendo Entertainment System (NES) Emulator";
license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.scubed2 ];
homepage = http://www.fceux.com/;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 5487b6cdc2a..abf4970c616 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -2,13 +2,13 @@
buildPythonApplication rec {
name = "frescobaldi-${version}";
- version = "3.1";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "wbsoft";
repo = "frescobaldi";
rev = "v${version}";
- sha256 = "0sv6dc1l34rrhfbn1wqkl9zs9hiacmmbviw87d0d03987s1iirb1";
+ sha256 = "07hjlq29npasn2bsb3qrzr1gikyvcc85avx0sxybfih329bvjk03";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7ecff5207df..f9579a9fde5 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -114,7 +114,7 @@ let
CLS_U32_PERF = yes;
CLS_U32_MARK = yes;
BPF_JIT = whenPlatformHasEBPFJit yes;
- BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit yes;
+ BPF_JIT_ALWAYS_ON = no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304
HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes;
BPF_STREAM_PARSER = whenAtLeast "4.19" yes;
XDP_SOCKETS = whenAtLeast "4.19" yes;
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index a9947f92fc9..c5b94d2d0c5 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mcelog";
- version = "167";
+ version = "168";
src = fetchFromGitHub {
owner = "andikleen";
repo = "mcelog";
rev = "v${version}";
- sha256 = "0vkkqri3x11p7wz8z8rym4v637qpvw7lj6v40sx7sgh1g97ja9iy";
+ sha256 = "0mcmmjvvc80nk20n4dknimv0jzvdkj1ajgyq33b2i4v6xq0bz1pb";
};
postPatch = ''
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index f67bc5b0045..462151400fd 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null;
assert enableExtendedAttrs -> attr != null;
stdenv.mkDerivation rec {
- name = "lighttpd-1.4.54";
+ name = "lighttpd-1.4.55";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
- sha256 = "08c7kbdfq915dzzqcghwacrgia197hd1w66knvydi5ja4picq56g";
+ sha256 = "09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va";
};
postPatch = ''
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index f4081e5fa01..7626d487e2a 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -102,13 +102,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpd";
- version = "0.21.18";
+ version = "0.21.19";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
- sha256 = "04kzdxigg6yhf5km66hxk6y8n7gl72bxnv2bc5zy274fzqf4cy9p";
+ sha256 = "0awfnhygasww2xbxnc3a81hv2kbw3v3mblav6wjvzz25qipv19dq";
};
buildInputs = [ glib boost ]
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 235e113728d..57f3b2e0f1b 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "groonga";
- version = "9.1.1";
+ version = "9.1.2";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
- sha256 = "16i5bmypawxjac6g808qgr0z3rvla6g6dr586rmwl7sbq0z2nr82";
+ sha256 = "0zj9zribkg4x6c6175pwl4i6jpxg045bca1ywfrfcdsxkjllvk7g";
};
buildInputs = with stdenv.lib;
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index df2d35d541b..77d70e84258 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -137,9 +137,6 @@ let
isi686 isx86_32 isx86_64
is32bit is64bit
isAarch32 isAarch64 isMips isBigEndian;
- isArm = lib.warn
- "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead"
- hostPlatform.isAarch32;
# The derivation's `system` is `buildPlatform.system`.
inherit (buildPlatform) system;
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 8287a84d30d..2beb33857eb 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
- version = "0.7.5";
+ version = "0.7.6";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "1xsdn16n867c7af3j02z7nxh1i71wi0g4zspnrgz1qmpxdw4aays";
+ sha256 = "1sgl6npbhg49aqlxmm3bnk3cmi9xpg8i5m4hickqfk1ni1z070ij";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 3fc082dad46..282252b4b13 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse, osxfuse }:
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
- version = "1.85";
+ version = "1.86";
src = fetchFromGitHub {
owner = "s3fs-fuse";
repo = "s3fs-fuse";
rev = "v${version}";
- sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m";
+ sha256 = "115zqbspr17xmidhizjmsqv9c7ql2jhmxws8wh59bpz2335kn0q7";
};
- buildInputs = [ curl openssl libxml2 fuse ];
+ buildInputs = [ curl openssl libxml2 ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ osxfuse ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags = [
@@ -25,6 +27,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Mount an S3 bucket as filesystem through FUSE";
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index b440808833f..a441124189c 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, autoreconfHook, tzdata }:
stdenv.mkDerivation rec {
- version = "0.4.6";
+ version = "0.4.7";
pname = "dateutils";
src = fetchurl {
url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
- sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816";
+ sha256 = "16jr9yjk8wgzfh22hr3z6mp4jm3fkacyibds4jj5xx5yymbm8wj9";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 97b4aa1db28..12e6e1af93a 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "135";
+ version = "136";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "1grf28mb6lyxdqbmvws4h7inalda9z7qnjx7dc859mzkf54cn3yd";
+ sha256 = "0an9c63xgy1bvqnpnn9mfphsq1qx8ba69yk15nqa9p78iqq2hf4h";
};
patches = [
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index 2a0846dd511..2888b2a1186 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "opentsdb";
- version = "2.3.1";
+ version = "2.4.0";
src = fetchurl {
url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd";
+ sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2";
};
buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ];
diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/tools/misc/tmux-xpanes/default.nix
index 3ea5f758050..06e7980167a 100644
--- a/pkgs/tools/misc/tmux-xpanes/default.nix
+++ b/pkgs/tools/misc/tmux-xpanes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tmux-xpanes";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchFromGitHub {
owner = "greymd";
repo = pname;
rev = "v${version}";
- sha256 = "11yz6rh2ckd1z8q80n8giv2gcz2i22fgf3pnfxq96qrzflb0d96a";
+ sha256 = "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi";
};
buildInputs = [ openssl perl ];
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 58ad9182261..68527ebebb4 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -3,13 +3,13 @@
with python3Packages;
buildPythonApplication rec {
pname = "wakatime";
- version = "13.0.3";
+ version = "13.0.4";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime";
rev = version;
- sha256 = "16g23nm1x1a142rmnljdclq03c5anfzyiiazxaxyka8bggzhfmmc";
+ sha256 = "11np3cc5ha785vlmknk7vr7spgk2nw0wls0li60vfpvggbv0r4j6";
};
# needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt
diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
index 434e06ac50d..089eee332b4 100644
--- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
license = licenses.isc;
homepage = https://dnscrypt.info/;
- maintainers = with maintainers; [ waynr ];
+ maintainers = with maintainers; [ atemu waynr ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 3718f69370e..5ebe8fab889 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fio";
- version = "3.17";
+ version = "3.18";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
- sha256 = "1s37w8bhg23ml1f89x0bkaifywlkgh31305vmip4xfvh3j3vjbym";
+ sha256 = "0p2w1pyjh7vjxqxibjawi7waqb7n0lwnx21qj0z75g8zhb629l0w";
};
buildInputs = [ python zlib ]
diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix
index 19502e5a352..512bb7341ca 100644
--- a/pkgs/tools/system/java-service-wrapper/default.nix
+++ b/pkgs/tools/system/java-service-wrapper/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "java-service-wrapper";
- version = "3.5.41";
+ version = "3.5.42";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
- sha256 = "0wvazc4y134brn99aa4rc9jdh1h2q3l7qhhvbcs6lhf4ym47sskm";
+ sha256 = "1gi4zc7fhqm7rb1ajpnxx0n7ngpa06ja46mb5p65h025mz567ywd";
};
buildInputs = [ jdk ];
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 788319c0c04..2ea7b11677e 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lr";
- version = "1.5";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "chneukirchen";
repo = "lr";
rev = "v${version}";
- sha256 = "1dxla14ldyym01lhmacfwps1vim0fk67c2ik2w08gg534siyj770";
+ sha256 = "1wv2acm4r5y5gg6f64v2hiwpg1f3lnr4fy1a9zssw77fmdc7ys3j";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4973de6095..eacd6a076d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1222,6 +1222,8 @@ in
behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
+ bless = callPackage ../applications/editors/bless { };
+
blink1-tool = callPackage ../tools/misc/blink1-tool { };
bliss = callPackage ../applications/science/math/bliss { };
@@ -21045,7 +21047,7 @@ in
qmmp = libsForQt5.callPackage ../applications/audio/qmmp { };
- qnotero = callPackage ../applications/office/qnotero { };
+ qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
qrcode = callPackage ../tools/graphics/qrcode {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec469c1e1e6..8f91f619532 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2928,6 +2928,8 @@ in {
nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
+ nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };
+
nxt-python = callPackage ../development/python-modules/nxt-python { };
odfpy = callPackage ../development/python-modules/odfpy { };