git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit03755ed59a34197c0d54552bf42d95e66931376b authorFrederik Rietdijk <fridh@fridh.nl> dateSun 9 Feb 2020, 09:17 (7 years ago) parent30f0909eee784a
101 files changed+2056−2447
lib/systems/default.nix+1−1 lib/systems/inspect.nix−3 maintainers/maintainer-list.nix+6 nixos/doc/manual/installation/upgrading.xml+9−4 nixos/lib/test-driver/test-driver.py+40−4 nixos/modules/config/pulseaudio.nix+3 nixos/modules/services/networking/wireguard.nix+1−1 nixos/modules/services/x11/display-managers/default.nix+4−2 nixos/modules/tasks/filesystems.nix+6−2 nixos/tests/all-tests.nix+1 nixos/tests/installer.nix+524−503 nixos/tests/zfs.nix+32−43 pkgs/applications/audio/fomp/default.nix+2−2 pkgs/applications/editors/bless/default.nix+80 pkgs/applications/editors/rstudio/default.nix+6−5 pkgs/applications/editors/vscode/vscode.nix+3−3 pkgs/applications/misc/bleachbit/default.nix+2−2 pkgs/applications/misc/cherrytree/default.nix+2−2 pkgs/applications/misc/gallery-dl/default.nix+2−2 pkgs/applications/misc/grip/default.nix+2−2 pkgs/applications/misc/pdfsam-basic/default.nix+2−2 pkgs/applications/networking/browsers/conkeror/default.nix+3−3 pkgs/applications/networking/cloudflared/default.nix+5−7 pkgs/applications/networking/cloudflared/deps.nix−453 pkgs/applications/networking/cluster/k9s/default.nix+2−2 pkgs/applications/networking/esniper/default.nix+3−3 pkgs/applications/networking/flexget/default.nix+2−2 pkgs/applications/office/qnotero/default.nix+13−11 pkgs/applications/science/biology/picard-tools/default.nix+2−2 pkgs/applications/science/chemistry/marvin/default.nix+2−2 pkgs/applications/science/electronics/librepcb/default.nix+6−6 pkgs/applications/science/logic/symbiyosys/default.nix+5−5 pkgs/applications/science/math/gmsh/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-machete/default.nix+2−2 pkgs/applications/virtualization/crun/default.nix+2−2 pkgs/applications/virtualization/podman/default.nix+2−2 pkgs/applications/window-managers/i3/status-rust.nix+3−3 pkgs/data/fonts/jetbrains-mono/default.nix+2−2 pkgs/data/themes/matcha/default.nix+3−3 pkgs/desktops/cinnamon/cinnamon-translations/default.nix+2−2 pkgs/development/compilers/nextpnr/default.nix+6−10 pkgs/development/compilers/ponyc/default.nix+2−2 pkgs/development/compilers/yosys/default.nix+4−5 pkgs/development/haskell-modules/configuration-common.nix+8−4 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+6 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+2−2 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+46−43 pkgs/development/haskell-modules/configuration-nix.nix+3 pkgs/development/haskell-modules/hackage-packages.nix+981−1132 pkgs/development/interpreters/joker/default.nix+4−2 pkgs/development/libraries/cimg/default.nix+2−2 pkgs/development/libraries/dnnl/default.nix+2−2 pkgs/development/libraries/libuchardet/default.nix+1−1 pkgs/development/libraries/science/math/m4ri/default.nix+2−2 pkgs/development/misc/h3/default.nix+2−2 pkgs/development/mobile/cocoapods/Gemfile-beta.lock+7−7 pkgs/development/mobile/cocoapods/gemset-beta.nix+12−12 pkgs/development/python-modules/fx2/default.nix+3−3 pkgs/development/python-modules/glasgow/default.nix+7−5 pkgs/development/python-modules/nmigen-boards/default.nix+7−7 pkgs/development/python-modules/nmigen-soc/default.nix+35 pkgs/development/python-modules/nmigen/default.nix+8−9 pkgs/development/python-modules/pyvcd/default.nix+6−4 pkgs/development/python-modules/sipsimple/default.nix+3 pkgs/development/tools/analysis/checkstyle/default.nix+2−2 pkgs/development/tools/analysis/codeql/default.nix+2−2 pkgs/development/tools/analysis/randoop/default.nix+2−2 pkgs/development/tools/build-managers/sbt/default.nix+2−2 pkgs/development/tools/buildah/default.nix+4−4 pkgs/development/tools/flyway/default.nix+2−2 pkgs/development/tools/git-quick-stats/default.nix+2−2 pkgs/development/tools/icestorm/default.nix+7−5 pkgs/development/tools/misc/clojure-lsp/default.nix+2−2 pkgs/development/tools/misc/hydra/default.nix+3−3 pkgs/development/tools/misc/tinyprog/default.nix+3−3 pkgs/development/tools/skopeo/default.nix+5−5 pkgs/development/tools/trellis/default.nix+13−8 pkgs/development/tools/yarn/default.nix+2−2 pkgs/development/web/nodejs/nodejs.nix+4−4 pkgs/games/gzdoom/default.nix+2−2 pkgs/misc/emulators/fceux/default.nix+9−5 pkgs/misc/frescobaldi/default.nix+2−2 pkgs/os-specific/linux/kernel/common-config.nix+1−1 pkgs/os-specific/linux/mcelog/default.nix+2−2 pkgs/servers/http/lighttpd/default.nix+2−2 pkgs/servers/mpd/default.nix+2−2 pkgs/servers/search/groonga/default.nix+2−2 pkgs/stdenv/generic/default.nix−3 pkgs/tools/filesystems/fuse-overlayfs/default.nix+2−2 pkgs/tools/filesystems/s3fs/default.nix+7−5 pkgs/tools/misc/dateutils/default.nix+2−2 pkgs/tools/misc/diffoscope/default.nix+2−2 pkgs/tools/misc/opentsdb/default.nix+2−2 pkgs/tools/misc/tmux-xpanes/default.nix+2−2 pkgs/tools/misc/wakatime/default.nix+2−2 pkgs/tools/networking/dnscrypt-proxy2/default.nix+1−1 pkgs/tools/system/fio/default.nix+2−2 pkgs/tools/system/java-service-wrapper/default.nix+2−2 pkgs/tools/system/lr/default.nix+2−2 pkgs/top-level/all-packages.nix+3−1 pkgs/top-level/python-packages.nix+2
lib/systems/default.nix+1−1
@@ -84,7 +84,7 @@ rec {
8484 else final.parsed.cpu.name;
8585
8686 qemuArch =
87− if final.isArm then "arm"
87+ if final.isAarch32 then "arm"
8888 else if final.isx86_64 then "x86_64"
8989 else if final.isx86 then "i386"
9090 else {
lib/systems/inspect.nix−3
@@ -55,9 +55,6 @@ rec {
5555
5656 isEfi = map (family: { cpu.family = family; })
5757 [ "x86" "arm" "aarch64" ];
58−
59− # Deprecated after 18.03
60− isArm = isAarch32;
6158 };
6259
6360 matchAnyAttrs = patterns:
maintainers/maintainer-list.nix+6
@@ -682,6 +682,12 @@
682682 githubId = 192147;
683683 name = "aszlig";
684684 };
685+ atemu = {
686+ name = "Atemu";
687+ email = "atemu.main+nixpkgs@gmail.com";
688+ github = "Atemu";
689+ githubId = 18599032;
690+ };
685691 athas = {
686692 email = "athas@sigkill.dk";
687693 github = "athas";
nixos/doc/manual/installation/upgrading.xml+9−4
@@ -120,12 +120,17 @@ nixos https://nixos.org/channels/nixos-unstable
120120 to <filename>configuration.nix</filename>:
121121<programlisting>
122122<xref linkend="opt-system.autoUpgrade.enable"/> = true;
123+<xref linkend="opt-system.autoUpgrade.allowReboot"/> = true;
123124</programlisting>
124125 This enables a periodically executed systemd service named
125− <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild
126− switch --upgrade</command> to upgrade NixOS to the latest version in the
127− current channel. (To see when the service runs, see <command>systemctl
128− list-timers</command>.) You can also specify a channel explicitly, e.g.
126+ <literal>nixos-upgrade.service</literal>. If the <literal>allowReboot</literal>
127+ option is <literal>false</literal>, it runs <command>nixos-rebuild switch
128+ --upgrade</command> to upgrade NixOS to the latest version in the current
129+ channel. (To see when the service runs, see <command>systemctl list-timers</command>.)
130+ If <literal>allowReboot</literal> is <literal>true</literal>, then the
131+ system will automatically reboot if the new generation contains a different
132+ kernel, initrd or kernel modules.
133+ You can also specify a channel explicitly, e.g.
129134<programlisting>
130135<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.09;
131136</programlisting>
nixos/lib/test-driver/test-driver.py+40−4
@@ -1,13 +1,17 @@
11#! /somewhere/python3
22from contextlib import contextmanager, _GeneratorContextManager
3+from queue import Queue, Empty
4+from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
35from xml.sax.saxutils import XMLGenerator
46import _thread
57import atexit
8+import base64
69import os
10+import pathlib
711import ptpython.repl
812import pty
9−from queue import Queue, Empty
1013import re
14+import shlex
1115import shutil
1216import socket
1317import subprocess
@@ -15,9 +19,6 @@ import sys
1519import tempfile
1620import time
1721import unicodedata
18−from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
19−import shlex
20−import pathlib
2122
2223CHAR_TO_KEY = {
2324 "A": "shift-a",
@@ -566,6 +567,41 @@ class Machine:
566567 if ret.returncode != 0:
567568 raise Exception("Cannot convert screenshot")
568569
570+ def copy_from_host_via_shell(self, source: str, target: str) -> None:
571+ """Copy a file from the host into the guest by piping it over the
572+ shell into the destination file. Works without host-guest shared folder.
573+ Prefer copy_from_host for whenever possible.
574+ """
575+ with open(source, "rb") as fh:
576+ content_b64 = base64.b64encode(fh.read()).decode()
577+ self.succeed(
578+ f"mkdir -p $(dirname {target})",
579+ f"echo -n {content_b64} | base64 -d > {target}",
580+ )
581+
582+ def copy_from_host(self, source: str, target: str) -> None:
583+ """Copy a file from the host into the guest via the `shared_dir` shared
584+ among all the VMs (using a temporary directory).
585+ """
586+ host_src = pathlib.Path(source)
587+ vm_target = pathlib.Path(target)
588+ with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:
589+ shared_temp = pathlib.Path(shared_td)
590+ host_intermediate = shared_temp / host_src.name
591+ vm_shared_temp = pathlib.Path("/tmp/shared") / shared_temp.name
592+ vm_intermediate = vm_shared_temp / host_src.name
593+
594+ self.succeed(make_command(["mkdir", "-p", vm_shared_temp]))
595+ if host_src.is_dir():
596+ shutil.copytree(host_src, host_intermediate)
597+ else:
598+ shutil.copy(host_src, host_intermediate)
599+ self.succeed("sync")
600+ self.succeed(make_command(["mkdir", "-p", vm_target.parent]))
601+ self.succeed(make_command(["cp", "-r", vm_intermediate, vm_target]))
602+ # Make sure the cleanup is synced into VM
603+ self.succeed("sync")
604+
569605 def copy_from_vm(self, source: str, target_dir: str = "") -> None:
570606 """Copy a file from the VM (specified by an in-VM source path) to a path
571607 relative to `$out`. The file is copied via the `shared_dir` shared among
nixos/modules/config/pulseaudio.nix+3
@@ -248,6 +248,9 @@ in {
248248 security.rtkit.enable = true;
249249
250250 systemd.packages = [ overriddenPackage ];
251+
252+ # PulseAudio is packaged with udev rules to handle various audio device quirks
253+ services.udev.packages = [ overriddenPackage ];
251254 })
252255
253256 (mkIf (cfg.extraModules != []) {
nixos/modules/services/networking/wireguard.nix+1−1
@@ -151,7 +151,7 @@ let
151151 publicKey = mkOption {
152152 example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
153153 type = types.str;
154− description = "The base64 public key the peer.";
154+ description = "The base64 public key of the peer.";
155155 };
156156
157157 presharedKey = mkOption {
nixos/modules/services/x11/display-managers/default.nix+4−2
@@ -141,9 +141,11 @@ let
141141 '';
142142
143143 dmDefault = cfg.desktopManager.default;
144+ # fallback default for cases when only default wm is set
145+ dmFallbackDefault = if dmDefault != null then dmDefault else "none";
144146 wmDefault = cfg.windowManager.default;
145147
146− defaultSessionFromLegacyOptions = concatStringsSep "+" (filter (s: s != null) ([ dmDefault ] ++ optional (wmDefault != "none") wmDefault));
148+ defaultSessionFromLegacyOptions = dmFallbackDefault + optionalString (wmDefault != null && wmDefault != "none") "+${wmDefault}";
147149
148150in
149151
@@ -358,7 +360,7 @@ in
358360 { c = wmDefault; t = "- services.xserver.windowManager.default"; }
359361 ]))}
360362 Please use
361− services.xserver.displayManager.defaultSession = "${concatStringsSep "+" (filter (s: s != null) [ dmDefault wmDefault ])}";
363+ services.xserver.displayManager.defaultSession = "${defaultSessionFromLegacyOptions}";
362364 instead.
363365 ''
364366 ];
nixos/modules/tasks/filesystems.nix+6−2
@@ -304,6 +304,10 @@ in
304304
305305 in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems));
306306
307+ systemd.tmpfiles.rules = [
308+ "Z /run/keys 0750 root ${toString config.ids.gids.keys}"
309+ ];
310+
307311 # Sync mount options with systemd's src/core/mount-setup.c: mount_table.
308312 boot.specialFileSystems = {
309313 "/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; };
@@ -312,8 +316,8 @@ in
312316 "/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; };
313317 "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "ptmxmode=0666" "gid=${toString config.ids.gids.tty}" ]; };
314318
315− # To hold secrets that shouldn't be written to disk (generally used for NixOps, harmless elsewhere)
316− "/run/keys" = { fsType = "ramfs"; options = [ "nosuid" "nodev" "mode=750" "gid=${toString config.ids.gids.keys}" ]; };
319+ # To hold secrets that shouldn't be written to disk
320+ "/run/keys" = { fsType = "ramfs"; options = [ "nosuid" "nodev" "mode=750" ]; };
317321 } // optionalAttrs (!config.boot.isContainer) {
318322 # systemd-nspawn populates /sys by itself, and remounting it causes all
319323 # kinds of weird issues (most noticeably, waiting for host disk device
nixos/tests/all-tests.nix+1
@@ -308,6 +308,7 @@ in
308308 xss-lock = handleTest ./xss-lock.nix {};
309309 yabar = handleTest ./yabar.nix {};
310310 yggdrasil = handleTest ./yggdrasil.nix {};
311+ zfs = handleTest ./zfs.nix {};
311312 zsh-history = handleTest ./zsh-history.nix {};
312313 zookeeper = handleTest ./zookeeper.nix {};
313314}
nixos/tests/installer.nix+524−503
@@ -3,7 +3,7 @@
33 pkgs ? import ../.. { inherit system config; }
44}:
55
6−with import ../lib/testing.nix { inherit system pkgs; };
6+with import ../lib/testing-python.nix { inherit system pkgs; };
77with pkgs.lib;
88
99let
@@ -67,161 +67,193 @@ let
6767 , grubIdentifier, preBootCommands, extraConfig
6868 , testCloneConfig
6969 }:
70− let
71− iface = if grubVersion == 1 then "ide" else "virtio";
72− isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
73−
74− # FIXME don't duplicate the -enable-kvm etc. flags here yet again!
75− qemuFlags =
76− (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
77− (optionalString (system == "x86_64-linux") "-cpu host ") +
78− (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host ");
79−
80− hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''
81− + optionalString isEfi (if pkgs.stdenv.isAarch64
82− then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
83− else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
70+ let iface = if grubVersion == 1 then "ide" else "virtio";
71+ isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
72+ bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd";
8473 in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
8574 throw "Non-EFI boot methods are only supported on i686 / x86_64"
8675 else ''
76+ def assemble_qemu_flags():
77+ flags = "-cpu host"
78+ ${if system == "x86_64-linux"
79+ then ''flags += " -m 768"''
80+ else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
81+ }
82+ return flags
8783
88− $machine->start;
8984
90− # Make sure that we get a login prompt etc.
91− $machine->succeed("echo hello");
92− #$machine->waitForUnit('getty@tty2');
93− #$machine->waitForUnit("rogue");
94− $machine->waitForUnit("nixos-manual");
85+ qemu_flags = {"qemuFlags": assemble_qemu_flags()}
9586
96− # Wait for hard disks to appear in /dev
97− $machine->succeed("udevadm settle");
87+ hd_flags = {
88+ "hdaInterface": "${iface}",
89+ "hda": "vm-state-machine/machine.qcow2",
90+ }
91+ ${optionalString isEfi ''
92+ hd_flags.update(
93+ bios="${pkgs.OVMF.fd}/FV/${bios}"
94+ )''
95+ }
96+ default_flags = {**hd_flags, **qemu_flags}
9897
99− # Partition the disk.
100− ${createPartitions}
10198
102− # Create the NixOS configuration.
103− $machine->succeed("nixos-generate-config --root /mnt");
99+ def create_machine_named(name):
100+ return create_machine({**default_flags, "name": "boot-after-install"})
104101
105− $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
106102
107− $machine->copyFileFromHost(
108− "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; } }",
109− "/mnt/etc/nixos/configuration.nix");
103+ machine.start()
110104
111− # Perform the installation.
112− $machine->succeed("nixos-install < /dev/null >&2");
105+ with subtest("Assert readiness of login prompt"):
106+ machine.succeed("echo hello")
107+ machine.wait_for_unit("nixos-manual")
113108
114− # Do it again to make sure it's idempotent.
115− $machine->succeed("nixos-install < /dev/null >&2");
109+ with subtest("Wait for hard disks to appear in /dev"):
110+ machine.succeed("udevadm settle")
116111
117− $machine->succeed("umount /mnt/boot || true");
118− $machine->succeed("umount /mnt");
119− $machine->succeed("sync");
112+ ${createPartitions}
120113
121− $machine->shutdown;
114+ with subtest("Create the NixOS configuration"):
115+ machine.succeed("nixos-generate-config --root /mnt")
116+ machine.succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2")
117+ machine.copy_from_host(
118+ "${ makeConfig {
119+ inherit bootLoader grubVersion grubDevice grubIdentifier
120+ grubUseEfi extraConfig;
121+ }
122+ }",
123+ "/mnt/etc/nixos/configuration.nix",
124+ )
125+
126+ with subtest("Perform the installation"):
127+ machine.succeed("nixos-install < /dev/null >&2")
128+
129+ with subtest("Do it again to make sure it's idempotent"):
130+ machine.succeed("nixos-install < /dev/null >&2")
131+
132+ with subtest("Shutdown system after installation"):
133+ machine.succeed("umount /mnt/boot || true")
134+ machine.succeed("umount /mnt")
135+ machine.succeed("sync")
136+ machine.shutdown()
122137
123138 # Now see if we can boot the installation.
124− $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "boot-after-install" });
139+ machine = create_machine_named("boot-after-install")
125140
126141 # For example to enter LUKS passphrase.
127142 ${preBootCommands}
128143
129− # Did /boot get mounted?
130− $machine->waitForUnit("local-fs.target");
131−
132− ${if bootLoader == "grub" then
133− ''$machine->succeed("test -e /boot/grub");''
134− else
135− ''$machine->succeed("test -e /boot/loader/loader.conf");''
136− }
137−
138− # Check whether /root has correct permissions.
139− $machine->succeed("stat -c '%a' /root") =~ /700/ or die;
140−
141− # Did the swap device get activated?
142− # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved
143− $machine->waitForUnit("swap.target");
144− $machine->succeed("cat /proc/swaps | grep -q /dev");
145−
146− # Check that the store is in good shape
147− $machine->succeed("nix-store --verify --check-contents >&2");
148−
149− # Check whether the channel works.
150− $machine->succeed("nix-env -iA nixos.procps >&2");
151− $machine->succeed("type -tP ps | tee /dev/stderr") =~ /.nix-profile/
152− or die "nix-env failed";
153−
154− # Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon)
155− $machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2");
156−
157− # We need a writable Nix store on next boot.
158− $machine->copyFileFromHost(
159− "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 1; } }",
160− "/etc/nixos/configuration.nix");
161−
162− # Check whether nixos-rebuild works.
163− $machine->succeed("nixos-rebuild switch >&2");
164−
165− # Test nixos-option.
166− $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console");
167− $machine->succeed("nixos-option boot.initrd.kernelModules | grep 'List of modules'");
168− $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix");
169−
170− $machine->shutdown;
144+ with subtest("Assert that /boot get mounted"):
145+ machine.wait_for_unit("local-fs.target")
146+ ${if bootLoader == "grub"
147+ then ''machine.succeed("test -e /boot/grub")''
148+ else ''machine.succeed("test -e /boot/loader/loader.conf")''
149+ }
150+
151+ with subtest("Check whether /root has correct permissions"):
152+ assert "700" in machine.succeed("stat -c '%a' /root")
153+
154+ with subtest("Assert swap device got activated"):
155+ # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved
156+ machine.wait_for_unit("swap.target")
157+ machine.succeed("cat /proc/swaps | grep -q /dev")
158+
159+ with subtest("Check that the store is in good shape"):
160+ machine.succeed("nix-store --verify --check-contents >&2")
161+
162+ with subtest("Check whether the channel works"):
163+ machine.succeed("nix-env -iA nixos.procps >&2")
164+ assert ".nix-profile" in machine.succeed("type -tP ps | tee /dev/stderr")
165+
166+ with subtest(
167+ "Check that the daemon works, and that non-root users can run builds "
168+ "(this will build a new profile generation through the daemon)"
169+ ):
170+ machine.succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2")
171+
172+ with subtest("Configure system with writable Nix store on next boot"):
173+ # we're not using copy_from_host here because the installer image
174+ # doesn't know about the host-guest sharing mechanism.
175+ machine.copy_from_host_via_shell(
176+ "${ makeConfig {
177+ inherit bootLoader grubVersion grubDevice grubIdentifier
178+ grubUseEfi extraConfig;
179+ forceGrubReinstallCount = 1;
180+ }
181+ }",
182+ "/etc/nixos/configuration.nix",
183+ )
184+
185+ with subtest("Check whether nixos-rebuild works"):
186+ machine.succeed("nixos-rebuild switch >&2")
187+
188+ with subtest("Test nixos-option"):
189+ kernel_modules = machine.succeed("nixos-option boot.initrd.kernelModules")
190+ assert "virtio_console" in kernel_modules
191+ assert "List of modules" in kernel_modules
192+ assert "qemu-guest.nix" in kernel_modules
193+
194+ machine.shutdown()
171195
172196 # Check whether a writable store build works
173− $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "rebuild-switch" });
197+ machine = create_machine_named("rebuild-switch")
174198 ${preBootCommands}
175− $machine->waitForUnit("multi-user.target");
176− $machine->copyFileFromHost(
177− "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 2; } }",
178− "/etc/nixos/configuration.nix");
179− $machine->succeed("nixos-rebuild boot >&2");
180− $machine->shutdown;
199+ machine.wait_for_unit("multi-user.target")
200+
201+ # we're not using copy_from_host here because the installer image
202+ # doesn't know about the host-guest sharing mechanism.
203+ machine.copy_from_host_via_shell(
204+ "${ makeConfig {
205+ inherit bootLoader grubVersion grubDevice grubIdentifier
206+ grubUseEfi extraConfig;
207+ forceGrubReinstallCount = 2;
208+ }
209+ }",
210+ "/etc/nixos/configuration.nix",
211+ )
212+ machine.succeed("nixos-rebuild boot >&2")
213+ machine.shutdown()
181214
182215 # And just to be sure, check that the machine still boots after
183216 # "nixos-rebuild switch".
184− $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", "boot-after-rebuild-switch" });
217+ machine = create_machine_named("boot-after-rebuild-switch")
185218 ${preBootCommands}
186− $machine->waitForUnit("network.target");
187− $machine->shutdown;
219+ machine.wait_for_unit("network.target")
220+ machine.shutdown()
188221
189222 # Tests for validating clone configuration entries in grub menu
190− ${optionalString testCloneConfig ''
191− # Reboot Machine
192− $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "clone-default-config" });
193− ${preBootCommands}
194− $machine->waitForUnit("multi-user.target");
195−
196− # Booted configuration name should be Home
197− # This is not the name that shows in the grub menu.
198− # The default configuration is always shown as "Default"
199− $machine->succeed("cat /run/booted-system/configuration-name >&2");
200− $machine->succeed("cat /run/booted-system/configuration-name | grep Home");
223+ ''
224+ + optionalString testCloneConfig ''
225+ # Reboot Machine
226+ machine = create_machine_named("clone-default-config")
227+ ${preBootCommands}
228+ machine.wait_for_unit("multi-user.target")
201229
202− # We should find **not** a file named /etc/gitconfig
203− $machine->fail("test -e /etc/gitconfig");
230+ with subtest("Booted configuration name should be 'Home'"):
231+ # This is not the name that shows in the grub menu.
232+ # The default configuration is always shown as "Default"
233+ machine.succeed("cat /run/booted-system/configuration-name >&2")
234+ assert "Home" in machine.succeed("cat /run/booted-system/configuration-name")
204235
205− # Set grub to boot the second configuration
206− $machine->succeed("grub-reboot 1");
236+ with subtest("We should **not** find a file named /etc/gitconfig"):
237+ machine.fail("test -e /etc/gitconfig")
207238
208− $machine->shutdown;
239+ with subtest("Set grub to boot the second configuration"):
240+ machine.succeed("grub-reboot 1")
209241
210− # Reboot Machine
211− $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "clone-alternate-config" });
212− ${preBootCommands}
242+ machine.shutdown()
213243
214− $machine->waitForUnit("multi-user.target");
215− # Booted configuration name should be Work
216− $machine->succeed("cat /run/booted-system/configuration-name >&2");
217− $machine->succeed("cat /run/booted-system/configuration-name | grep Work");
244+ # Reboot Machine
245+ machine = create_machine_named("clone-alternate-config")
246+ ${preBootCommands}
218247
219− # We should find a file named /etc/gitconfig
220− $machine->succeed("test -e /etc/gitconfig");
248+ machine.wait_for_unit("multi-user.target")
249+ with subtest("Booted configuration name should be Work"):
250+ machine.succeed("cat /run/booted-system/configuration-name >&2")
251+ assert "Work" in machine.succeed("cat /run/booted-system/configuration-name")
221252
222− $machine->shutdown;
223− ''}
253+ with subtest("We should find a file named /etc/gitconfig"):
254+ machine.succeed("test -e /etc/gitconfig")
224255
256+ machine.shutdown()
225257 '';
226258
227259
@@ -243,63 +275,63 @@ let
243275 nodes = {
244276
245277 # The configuration of the machine used to run "nixos-install".
246− machine =
247− { pkgs, ... }:
248−
249− { imports =
250− [ ../modules/profiles/installation-device.nix
251− ../modules/profiles/base.nix
252− extraInstallerConfig
253− ];
254−
255− virtualisation.diskSize = 8 * 1024;
256− virtualisation.memorySize = 1024;
257−
258− # Use a small /dev/vdb as the root disk for the
259− # installer. This ensures the target disk (/dev/vda) is
260− # the same during and after installation.
261− virtualisation.emptyDiskImages = [ 512 ];
262− virtualisation.bootDevice =
263− if grubVersion == 1 then "/dev/sdb" else "/dev/vdb";
264− virtualisation.qemu.diskInterface =
265− if grubVersion == 1 then "scsi" else "virtio";
266−
267− boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true;
268−
269− hardware.enableAllFirmware = mkForce false;
270−
271− # The test cannot access the network, so any packages we
272− # need must be included in the VM.
273− system.extraDependencies = with pkgs;
274− [ sudo
275− libxml2.bin
276− libxslt.bin
277− desktop-file-utils
278− docbook5
279− docbook_xsl_ns
280− unionfs-fuse
281− ntp
282− nixos-artwork.wallpapers.simple-dark-gray-bottom
283− perlPackages.XMLLibXML
284− perlPackages.ListCompare
285− shared-mime-info
286− texinfo
287− xorg.lndir
288−
289− # add curl so that rather than seeing the test attempt to download
290− # curl's tarball, we see what it's trying to download
291− curl
292− ]
293− ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
294− ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
295−
296− nix.binaryCaches = mkForce [ ];
297− nix.extraOptions =
298− ''
299− hashed-mirrors =
300− connect-timeout = 1
301− '';
302− };
278+ machine = { pkgs, ... }: {
279+ imports = [
280+ ../modules/profiles/installation-device.nix
281+ ../modules/profiles/base.nix
282+ extraInstallerConfig
283+ ];
284+
285+ virtualisation.diskSize = 8 * 1024;
286+ virtualisation.memorySize = 1024;
287+
288+ # Use a small /dev/vdb as the root disk for the
289+ # installer. This ensures the target disk (/dev/vda) is
290+ # the same during and after installation.
291+ virtualisation.emptyDiskImages = [ 512 ];
292+ virtualisation.bootDevice =
293+ if grubVersion == 1 then "/dev/sdb" else "/dev/vdb";
294+ virtualisation.qemu.diskInterface =
295+ if grubVersion == 1 then "scsi" else "virtio";
296+
297+ boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true;
298+
299+ hardware.enableAllFirmware = mkForce false;
300+
301+ # The test cannot access the network, so any packages we
302+ # need must be included in the VM.
303+ system.extraDependencies = with pkgs; [
304+ desktop-file-utils
305+ docbook5
306+ docbook_xsl_ns
307+ libxml2.bin
308+ libxslt.bin
309+ nixos-artwork.wallpapers.simple-dark-gray-bottom
310+ ntp
311+ perlPackages.ListCompare
312+ perlPackages.XMLLibXML
313+ shared-mime-info
314+ sudo
315+ texinfo
316+ unionfs-fuse
317+ xorg.lndir
318+
319+ # add curl so that rather than seeing the test attempt to download
320+ # curl's tarball, we see what it's trying to download
321+ curl
322+ ]
323+ ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
324+ ++ optionals (bootLoader == "grub" && grubVersion == 2) [
325+ pkgs.grub2
326+ pkgs.grub2_efi
327+ ];
328+
329+ nix.binaryCaches = mkForce [ ];
330+ nix.extraOptions = ''
331+ hashed-mirrors =
332+ connect-timeout = 1
333+ '';
334+ };
303335
304336 };
305337
@@ -310,13 +342,13 @@ let
310342 };
311343 };
312344
313− makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name
314− { createPartitions = ''
315− $machine->succeed(
345+ makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name {
346+ createPartitions = ''
347+ machine.succeed(
316348 "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
317− . " mkpart primary ext2 1M 50MB" # /boot
318− . " mkpart primary linux-swap 50M 1024M"
319− . " mkpart primary 1024M -1s", # LUKS
349+ + " mkpart primary ext2 1M 50MB" # /boot
350+ + " mkpart primary linux-swap 50M 1024M"
351+ + " mkpart primary 1024M -1s", # LUKS
320352 "udevadm settle",
321353 "mkswap /dev/vda2 -L swap",
322354 "swapon -L swap",
@@ -328,77 +360,74 @@ let
328360 "mkfs.ext3 -L boot /dev/vda1",
329361 "mkdir -p /mnt/boot",
330362 "mount LABEL=boot /mnt/boot",
331− );
332− '';
333− extraConfig = ''
334− boot.kernelParams = lib.mkAfter [ "console=tty0" ];
335− '';
336− enableOCR = true;
337− preBootCommands = ''
338− $machine->start;
339− $machine->waitForText(qr/Passphrase for/);
340− $machine->sendChars("supersecret\n");
341− '';
342− };
363+ )
364+ '';
365+ extraConfig = ''
366+ boot.kernelParams = lib.mkAfter [ "console=tty0" ];
367+ '';
368+ enableOCR = true;
369+ preBootCommands = ''
370+ machine.start()
371+ machine.wait_for_text("Passphrase for")
372+ machine.send_chars("supersecret\n")
373+ '';
374+ };
343375
344376 # The (almost) simplest partitioning scheme: a swap partition and
345377 # one big filesystem partition.
346− simple-test-config = { createPartitions =
347− ''
348− $machine->succeed(
349− "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
350− . " mkpart primary linux-swap 1M 1024M"
351− . " mkpart primary ext2 1024M -1s",
352− "udevadm settle",
353− "mkswap /dev/vda1 -L swap",
354− "swapon -L swap",
355− "mkfs.ext3 -L nixos /dev/vda2",
356− "mount LABEL=nixos /mnt",
357− );
358− '';
359− };
360−
361− simple-uefi-grub-config =
362− { createPartitions =
363− ''
364− $machine->succeed(
365− "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
366− . " mkpart ESP fat32 1M 50MiB" # /boot
367− . " set 1 boot on"
368− . " mkpart primary linux-swap 50MiB 1024MiB"
369− . " mkpart primary ext2 1024MiB -1MiB", # /
370− "udevadm settle",
371− "mkswap /dev/vda2 -L swap",
372− "swapon -L swap",
373− "mkfs.ext3 -L nixos /dev/vda3",
374− "mount LABEL=nixos /mnt",
375− "mkfs.vfat -n BOOT /dev/vda1",
376− "mkdir -p /mnt/boot",
377− "mount LABEL=BOOT /mnt/boot",
378− );
379− '';
380− bootLoader = "grub";
381− grubUseEfi = true;
382− };
378+ simple-test-config = {
379+ createPartitions = ''
380+ machine.succeed(
381+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
382+ + " mkpart primary linux-swap 1M 1024M"
383+ + " mkpart primary ext2 1024M -1s",
384+ "udevadm settle",
385+ "mkswap /dev/vda1 -L swap",
386+ "swapon -L swap",
387+ "mkfs.ext3 -L nixos /dev/vda2",
388+ "mount LABEL=nixos /mnt",
389+ )
390+ '';
391+ };
392+
393+ simple-uefi-grub-config = {
394+ createPartitions = ''
395+ machine.succeed(
396+ "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
397+ + " mkpart ESP fat32 1M 50MiB" # /boot
398+ + " set 1 boot on"
399+ + " mkpart primary linux-swap 50MiB 1024MiB"
400+ + " mkpart primary ext2 1024MiB -1MiB", # /
401+ "udevadm settle",
402+ "mkswap /dev/vda2 -L swap",
403+ "swapon -L swap",
404+ "mkfs.ext3 -L nixos /dev/vda3",
405+ "mount LABEL=nixos /mnt",
406+ "mkfs.vfat -n BOOT /dev/vda1",
407+ "mkdir -p /mnt/boot",
408+ "mount LABEL=BOOT /mnt/boot",
409+ )
410+ '';
411+ bootLoader = "grub";
412+ grubUseEfi = true;
413+ };
383414
384− clone-test-extraconfig = { extraConfig =
385− ''
386− environment.systemPackages = [ pkgs.grub2 ];
387− boot.loader.grub.configurationName = "Home";
388− nesting.clone = [
389− {
390− boot.loader.grub.configurationName = lib.mkForce "Work";
391−
392− environment.etc = {
393− "gitconfig".text = "
394− [core]
395− gitproxy = none for work.com
396− ";
397− };
398− }
399− ];
400− '';
401− testCloneConfig = true;
415+ clone-test-extraconfig = {
416+ extraConfig = ''
417+ environment.systemPackages = [ pkgs.grub2 ];
418+ boot.loader.grub.configurationName = "Home";
419+ nesting.clone = [ {
420+ boot.loader.grub.configurationName = lib.mkForce "Work";
421+
422+ environment.etc = {
423+ "gitconfig".text = "
424+ [core]
425+ gitproxy = none for work.com
426+ ";
427+ };
428+ } ];
429+ '';
430+ testCloneConfig = true;
402431 };
403432
404433
@@ -415,27 +444,26 @@ in {
415444 simpleClone = makeInstallerTest "simpleClone" (simple-test-config // clone-test-extraconfig);
416445
417446 # Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem
418− simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot"
419− { createPartitions =
420− ''
421− $machine->succeed(
422− "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
423− . " mkpart ESP fat32 1M 50MiB" # /boot
424− . " set 1 boot on"
425− . " mkpart primary linux-swap 50MiB 1024MiB"
426− . " mkpart primary ext2 1024MiB -1MiB", # /
427− "udevadm settle",
428− "mkswap /dev/vda2 -L swap",
429− "swapon -L swap",
430− "mkfs.ext3 -L nixos /dev/vda3",
431− "mount LABEL=nixos /mnt",
432− "mkfs.vfat -n BOOT /dev/vda1",
433− "mkdir -p /mnt/boot",
434− "mount LABEL=BOOT /mnt/boot",
435− );
436− '';
437− bootLoader = "systemd-boot";
438− };
447+ simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot" {
448+ createPartitions = ''
449+ machine.succeed(
450+ "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
451+ + " mkpart ESP fat32 1M 50MiB" # /boot
452+ + " set 1 boot on"
453+ + " mkpart primary linux-swap 50MiB 1024MiB"
454+ + " mkpart primary ext2 1024MiB -1MiB", # /
455+ "udevadm settle",
456+ "mkswap /dev/vda2 -L swap",
457+ "swapon -L swap",
458+ "mkfs.ext3 -L nixos /dev/vda3",
459+ "mount LABEL=nixos /mnt",
460+ "mkfs.vfat -n BOOT /dev/vda1",
461+ "mkdir -p /mnt/boot",
462+ "mount LABEL=BOOT /mnt/boot",
463+ )
464+ '';
465+ bootLoader = "systemd-boot";
466+ };
439467
440468 simpleUefiGrub = makeInstallerTest "simpleUefiGrub" simple-uefi-grub-config;
441469
@@ -443,107 +471,99 @@ in {
443471 simpleUefiGrubClone = makeInstallerTest "simpleUefiGrubClone" (simple-uefi-grub-config // clone-test-extraconfig);
444472
445473 # Same as the previous, but now with a separate /boot partition.
446− separateBoot = makeInstallerTest "separateBoot"
447− { createPartitions =
448− ''
449− $machine->succeed(
450− "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
451− . " mkpart primary ext2 1M 50MB" # /boot
452− . " mkpart primary linux-swap 50MB 1024M"
453− . " mkpart primary ext2 1024M -1s", # /
454− "udevadm settle",
455− "mkswap /dev/vda2 -L swap",
456− "swapon -L swap",
457− "mkfs.ext3 -L nixos /dev/vda3",
458− "mount LABEL=nixos /mnt",
459− "mkfs.ext3 -L boot /dev/vda1",
460− "mkdir -p /mnt/boot",
461− "mount LABEL=boot /mnt/boot",
462− );
463− '';
464− };
474+ separateBoot = makeInstallerTest "separateBoot" {
475+ createPartitions = ''
476+ machine.succeed(
477+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
478+ + " mkpart primary ext2 1M 50MB" # /boot
479+ + " mkpart primary linux-swap 50MB 1024M"
480+ + " mkpart primary ext2 1024M -1s", # /
481+ "udevadm settle",
482+ "mkswap /dev/vda2 -L swap",
483+ "swapon -L swap",
484+ "mkfs.ext3 -L nixos /dev/vda3",
485+ "mount LABEL=nixos /mnt",
486+ "mkfs.ext3 -L boot /dev/vda1",
487+ "mkdir -p /mnt/boot",
488+ "mount LABEL=boot /mnt/boot",
489+ )
490+ '';
491+ };
465492
466493 # Same as the previous, but with fat32 /boot.
467− separateBootFat = makeInstallerTest "separateBootFat"
468− { createPartitions =
469− ''
470− $machine->succeed(
471− "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
472− . " mkpart primary ext2 1M 50MB" # /boot
473− . " mkpart primary linux-swap 50MB 1024M"
474− . " mkpart primary ext2 1024M -1s", # /
475− "udevadm settle",
476− "mkswap /dev/vda2 -L swap",
477− "swapon -L swap",
478− "mkfs.ext3 -L nixos /dev/vda3",
479− "mount LABEL=nixos /mnt",
480− "mkfs.vfat -n BOOT /dev/vda1",
481− "mkdir -p /mnt/boot",
482− "mount LABEL=BOOT /mnt/boot",
483− );
484− '';
485− };
494+ separateBootFat = makeInstallerTest "separateBootFat" {
495+ createPartitions = ''
496+ machine.succeed(
497+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
498+ + " mkpart primary ext2 1M 50MB" # /boot
499+ + " mkpart primary linux-swap 50MB 1024M"
500+ + " mkpart primary ext2 1024M -1s", # /
501+ "udevadm settle",
502+ "mkswap /dev/vda2 -L swap",
503+ "swapon -L swap",
504+ "mkfs.ext3 -L nixos /dev/vda3",
505+ "mount LABEL=nixos /mnt",
506+ "mkfs.vfat -n BOOT /dev/vda1",
507+ "mkdir -p /mnt/boot",
508+ "mount LABEL=BOOT /mnt/boot",
509+ )
510+ '';
511+ };
486512
487513 # zfs on / with swap
488− zfsroot = makeInstallerTest "zfs-root"
489− {
490− extraInstallerConfig = {
491− boot.supportedFilesystems = [ "zfs" ];
492− };
493−
494− extraConfig = ''
495− boot.supportedFilesystems = [ "zfs" ];
496−
497− # Using by-uuid overrides the default of by-id, and is unique
498− # to the qemu disks, as they don't produce by-id paths for
499− # some reason.
500− boot.zfs.devNodes = "/dev/disk/by-uuid/";
501− networking.hostId = "00000000";
502− '';
503−
504− createPartitions =
505− ''
506− $machine->succeed(
507− "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
508− . " mkpart primary linux-swap 1M 1024M"
509− . " mkpart primary 1024M -1s",
510− "udevadm settle",
514+ zfsroot = makeInstallerTest "zfs-root" {
515+ extraInstallerConfig = {
516+ boot.supportedFilesystems = [ "zfs" ];
517+ };
511518
512− "mkswap /dev/vda1 -L swap",
513− "swapon -L swap",
519+ extraConfig = ''
520+ boot.supportedFilesystems = [ "zfs" ];
514521
515− "zpool create rpool /dev/vda2",
516− "zfs create -o mountpoint=legacy rpool/root",
517− "mount -t zfs rpool/root /mnt",
522+ # Using by-uuid overrides the default of by-id, and is unique
523+ # to the qemu disks, as they don't produce by-id paths for
524+ # some reason.
525+ boot.zfs.devNodes = "/dev/disk/by-uuid/";
526+ networking.hostId = "00000000";
527+ '';
518528
519− "udevadm settle"
520− );
521− '';
522− };
529+ createPartitions = ''
530+ machine.succeed(
531+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
532+ + " mkpart primary linux-swap 1M 1024M"
533+ + " mkpart primary 1024M -1s",
534+ "udevadm settle",
535+ "mkswap /dev/vda1 -L swap",
536+ "swapon -L swap",
537+ "zpool create rpool /dev/vda2",
538+ "zfs create -o mountpoint=legacy rpool/root",
539+ "mount -t zfs rpool/root /mnt",
540+ "udevadm settle",
541+ )
542+ '';
543+ };
523544
524545 # Create two physical LVM partitions combined into one volume group
525546 # that contains the logical swap and root partitions.
526− lvm = makeInstallerTest "lvm"
527− { createPartitions =
528− ''
529− $machine->succeed(
530− "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
531− . " mkpart primary 1M 2048M" # PV1
532− . " set 1 lvm on"
533− . " mkpart primary 2048M -1s" # PV2
534− . " set 2 lvm on",
535− "udevadm settle",
536− "pvcreate /dev/vda1 /dev/vda2",
537− "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
538− "lvcreate --size 1G --name swap MyVolGroup",
539− "lvcreate --size 2G --name nixos MyVolGroup",
540− "mkswap -f /dev/MyVolGroup/swap -L swap",
541− "swapon -L swap",
542− "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
543− "mount LABEL=nixos /mnt",
544− );
545− '';
546− };
547+ lvm = makeInstallerTest "lvm" {
548+ createPartitions = ''
549+ machine.succeed(
550+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
551+ + " mkpart primary 1M 2048M" # PV1
552+ + " set 1 lvm on"
553+ + " mkpart primary 2048M -1s" # PV2
554+ + " set 2 lvm on",
555+ "udevadm settle",
556+ "pvcreate /dev/vda1 /dev/vda2",
557+ "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
558+ "lvcreate --size 1G --name swap MyVolGroup",
559+ "lvcreate --size 2G --name nixos MyVolGroup",
560+ "mkswap -f /dev/MyVolGroup/swap -L swap",
561+ "swapon -L swap",
562+ "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
563+ "mount LABEL=nixos /mnt",
564+ )
565+ '';
566+ };
547567
548568 # Boot off an encrypted root partition with the default LUKS header format
549569 luksroot = makeLuksRootTest "luksroot-format1" "";
@@ -557,14 +577,14 @@ in {
557577 # Test whether opening encrypted filesystem with keyfile
558578 # Checks for regression of missing cryptsetup, when no luks device without
559579 # keyfile is configured
560− encryptedFSWithKeyfile = makeInstallerTest "encryptedFSWithKeyfile"
561− { createPartitions = ''
562− $machine->succeed(
580+ encryptedFSWithKeyfile = makeInstallerTest "encryptedFSWithKeyfile" {
581+ createPartitions = ''
582+ machine.succeed(
563583 "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
564− . " mkpart primary ext2 1M 50MB" # /boot
565− . " mkpart primary linux-swap 50M 1024M"
566− . " mkpart primary 1024M 1280M" # LUKS with keyfile
567− . " mkpart primary 1280M -1s",
584+ + " mkpart primary ext2 1M 50MB" # /boot
585+ + " mkpart primary linux-swap 50M 1024M"
586+ + " mkpart primary 1024M 1280M" # LUKS with keyfile
587+ + " mkpart primary 1280M -1s",
568588 "udevadm settle",
569589 "mkswap /dev/vda2 -L swap",
570590 "swapon -L swap",
@@ -579,89 +599,88 @@ in {
579599 "cryptsetup luksOpen --key-file /mnt/keyfile /dev/vda3 crypt",
580600 "mkfs.ext3 -L test /dev/mapper/crypt",
581601 "cryptsetup luksClose crypt",
582− "mkdir -p /mnt/test"
583− );
584− '';
585− extraConfig = ''
586− fileSystems."/test" =
587− { device = "/dev/disk/by-label/test";
588− fsType = "ext3";
589− encrypted.enable = true;
590− encrypted.blkDev = "/dev/vda3";
591− encrypted.label = "crypt";
592− encrypted.keyFile = "/mnt-root/keyfile";
593− };
594− '';
595− };
596−
602+ "mkdir -p /mnt/test",
603+ )
604+ '';
605+ extraConfig = ''
606+ fileSystems."/test" = {
607+ device = "/dev/disk/by-label/test";
608+ fsType = "ext3";
609+ encrypted.enable = true;
610+ encrypted.blkDev = "/dev/vda3";
611+ encrypted.label = "crypt";
612+ encrypted.keyFile = "/mnt-root/keyfile";
613+ };
614+ '';
615+ };
597616
598− swraid = makeInstallerTest "swraid"
599− { createPartitions =
600− ''
601− $machine->succeed(
602− "flock /dev/vda parted --script /dev/vda --"
603− . " mklabel msdos"
604− . " mkpart primary ext2 1M 100MB" # /boot
605− . " mkpart extended 100M -1s"
606− . " mkpart logical 102M 2102M" # md0 (root), first device
607− . " mkpart logical 2103M 4103M" # md0 (root), second device
608− . " mkpart logical 4104M 4360M" # md1 (swap), first device
609− . " mkpart logical 4361M 4617M", # md1 (swap), second device
610− "udevadm settle",
611− "ls -l /dev/vda* >&2",
612− "cat /proc/partitions >&2",
613− "udevadm control --stop-exec-queue",
614− "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
615− "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
616− "udevadm control --start-exec-queue",
617− "udevadm settle",
618− "mkswap -f /dev/md1 -L swap",
619− "swapon -L swap",
620− "mkfs.ext3 -L nixos /dev/md0",
621− "mount LABEL=nixos /mnt",
622− "mkfs.ext3 -L boot /dev/vda1",
623− "mkdir /mnt/boot",
624− "mount LABEL=boot /mnt/boot",
625− "udevadm settle",
626− );
627− '';
628− preBootCommands = ''
629− $machine->start;
630− $machine->fail("dmesg | grep 'immediate safe mode'");
631− '';
632− };
617+ swraid = makeInstallerTest "swraid" {
618+ createPartitions = ''
619+ machine.succeed(
620+ "flock /dev/vda parted --script /dev/vda --"
621+ + " mklabel msdos"
622+ + " mkpart primary ext2 1M 100MB" # /boot
623+ + " mkpart extended 100M -1s"
624+ + " mkpart logical 102M 2102M" # md0 (root), first device
625+ + " mkpart logical 2103M 4103M" # md0 (root), second device
626+ + " mkpart logical 4104M 4360M" # md1 (swap), first device
627+ + " mkpart logical 4361M 4617M", # md1 (swap), second device
628+ "udevadm settle",
629+ "ls -l /dev/vda* >&2",
630+ "cat /proc/partitions >&2",
631+ "udevadm control --stop-exec-queue",
632+ "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 "
633+ + "--raid-devices=2 /dev/vda5 /dev/vda6",
634+ "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 "
635+ + "--raid-devices=2 /dev/vda7 /dev/vda8",
636+ "udevadm control --start-exec-queue",
637+ "udevadm settle",
638+ "mkswap -f /dev/md1 -L swap",
639+ "swapon -L swap",
640+ "mkfs.ext3 -L nixos /dev/md0",
641+ "mount LABEL=nixos /mnt",
642+ "mkfs.ext3 -L boot /dev/vda1",
643+ "mkdir /mnt/boot",
644+ "mount LABEL=boot /mnt/boot",
645+ "udevadm settle",
646+ )
647+ '';
648+ preBootCommands = ''
649+ machine.start()
650+ machine.fail("dmesg | grep 'immediate safe mode'")
651+ '';
652+ };
633653
634654 # Test a basic install using GRUB 1.
635− grub1 = makeInstallerTest "grub1"
636− { createPartitions =
637− ''
638− $machine->succeed(
639− "flock /dev/sda parted --script /dev/sda -- mklabel msdos"
640− . " mkpart primary linux-swap 1M 1024M"
641− . " mkpart primary ext2 1024M -1s",
642− "udevadm settle",
643− "mkswap /dev/sda1 -L swap",
644− "swapon -L swap",
645− "mkfs.ext3 -L nixos /dev/sda2",
646− "mount LABEL=nixos /mnt",
647− "mkdir -p /mnt/tmp",
648− );
649− '';
650− grubVersion = 1;
651− grubDevice = "/dev/sda";
652− };
655+ grub1 = makeInstallerTest "grub1" {
656+ createPartitions = ''
657+ machine.succeed(
658+ "flock /dev/sda parted --script /dev/sda -- mklabel msdos"
659+ + " mkpart primary linux-swap 1M 1024M"
660+ + " mkpart primary ext2 1024M -1s",
661+ "udevadm settle",
662+ "mkswap /dev/sda1 -L swap",
663+ "swapon -L swap",
664+ "mkfs.ext3 -L nixos /dev/sda2",
665+ "mount LABEL=nixos /mnt",
666+ "mkdir -p /mnt/tmp",
667+ )
668+ '';
669+ grubVersion = 1;
670+ grubDevice = "/dev/sda";
671+ };
653672
654673 # Test using labels to identify volumes in grub
655674 simpleLabels = makeInstallerTest "simpleLabels" {
656675 createPartitions = ''
657− $machine->succeed(
658− "sgdisk -Z /dev/vda",
659− "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",
660− "mkswap /dev/vda2 -L swap",
661− "swapon -L swap",
662− "mkfs.ext4 -L root /dev/vda3",
663− "mount LABEL=root /mnt",
664− );
676+ machine.succeed(
677+ "sgdisk -Z /dev/vda",
678+ "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",
679+ "mkswap /dev/vda2 -L swap",
680+ "swapon -L swap",
681+ "mkfs.ext4 -L root /dev/vda3",
682+ "mount LABEL=root /mnt",
683+ )
665684 '';
666685 grubIdentifier = "label";
667686 };
@@ -670,22 +689,23 @@ in {
670689 # TODO: Fix udev so the symlinks are unneeded in /dev/disks
671690 simpleProvided = makeInstallerTest "simpleProvided" {
672691 createPartitions = ''
673− my $UUID = "\$(blkid -s UUID -o value /dev/vda2)";
674− $machine->succeed(
675− "sgdisk -Z /dev/vda",
676− "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",
677− "mkswap /dev/vda3 -L swap",
678− "swapon -L swap",
679− "mkfs.ext4 -L boot /dev/vda2",
680− "mkfs.ext4 -L root /dev/vda4",
681− );
682− $machine->execute("ln -s ../../vda2 /dev/disk/by-uuid/$UUID");
683− $machine->execute("ln -s ../../vda4 /dev/disk/by-label/root");
684− $machine->succeed(
685− "mount /dev/disk/by-label/root /mnt",
686− "mkdir /mnt/boot",
687− "mount /dev/disk/by-uuid/$UUID /mnt/boot"
688− );
692+ uuid = "$(blkid -s UUID -o value /dev/vda2)"
693+ machine.succeed(
694+ "sgdisk -Z /dev/vda",
695+ "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 "
696+ + "-t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda",
697+ "mkswap /dev/vda3 -L swap",
698+ "swapon -L swap",
699+ "mkfs.ext4 -L boot /dev/vda2",
700+ "mkfs.ext4 -L root /dev/vda4",
701+ )
702+ machine.execute(f"ln -s ../../vda2 /dev/disk/by-uuid/{uuid}")
703+ machine.execute("ln -s ../../vda4 /dev/disk/by-label/root")
704+ machine.succeed(
705+ "mount /dev/disk/by-label/root /mnt",
706+ "mkdir /mnt/boot",
707+ f"mount /dev/disk/by-uuid/{uuid} /mnt/boot",
708+ )
689709 '';
690710 grubIdentifier = "provided";
691711 };
@@ -693,61 +713,62 @@ in {
693713 # Simple btrfs grub testing
694714 btrfsSimple = makeInstallerTest "btrfsSimple" {
695715 createPartitions = ''
696− $machine->succeed(
697− "sgdisk -Z /dev/vda",
698− "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",
699− "mkswap /dev/vda2 -L swap",
700− "swapon -L swap",
701− "mkfs.btrfs -L root /dev/vda3",
702− "mount LABEL=root /mnt",
703− );
716+ machine.succeed(
717+ "sgdisk -Z /dev/vda",
718+ "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",
719+ "mkswap /dev/vda2 -L swap",
720+ "swapon -L swap",
721+ "mkfs.btrfs -L root /dev/vda3",
722+ "mount LABEL=root /mnt",
723+ )
704724 '';
705725 };
706726
707727 # Test to see if we can detect /boot and /nix on subvolumes
708728 btrfsSubvols = makeInstallerTest "btrfsSubvols" {
709729 createPartitions = ''
710− $machine->succeed(
711− "sgdisk -Z /dev/vda",
712− "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",
713− "mkswap /dev/vda2 -L swap",
714− "swapon -L swap",
715− "mkfs.btrfs -L root /dev/vda3",
716− "btrfs device scan",
717− "mount LABEL=root /mnt",
718− "btrfs subvol create /mnt/boot",
719− "btrfs subvol create /mnt/nixos",
720− "btrfs subvol create /mnt/nixos/default",
721− "umount /mnt",
722− "mount -o defaults,subvol=nixos/default LABEL=root /mnt",
723− "mkdir /mnt/boot",
724− "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
725− );
730+ machine.succeed(
731+ "sgdisk -Z /dev/vda",
732+ "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",
733+ "mkswap /dev/vda2 -L swap",
734+ "swapon -L swap",
735+ "mkfs.btrfs -L root /dev/vda3",
736+ "btrfs device scan",
737+ "mount LABEL=root /mnt",
738+ "btrfs subvol create /mnt/boot",
739+ "btrfs subvol create /mnt/nixos",
740+ "btrfs subvol create /mnt/nixos/default",
741+ "umount /mnt",
742+ "mount -o defaults,subvol=nixos/default LABEL=root /mnt",
743+ "mkdir /mnt/boot",
744+ "mount -o defaults,subvol=boot LABEL=root /mnt/boot",
745+ )
726746 '';
727747 };
728748
729749 # Test to see if we can detect default and aux subvolumes correctly
730750 btrfsSubvolDefault = makeInstallerTest "btrfsSubvolDefault" {
731751 createPartitions = ''
732− $machine->succeed(
733− "sgdisk -Z /dev/vda",
734− "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",
735− "mkswap /dev/vda2 -L swap",
736− "swapon -L swap",
737− "mkfs.btrfs -L root /dev/vda3",
738− "btrfs device scan",
739− "mount LABEL=root /mnt",
740− "btrfs subvol create /mnt/badpath",
741− "btrfs subvol create /mnt/badpath/boot",
742− "btrfs subvol create /mnt/nixos",
743− "btrfs subvol set-default \$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
744− "umount /mnt",
745− "mount -o defaults LABEL=root /mnt",
746− "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism is actually looking up subvolumes
747− "mkdir /mnt/boot",
748− "mount -o defaults,subvol=badpath/boot LABEL=root /mnt/boot",
749− );
752+ machine.succeed(
753+ "sgdisk -Z /dev/vda",
754+ "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",
755+ "mkswap /dev/vda2 -L swap",
756+ "swapon -L swap",
757+ "mkfs.btrfs -L root /dev/vda3",
758+ "btrfs device scan",
759+ "mount LABEL=root /mnt",
760+ "btrfs subvol create /mnt/badpath",
761+ "btrfs subvol create /mnt/badpath/boot",
762+ "btrfs subvol create /mnt/nixos",
763+ "btrfs subvol set-default "
764+ + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
765+ "umount /mnt",
766+ "mount -o defaults LABEL=root /mnt",
767+ "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism
768+ # is actually looking up subvolumes
769+ "mkdir /mnt/boot",
770+ "mount -o defaults,subvol=badpath/boot LABEL=root /mnt/boot",
771+ )
750772 '';
751773 };
752−
753774}
nixos/tests/zfs.nix+32−43
@@ -3,12 +3,10 @@
33 pkgs ? import ../.. { inherit system config; }
44}:
55
6−with import ../lib/testing.nix { inherit system pkgs; };
6+with import ../lib/testing-python.nix { inherit system pkgs; };
77
88let
99
10− makeTest = import ./make-test-python.nix;
11−
1210 makeZfsTest = name:
1311 { kernelPackage ? pkgs.linuxPackages_latest
1412 , enableUnstable ? false
@@ -20,41 +18,33 @@ let
2018 maintainers = [ adisbladis ];
2119 };
2220
23− machine = { pkgs, ... }:
24− {
25− virtualisation.emptyDiskImages = [ 4096 ];
26− networking.hostId = "deadbeef";
27− boot.kernelPackages = kernelPackage;
28− boot.supportedFilesystems = [ "zfs" ];
29− boot.zfs.enableUnstable = enableUnstable;
21+ machine = { pkgs, ... }: {
22+ virtualisation.emptyDiskImages = [ 4096 ];
23+ networking.hostId = "deadbeef";
24+ boot.kernelPackages = kernelPackage;
25+ boot.supportedFilesystems = [ "zfs" ];
26+ boot.zfs.enableUnstable = enableUnstable;
3027
31− environment.systemPackages = with pkgs; [
32− parted
33− ];
34− };
28+ environment.systemPackages = [ pkgs.parted ];
29+ };
3530
3631 testScript = ''
37− machine.succeed("modprobe zfs")
38− machine.succeed("zpool status")
39−
40− machine.succeed("ls /dev")
41−
4232 machine.succeed(
43− "mkdir /tmp/mnt",
44−
45− "udevadm settle",
46− "parted --script /dev/vdb mklabel msdos",
47− "parted --script /dev/vdb -- mkpart primary 1024M -1s",
48− "udevadm settle",
49−
50− "zpool create rpool /dev/vdb1",
51− "zfs create -o mountpoint=legacy rpool/root",
52− "mount -t zfs rpool/root /tmp/mnt",
53− "udevadm settle",
54−
55− "umount /tmp/mnt",
56− "zpool destroy rpool",
57− "udevadm settle"
33+ "modprobe zfs",
34+ "zpool status",
35+ "ls /dev",
36+ "mkdir /tmp/mnt",
37+ "udevadm settle",
38+ "parted --script /dev/vdb mklabel msdos",
39+ "parted --script /dev/vdb -- mkpart primary 1024M -1s",
40+ "udevadm settle",
41+ "zpool create rpool /dev/vdb1",
42+ "zfs create -o mountpoint=legacy rpool/root",
43+ "mount -t zfs rpool/root /tmp/mnt",
44+ "udevadm settle",
45+ "umount /tmp/mnt",
46+ "zpool destroy rpool",
47+ "udevadm settle",
5848 )
5949 '' + extraTest;
6050
@@ -69,18 +59,17 @@ in {
6959 enableUnstable = true;
7060 extraTest = ''
7161 machine.succeed(
72− "echo password | zpool create -o altroot=\"/tmp/mnt\" -O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1",
73− "zfs create -o mountpoint=legacy rpool/root",
74− "mount -t zfs rpool/root /tmp/mnt",
75− "udevadm settle",
76−
77− "umount /tmp/mnt",
78− "zpool destroy rpool",
79− "udevadm settle"
62+ 'echo password | zpool create -o altroot="/tmp/mnt" '
63+ + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1",
64+ "zfs create -o mountpoint=legacy rpool/root",
65+ "mount -t zfs rpool/root /tmp/mnt",
66+ "udevadm settle",
67+ "umount /tmp/mnt",
68+ "zpool destroy rpool",
69+ "udevadm settle",
8070 )
8171 '';
8272 };
8373
8474 installer = (import ./installer.nix { }).zfsroot;
85−
8675}
pkgs/applications/audio/fomp/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "fomp";
5− version = "1.0.0";
5+ version = "1.2.0";
66
77 src = fetchurl {
88 url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
9− sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
9+ sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig wafHook ];
pkgs/applications/editors/bless/default.nixnew file+80
@@ -0,0 +1,80 @@
1+{ stdenv
2+, fetchFromGitHub
3+, autoreconfHook
4+, pkgconfig
5+, mono
6+, gtk-sharp-2_0
7+, gettext
8+, makeWrapper
9+, glib
10+, gtk2-x11
11+, gnome2
12+}:
13+
14+stdenv.mkDerivation rec {
15+ pname = "bless";
16+ version = "0.6.2";
17+
18+ src = fetchFromGitHub {
19+ owner = "afrantzis";
20+ repo = pname;
21+ rev = "v${version}";
22+ sha256 = "04ra2mcx3pkhzbhcz0zwfmbpqj6cwisrypi6xbc2d6pxd4hdafn1";
23+ };
24+
25+ buildInputs = [
26+ gtk-sharp-2_0
27+ mono
28+ # runtime only deps
29+ glib
30+ gtk2-x11
31+ gnome2.libglade
32+ ];
33+
34+ nativeBuildInputs = [
35+ pkgconfig
36+ autoreconfHook
37+ gettext
38+ makeWrapper
39+ ];
40+
41+ configureFlags = [
42+ # scrollkeeper is a gnome2 package, so it must be old and we shouldn't really support it
43+ # NOTE: that sadly doesn't turn off the compilation of the manual with scrollkeeper, so we have to fake the binaries below
44+ "--without-scrollkeeper"
45+ ];
46+
47+ autoreconfPhase = ''
48+ mkdir _bin
49+
50+ # this fakes the scrollkeeper commands, to keep the build happy
51+ for f in scrollkeeper-preinstall scrollkeeper-update; do
52+ echo "true" > ./_bin/$f
53+ chmod +x ./_bin/$f
54+ done
55+
56+ export PATH="$PWD/_bin:$PATH"
57+
58+ # and it also wants to install that file
59+ touch ./doc/user/bless-manual.omf
60+
61+ # patch mono path
62+ sed "s|^mono|${mono}/bin/mono|g" -i src/bless-script.in
63+
64+ ./autogen.sh
65+ '';
66+
67+ preFixup = ''
68+ 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"
69+ wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH"
70+ '';
71+
72+ meta = with stdenv.lib; {
73+ homepage = "https://github.com/afrantzis/bless";
74+ description = "Gtk# Hex Editor";
75+ maintainers = [ maintainers.mkg20001 ];
76+ license = licenses.gpl2;
77+ platforms = platforms.linux;
78+ badPlatforms = [ "aarch64-linux" ];
79+ };
80+}
pkgs/applications/editors/rstudio/default.nix+6−5
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib
1+{ lib, mkDerivation, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib
22, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel
33, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
44, llvmPackages
55}:
66
7−with stdenv.lib;
7+with lib;
88let
99 verMajor = "1";
1010 verMinor = "2";
@@ -13,7 +13,7 @@ let
1313 ginVer = "2.1.2";
1414 gwtVer = "2.8.1";
1515in
16−stdenv.mkDerivation rec {
16+mkDerivation rec {
1717 pname = "RStudio";
1818 inherit version;
1919
@@ -116,15 +116,16 @@ stdenv.mkDerivation rec {
116116 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;";
117117 };
118118
119+ qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ];
120+
119121 postInstall = ''
120− wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
121122 mkdir $out/share
122123 cp -r ${desktopItem}/share/applications $out/share
123124 mkdir $out/share/icons
124125 ln $out/rstudio.png $out/share/icons
125126 '';
126127
127− meta = with stdenv.lib;
128+ meta = with lib;
128129 { description = "Set of integrated tools for the R language";
129130 homepage = https://www.rstudio.com/;
130131 license = licenses.agpl3;
pkgs/applications/editors/vscode/vscode.nix+3−3
@@ -11,15 +11,15 @@ let
1111 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
1212
1313 sha256 = {
14− x86_64-linux = "00b6q3rvf9v993i8d1vh9ckb86s655mz6kqkw0lxg8xmhpm568ra";
15− x86_64-darwin = "1r4qbjbypdqx9qmycykgkrg8anckicmdmawwwsszgkdd0zd5idgg";
14+ x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn";
15+ x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0";
1616 }.${system};
1717in
1818 callPackage ./generic.nix rec {
1919 # The update script doesn't correctly change the hash for darwin, so please:
2020 # nixpkgs-update: no auto update
2121
22− version = "1.41.1";
22+ version = "1.42.0";
2323 pname = "vscode";
2424
2525 executableName = "code" + lib.optionalString isInsiders "-insiders";
pkgs/applications/misc/bleachbit/default.nix+2−2
@@ -11,13 +11,13 @@
1111
1212pythonPackages.buildPythonApplication rec {
1313 pname = "bleachbit";
14− version = "3.0";
14+ version = "3.2.0";
1515
1616 format = "other";
1717
1818 src = fetchurl {
1919 url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
20− sha256 = "18ns9hms671b4l0189m1m2agprkydnpvyky9q2f5hxf35i9cn67d";
20+ sha256 = "1sszpn7ifiry0wwmkzdppzh61zvgrfypm9g7wk6q1ya20qhb5b51";
2121 };
2222
2323 nativeBuildInputs = [
pkgs/applications/misc/cherrytree/default.nix+2−2
@@ -2,11 +2,11 @@
22
33pythonPackages.buildPythonApplication rec {
44 pname = "cherrytree";
5− version = "0.38.10";
5+ version = "0.38.11";
66
77 src = fetchurl {
88 url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
9− sha256 = "1bj83b7lwqir13fp9slcdn8mgign06vywy42x8zvsp22fjn4p7f7";
9+ sha256 = "1awrrfyawa7d8qaipvikxm1p0961060az2qvmv9wwpl47zcnk1dn";
1010 };
1111
1212 nativeBuildInputs = [ gettext ];
pkgs/applications/misc/gallery-dl/default.nix+2−2
@@ -2,11 +2,11 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "gallery_dl";
5− version = "1.12.2";
5+ version = "1.12.3";
66
77 src = python3Packages.fetchPypi {
88 inherit pname version;
9− sha256 = "013bavyqvnay38c844n1jvirsmj807f0wg2qlclkdghkj316p1pz";
9+ sha256 = "06q6vmbliy935zlf4bbnfgiqyrx9vskz3fsks4jpxi47xs80rqkz";
1010 };
1111
1212 doCheck = false;
pkgs/applications/misc/grip/default.nix+2−2
@@ -2,11 +2,11 @@
22, curl, cdparanoia, libid3tag, ncurses, libtool }:
33
44stdenv.mkDerivation rec {
5− name = "grip-4.0.1";
5+ name = "grip-4.1.0";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/grip/${name}.tar.gz";
9− sha256 = "0blh5j3d4g16bhsqmhv71qhbsyyzcqywzpqsjjiiw465mjlwxka6";
9+ sha256 = "0iy7bcyrxm7zyrxah06qyxdshkgq6yqkadlw211j2qzld38a79j5";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/misc/pdfsam-basic/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "pdfsam-basic";
5− version = "4.0.5";
5+ version = "4.1.1";
66
77 src = fetchurl {
88 url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
9− sha256 = "1znadsg65312h8yyxvj8k0c4pl3g9daif50vk50acwpblq49wm1v";
9+ sha256 = "17qb3l7xibhb3fbskddvparrj2cxj4kz9qbril094kxrgbvyc9gs";
1010 };
1111
1212 unpackPhase = ''
pkgs/applications/networking/browsers/conkeror/default.nix+3−3
@@ -1,10 +1,10 @@
1−{ stdenv, fetchgit, unzip, firefox-esr, makeWrapper }:
1+{ stdenv, fetchgit, unzip, firefox-esr-52, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pkgname = "conkeror";
55 version = "1.0.4";
66 name = "${pkgname}-${version}";
7−
7+
88 src = fetchgit {
99 url = git://repo.or.cz/conkeror.git;
1010 rev = "refs/tags/${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 mkdir -p $out/libexec/conkeror
1818 cp -r * $out/libexec/conkeror
1919
20− makeWrapper ${firefox-esr}/bin/firefox $out/bin/conkeror \
20+ makeWrapper ${firefox-esr-52}/bin/firefox $out/bin/conkeror \
2121 --add-flags "-app $out/libexec/conkeror/application.ini"
2222 '';
2323
pkgs/applications/networking/cloudflared/default.nix+5−7
@@ -1,19 +1,17 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub }:
1+{ stdenv, buildGoModule, fetchFromGitHub }:
22
3−buildGoPackage rec {
3+buildGoModule rec {
44 pname = "cloudflared";
5− version = "2019.7.0";
6−
7− goPackagePath = "github.com/cloudflare/cloudflared";
5+ version = "2019.12.0";
86
97 src = fetchFromGitHub {
108 owner = "cloudflare";
119 repo = "cloudflared";
1210 rev = version;
13− sha256 = "19229p7c9m7v0xpmzi5rfwjzm845ikq8pndkry2si9azks18x77q";
11+ sha256 = "0cc78bysp7z76h4ddiwbsrygz4m4r71f8xylg99pc5qyg8p3my4p";
1412 };
1513
16− goDeps = ./deps.nix;
14+ modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p";
1715
1816 buildFlagsArray = "-ldflags=-X main.Version=${version}";
1917
pkgs/applications/networking/cloudflared/deps.nixdeleted−453
@@ -1,453 +0,0 @@
1−# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
2−[
3− {
4− goPackagePath = "github.com/BurntSushi/toml";
5− fetch = {
6− type = "git";
7− url = "https://github.com/BurntSushi/toml";
8− rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
9− sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
10− };
11− }
12− {
13− goPackagePath = "github.com/beorn7/perks";
14− fetch = {
15− type = "git";
16− url = "https://github.com/beorn7/perks";
17− rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46";
18− sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
19− };
20− }
21− {
22− goPackagePath = "github.com/certifi/gocertifi";
23− fetch = {
24− type = "git";
25− url = "https://github.com/certifi/gocertifi";
26− rev = "deb3ae2ef2610fde3330947281941c562861188b";
27− sha256 = "1xy09y1fdfcny1z09hd4493w1acj5min9z2sx4gfpshc80icrmr6";
28− };
29− }
30− {
31− goPackagePath = "github.com/cloudflare/brotli-go";
32− fetch = {
33− type = "git";
34− url = "https://github.com/cloudflare/brotli-go";
35− rev = "18c9f6c67e3dfc12e0ddaca748d2887f97a7ac28";
36− sha256 = "10112y4k8qing552n0df9w33cgminrzm6g3x7ng0vgin4sv59785";
37− };
38− }
39− {
40− goPackagePath = "github.com/cloudflare/golibs";
41− fetch = {
42− type = "git";
43− url = "https://github.com/cloudflare/golibs";
44− rev = "333127dbecfcc23a8db7d9a4f52785d23aff44a1";
45− sha256 = "170hbv9wyfmb5da9a6wjz2mphp0pylv23h8qp8h5kwa2i9frdqqi";
46− };
47− }
48− {
49− goPackagePath = "github.com/coredns/coredns";
50− fetch = {
51− type = "git";
52− url = "https://github.com/coredns/coredns";
53− rev = "2e322f6e8a54f18c6aef9c25a7c432c291a3d9f7";
54− sha256 = "0s9x5yww1qd9pzh2w846g9qw0n86ygymjiqjn15ws6ha3nj5p75p";
55− };
56− }
57− {
58− goPackagePath = "github.com/coreos/go-oidc";
59− fetch = {
60− type = "git";
61− url = "https://github.com/coreos/go-oidc";
62− rev = "a93f71fdfe73d2c0f5413c0565eea0af6523a6df";
63− sha256 = "00pmmky0y9a9l767xn16xlf52h81j4869n6j0xql79rybp6xc1f3";
64− };
65− }
66− {
67− goPackagePath = "github.com/coreos/go-systemd";
68− fetch = {
69− type = "git";
70− url = "https://github.com/coreos/go-systemd";
71− rev = "95778dfbb74eb7e4dbaf43bf7d71809650ef8076";
72− sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf";
73− };
74− }
75− {
76− goPackagePath = "github.com/coreos/pkg";
77− fetch = {
78− type = "git";
79− url = "https://github.com/coreos/pkg";
80− rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
81− sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
82− };
83− }
84− {
85− goPackagePath = "github.com/davecgh/go-spew";
86− fetch = {
87− type = "git";
88− url = "https://github.com/davecgh/go-spew";
89− rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
90− sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
91− };
92− }
93− {
94− goPackagePath = "github.com/elgs/gosqljson";
95− fetch = {
96− type = "git";
97− url = "https://github.com/elgs/gosqljson";
98− rev = "027aa4915315a0b2825c0f025cea347829b974fa";
99− sha256 = "14i45m1y505acvsk4l725bp8p9w3mcg49khz9hxkzg3afg7nc5gq";
100− };
101− }
102− {
103− goPackagePath = "github.com/equinox-io/equinox";
104− fetch = {
105− type = "git";
106− url = "https://github.com/equinox-io/equinox";
107− rev = "5205c98a6c11dc72747ce12fff6cd620a99fde05";
108− sha256 = "19gya2zhs3xqfjh8y6s63yw9q8h1x710rl1drf4a1fmgdhaf2lrv";
109− };
110− }
111− {
112− goPackagePath = "github.com/facebookgo/grace";
113− fetch = {
114− type = "git";
115− url = "https://github.com/facebookgo/grace";
116− rev = "75cf19382434e82df4dd84953f566b8ad23d6e9e";
117− sha256 = "15chyvgv5y59w9x2asm0vh29cmmcji7f5vxvv8gqcr15nkyi61q0";
118− };
119− }
120− {
121− goPackagePath = "github.com/flynn/go-shlex";
122− fetch = {
123− type = "git";
124− url = "https://github.com/flynn/go-shlex";
125− rev = "3f9db97f856818214da2e1057f8ad84803971cff";
126− sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
127− };
128− }
129− {
130− goPackagePath = "github.com/getsentry/raven-go";
131− fetch = {
132− type = "git";
133− url = "https://github.com/getsentry/raven-go";
134− rev = "ed7bcb39ff10f39ab08e317ce16df282845852fa";
135− sha256 = "0pqggcjbia9sidxqxnyd5z5k44iswxaqss3qvkka8bfm082kczij";
136− };
137− }
138− {
139− goPackagePath = "github.com/golang-collections/collections";
140− fetch = {
141− type = "git";
142− url = "https://github.com/golang-collections/collections";
143− rev = "604e922904d35e97f98a774db7881f049cd8d970";
144− sha256 = "04g0xc1bs4aphc2rcj9knah2shmck500qagnazy4mg052b84ggwm";
145− };
146− }
147− {
148− goPackagePath = "github.com/golang/protobuf";
149− fetch = {
150− type = "git";
151− url = "https://github.com/golang/protobuf";
152− rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30";
153− sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
154− };
155− }
156− {
157− goPackagePath = "github.com/google/uuid";
158− fetch = {
159− type = "git";
160− url = "https://github.com/google/uuid";
161− rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4";
162− sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
163− };
164− }
165− {
166− goPackagePath = "github.com/gorilla/mux";
167− fetch = {
168− type = "git";
169− url = "https://github.com/gorilla/mux";
170− rev = "c5c6c98bc25355028a63748a498942a6398ccd22";
171− sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62";
172− };
173− }
174− {
175− goPackagePath = "github.com/gorilla/websocket";
176− fetch = {
177− type = "git";
178− url = "https://github.com/gorilla/websocket";
179− rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
180− sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
181− };
182− }
183− {
184− goPackagePath = "github.com/grpc-ecosystem/grpc-opentracing";
185− fetch = {
186− type = "git";
187− url = "https://github.com/grpc-ecosystem/grpc-opentracing";
188− rev = "8e809c8a86450a29b90dcc9efbf062d0fe6d9746";
189− sha256 = "1yz3gxhdipmi63n32y5srwx7p254k3fm8y64cimkb1gz7sw99nxw";
190− };
191− }
192− {
193− goPackagePath = "github.com/jonboulle/clockwork";
194− fetch = {
195− type = "git";
196− url = "https://github.com/jonboulle/clockwork";
197− rev = "2eee05ed794112d45db504eb05aa693efd2b8b09";
198− sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
199− };
200− }
201− {
202− goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
203− fetch = {
204− type = "git";
205− url = "https://github.com/konsorten/go-windows-terminal-sequences";
206− rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e";
207− sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
208− };
209− }
210− {
211− goPackagePath = "github.com/lib/pq";
212− fetch = {
213− type = "git";
214− url = "https://github.com/lib/pq";
215− rev = "51e2106eed1cea199c802d2a49e91e2491b02056";
216− sha256 = "00kp0k7sd7xrv92crd2xja68z096b2fw0mlz58mdjlri9w72hqbf";
217− };
218− }
219− {
220− goPackagePath = "github.com/mattn/go-colorable";
221− fetch = {
222− type = "git";
223− url = "https://github.com/mattn/go-colorable";
224− rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045";
225− sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";
226− };
227− }
228− {
229− goPackagePath = "github.com/mattn/go-isatty";
230− fetch = {
231− type = "git";
232− url = "https://github.com/mattn/go-isatty";
233− rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7";
234− sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";
235− };
236− }
237− {
238− goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
239− fetch = {
240− type = "git";
241− url = "https://github.com/matttproud/golang_protobuf_extensions";
242− rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
243− sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
244− };
245− }
246− {
247− goPackagePath = "github.com/mholt/caddy";
248− fetch = {
249− type = "git";
250− url = "https://github.com/mholt/caddy";
251− rev = "d3b731e9255b72d4571a5aac125634cf1b6031dc";
252− sha256 = "1183cfaryw7m3hvngzv87w80pc9vp3369sjyz7a0dlbr39jip1r0";
253− };
254− }
255− {
256− goPackagePath = "github.com/miekg/dns";
257− fetch = {
258− type = "git";
259− url = "https://github.com/miekg/dns";
260− rev = "73601d4aed9d844322611759d7f3619110b7c88e";
261− sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm";
262− };
263− }
264− {
265− goPackagePath = "github.com/mitchellh/go-homedir";
266− fetch = {
267− type = "git";
268− url = "https://github.com/mitchellh/go-homedir";
269− rev = "af06845cf3004701891bf4fdb884bfe4920b3727";
270− sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
271− };
272− }
273− {
274− goPackagePath = "github.com/opentracing/opentracing-go";
275− fetch = {
276− type = "git";
277− url = "https://github.com/opentracing/opentracing-go";
278− rev = "659c90643e714681897ec2521c60567dd21da733";
279− sha256 = "0aj9cbm21zsg1i5l25hz8gn0yf99yxyxcp1gqh3yd5g4knj2cgzf";
280− };
281− }
282− {
283− goPackagePath = "github.com/pkg/errors";
284− fetch = {
285− type = "git";
286− url = "https://github.com/pkg/errors";
287− rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
288− sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
289− };
290− }
291− {
292− goPackagePath = "github.com/pmezard/go-difflib";
293− fetch = {
294− type = "git";
295− url = "https://github.com/pmezard/go-difflib";
296− rev = "792786c7400a136282c1664665ae0a8db921c6c2";
297− sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
298− };
299− }
300− {
301− goPackagePath = "github.com/prometheus/client_golang";
302− fetch = {
303− type = "git";
304− url = "https://github.com/prometheus/client_golang";
305− rev = "967789050ba94deca04a5e84cce8ad472ce313c1";
306− sha256 = "1djwz6shmyx5kbp9b1pim3kncq2jwn3qhbx4b0b4lq7msww76hpz";
307− };
308− }
309− {
310− goPackagePath = "github.com/prometheus/client_model";
311− fetch = {
312− type = "git";
313− url = "https://github.com/prometheus/client_model";
314− rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8";
315− sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
316− };
317− }
318− {
319− goPackagePath = "github.com/prometheus/common";
320− fetch = {
321− type = "git";
322− url = "https://github.com/prometheus/common";
323− rev = "a82f4c12f983cc2649298185f296632953e50d3e";
324− sha256 = "0pcgnxrv2i31jljqzhkv5hpdz92f6zrkh2p1i7i59acfz1fxhq0s";
325− };
326− }
327− {
328− goPackagePath = "github.com/prometheus/procfs";
329− fetch = {
330− type = "git";
331− url = "https://github.com/prometheus/procfs";
332− rev = "8368d24ba045f26503eb745b624d930cbe214c79";
333− sha256 = "0cfrgsy82c964hcmzzyk6ccghpr9dkfvdlxa0cj9cfc0w94cqvrl";
334− };
335− }
336− {
337− goPackagePath = "github.com/rifflock/lfshook";
338− fetch = {
339− type = "git";
340− url = "https://github.com/rifflock/lfshook";
341− rev = "b9218ef580f59a2e72dad1aa33d660150445d05a";
342− sha256 = "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc";
343− };
344− }
345− {
346− goPackagePath = "github.com/sirupsen/logrus";
347− fetch = {
348− type = "git";
349− url = "https://github.com/sirupsen/logrus";
350− rev = "839c75faf7f98a33d445d181f3018b5c3409a45e";
351− sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
352− };
353− }
354− {
355− goPackagePath = "github.com/stretchr/testify";
356− fetch = {
357− type = "git";
358− url = "https://github.com/stretchr/testify";
359− rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
360− sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
361− };
362− }
363− {
364− goPackagePath = "golang.org/x/crypto";
365− fetch = {
366− type = "git";
367− url = "https://go.googlesource.com/crypto";
368− rev = "f416ebab96af27ca70b6e5c23d6a0747530da626";
369− sha256 = "1cmddgh6x1c3lij50r8245jhqgi4j00add4wjpqpc2dmcg5928m3";
370− };
371− }
372− {
373− goPackagePath = "golang.org/x/net";
374− fetch = {
375− type = "git";
376− url = "https://go.googlesource.com/net";
377− rev = "1da14a5a36f220ea3f03470682b737b1dfd5de22";
378− sha256 = "1ivqwn3r44vlldlj53669jvsd6klwsg7hmla7f0vz03ny8xz4lpz";
379− };
380− }
381− {
382− goPackagePath = "golang.org/x/sync";
383− fetch = {
384− type = "git";
385− url = "https://go.googlesource.com/sync";
386− rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
387− sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
388− };
389− }
390− {
391− goPackagePath = "golang.org/x/sys";
392− fetch = {
393− type = "git";
394− url = "https://go.googlesource.com/sys";
395− rev = "12500544f89f9420afe9529ba8940bf72d294972";
396− sha256 = "1y37dlbbsp1dkfqaf563fwlf3xl74ymswmy52faqyv0wpcbwixgy";
397− };
398− }
399− {
400− goPackagePath = "golang.org/x/text";
401− fetch = {
402− type = "git";
403− url = "https://go.googlesource.com/text";
404− rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
405− sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
406− };
407− }
408− {
409− goPackagePath = "google.golang.org/genproto";
410− fetch = {
411− type = "git";
412− url = "https://github.com/google/go-genproto";
413− rev = "d1146b9035b912113a38af3b138eb2af567b2c67";
414− sha256 = "1ry1vbbnfh7i3zrv3vmbsbmq2w8jmz88ykd6cxviijnxvms3zab8";
415− };
416− }
417− {
418− goPackagePath = "google.golang.org/grpc";
419− fetch = {
420− type = "git";
421− url = "https://github.com/grpc/grpc-go";
422− rev = "236199dd5f8031d698fb64091194aecd1c3895b2";
423− sha256 = "0rzpcmp5fscg3smn0aiaahgimv74smylg701na5px3pn5iymh94a";
424− };
425− }
426− {
427− goPackagePath = "gopkg.in/urfave/cli.v2";
428− fetch = {
429− type = "git";
430− url = "https://github.com/cbranch/cli";
431− rev = "d604b6ffeee878fbf084fd2761466b6649989cee";
432− sha256 = "16csqipw5vrbb91m9w9g72jlxlrhcyxa79fz6fjp6803znmjdpk2";
433− };
434− }
435− {
436− goPackagePath = "gopkg.in/yaml.v2";
437− fetch = {
438− type = "git";
439− url = "https://github.com/go-yaml/yaml";
440− rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
441− sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
442− };
443− }
444− {
445− goPackagePath = "zombiezen.com/go/capnproto2";
446− fetch = {
447− type = "git";
448− url = "https://github.com/zombiezen/go-capnproto2";
449− rev = "7cfd211c19c7f5783c695f3654efa46f0df259c3";
450− sha256 = "0nzw3g8xpxyzwqqv3ja0iznd0j18l1rwagwhf9sinwdjjgmh51sy";
451− };
452− }
453−]
pkgs/applications/networking/cluster/k9s/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "k9s";
5− version = "0.13.6";
5+ version = "0.13.8";
66 # rev is the release commit, mainly for version command output
77 rev = "8fedc42304ce33df314664eb0c4ac73be59065af";
88
@@ -10,7 +10,7 @@ buildGoModule rec {
1010 owner = "derailed";
1111 repo = "k9s";
1212 rev = "v${version}";
13− sha256 = "1gffbj6pgys6k3i8ikcy3yr2r9cwg0xki55yz5yg6z4a8h0jc8a6";
13+ sha256 = "0xkxvgqzzhz5bhbqwgyw9w238kadqccr1fbvrxjcjr32xlbs56z2";
1414 };
1515
1616 buildFlagsArray = ''
pkgs/applications/networking/esniper/default.nix+3−3
@@ -1,12 +1,12 @@
11{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
22
33stdenv.mkDerivation {
4− name = "esniper-2.35.0-18-g4a59da0";
4+ name = "esniper-2.35.0-21-g6379846";
55
66 src = fetchgit {
77 url = "https://git.code.sf.net/p/esniper/git";
8− rev = "4a59da032aa4536b9e5ea95633247650412511db";
9− sha256 = "0d3vazh5q7wymqahggbb2apl9hgrm037y4s3j91d24hjgk2pzzyd";
8+ rev = "637984623984ef36782d52d8968df7fae7bbb0a7";
9+ sha256 = "1md3fzs0k88f6mgvrj1yrh96mn0qlca2p6vfqj6dnpyb8pjjwp8w";
1010 };
1111
1212 buildInputs = [ openssl curl ];
pkgs/applications/networking/flexget/default.nix+2−2
@@ -2,11 +2,11 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "FlexGet";
5− version = "3.1.18";
5+ version = "3.1.21";
66
77 src = python3Packages.fetchPypi {
88 inherit pname version;
9− sha256 = "34be4ac61dbb5699cfbc9db8bf4f4be15a63164d9006d8ac7c488278d00baa62";
9+ sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e";
1010 };
1111
1212 postPatch = ''
pkgs/applications/office/qnotero/default.nix+13−11
@@ -1,29 +1,31 @@
1−{ stdenv, fetchFromGitHub, python3Packages
2−}:
1+{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
32
43python3Packages.buildPythonPackage rec {
5− name = "qnotero-${version}";
4+ pname = "qnotero";
65
7− version = "1.0.0";
6+ version = "2.1.1";
87
98 src = fetchFromGitHub {
10− owner = "smathot";
11− repo = "qnotero";
12− rev = "release/${version}";
13− name = "qnotero-${version}-src";
14− sha256 = "1d5a9k1llzn9q1qv1bfwc7gfflabh4riplz9jj0hf04b279y1bj0";
9+ owner = "ealbiter";
10+ repo = pname;
11+ rev = "v${version}";
12+ sha256 = "16ckcjxa3dgmz1y8gd57q2h84akra3j4bgl4fwv4m05bam3ml1xs";
1513 };
1614
17− propagatedBuildInputs = [ python3Packages.pyqt4 ];
15+ propagatedBuildInputs = [ python3Packages.pyqt5 wrapQtAppsHook ];
1816
1917 patchPhase = ''
2018 substituteInPlace ./setup.py \
2119 --replace "/usr/share" "usr/share"
2220
23− substituteInPlace ./libqnotero/_themes/default.py \
21+ substituteInPlace ./libqnotero/_themes/light.py \
2422 --replace "/usr/share" "$out/usr/share"
2523 '';
2624
25+ preFixup = ''
26+ wrapQtApp "$out"/bin/qnotero
27+ '';
28+
2729 meta = {
2830 description = "Quick access to Zotero references";
2931 homepage = http://www.cogsci.nl/software/qnotero;
pkgs/applications/science/biology/picard-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "picard-tools";
5− version = "2.21.6";
5+ version = "2.21.8";
66
77 src = fetchurl {
88 url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
9− sha256 = "1vpyzhrs3bbviwk2n7k5296rnsw7g9ksvjsibl0gm7dawip9jb5s";
9+ sha256 = "0wxacfyxqvd39mzmwkwz39g4mf0ig1zcgymwbhsnhmn9j60mdmrf";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/science/chemistry/marvin/default.nix+2−2
@@ -4,12 +4,12 @@ with stdenv.lib;
44
55stdenv.mkDerivation rec {
66 pname = "marvin";
7− version = "19.27.0";
7+ version = "20.3.0";
88
99 src = fetchurl {
1010 name = "marvin-${version}.deb";
1111 url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
12− sha256 = "10pzprr43pklf4yl14m9q921ynalsil1dsfbl6lx8r1jmyjgl3w7";
12+ sha256 = "1y2vh1n80mrrbxqbhxfag8h4lisarbw8h3labmh3ajrfan7bmhql";
1313 };
1414
1515 nativeBuildInputs = [ dpkg makeWrapper ];
pkgs/applications/science/electronics/librepcb/default.nix+6−6
@@ -1,15 +1,15 @@
1−{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }:
1+{ lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }:
22
3−stdenv.mkDerivation {
3+mkDerivation {
44 pname = "librepcb";
5− version = "0.1.2";
5+ version = "0.1.3";
66
77 src = fetchFromGitHub {
88 owner = "LibrePCB";
99 repo = "LibrePCB";
1010 fetchSubmodules = true;
11− rev = "acdd94d9d2310f79215125b999153e9da88a9376";
12− sha256 = "1bbl01rp75sl6k1cmch7x90v00lck578xvqmb856s9fx75bdgnv5";
11+ rev = "56bc60d347ff67df0fe1d57807d03f0606de557f";
12+ sha256 = "0z6jn5zawp0x5i9zda7l787jnsv3yl8aqwnpii3g4hsnf2q3hhrh";
1313 };
1414
1515 enableParallelBuilding = true;
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929 wrapQtApp $out/bin/librepcb
3030 '';
3131
32− meta = with stdenv.lib; {
32+ meta = with lib; {
3333 description = "A free EDA software to develop printed circuit boards";
3434 homepage = https://librepcb.org/;
3535 maintainers = with maintainers; [ luz ];
pkgs/applications/science/logic/symbiyosys/default.nix+5−5
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation {
44 pname = "symbiyosys";
5− version = "2019.10.11";
5+ version = "2020.02.08";
66
77 src = fetchFromGitHub {
8− owner = "yosyshq";
9− repo = "symbiyosys";
10− rev = "23f89011b678daa9da406d4f45f790e45f8f68ca";
11− sha256 = "01596yvfj79iywwczjwlb2l9qnh7bsj7jff66jdk1ybjnxf841f0";
8+ owner = "YosysHQ";
9+ repo = "SymbiYosys";
10+ rev = "500b526131f434b9679732fc89515dbed67c8d7d";
11+ sha256 = "1pwbirszc80r288x81nx032snniqgmc80i09bbha2i3zd0c3pj5h";
1212 };
1313
1414 buildInputs = [ python3 yosys ];
pkgs/applications/science/math/gmsh/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "gmsh";
6− version = "4.5.1";
6+ version = "4.5.2";
77
88 src = fetchurl {
99 url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
10− sha256 = "0rjwxpz5qwq6dj7ka53mhxlgnp9bs5jphhsamlb0nk3h8kzckisq";
10+ sha256 = "10i6i1s68lkccnl73lzr04cf1hc5rd8b7dpiaxs1vzrj1ljgw801";
1111 };
1212
1313 buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL
pkgs/applications/version-management/git-and-tools/git-machete/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonApplication rec {
66 pname = "git-machete";
7− version = "2.12.6";
7+ version = "2.13.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "1h7daf74s0plnqrz2f63s6rak8fmqns96ydjn01366bcsqrbvkw6";
11+ sha256 = "1qq94x4rqn8vl5h11bn5d4x5ybsbj769kgf4lnj56my7si7qy8qn";
1212 };
1313
1414 nativeBuildInputs = [ installShellFiles pbr ];
pkgs/applications/virtualization/crun/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "crun";
6− version = "0.12";
6+ version = "0.12.1";
77
88 src = fetchFromGitHub {
99 owner = "containers";
1010 repo = pname;
1111 rev = version;
12− sha256 = "0sxpdv3afh8hn39jdg06vwkyp7i6dsyf1gg8719vwiwmcbhzj8mx";
12+ sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s";
1313 fetchSubmodules = true;
1414 };
1515
pkgs/applications/virtualization/podman/default.nix+2−2
@@ -5,13 +5,13 @@
55
66buildGoPackage rec {
77 pname = "podman";
8− version = "1.7.0";
8+ version = "1.8.0";
99
1010 src = fetchFromGitHub {
1111 owner = "containers";
1212 repo = "libpod";
1313 rev = "v${version}";
14− sha256 = "1f1dq9g08mlm9y9d7jbs780nrfc25ln97ca5qifcsyc9bmp4f6r1";
14+ sha256 = "1rbapks11xg0vgl9m322mijirx0wm6c4yav8aw2y41wsr7qd7db4";
1515 };
1616
1717 goPackagePath = "github.com/containers/libpod";
pkgs/applications/window-managers/i3/status-rust.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "i3status-rust";
5− version = "0.13.0";
5+ version = "0.13.1";
66
77 src = fetchFromGitHub {
88 owner = "greshake";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "047ivrp70kwsm4792ing8dvgh161cmayzy9ij6ww61fbkb4slr1i";
11+ sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg";
1212 };
1313
14− cargoSha256 = "16rgg0fy50n0z0kal52iaxiqwhw4qpjvzyqwaldm29fq9c0105d1";
14+ cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv";
1515
1616 nativeBuildInputs = [ pkgconfig ];
1717
pkgs/data/fonts/jetbrains-mono/default.nix+2−2
@@ -1,14 +1,14 @@
11{ lib, fetchzip }:
22
33let
4− version = "1.0.2";
4+ version = "1.0.3";
55in
66fetchzip rec {
77 name = "JetBrainsMono-${version}";
88
99 url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
1010
11− sha256 = "0fyn7yb1m9gkzbbzv25f8v6qzv7w4amqv3z4fpfb262l1f6yq41i";
11+ sha256 = "16am5fxvda24jfl8lb9jf8mkcqfc97scj8hvwgd3m771db0dpflf";
1212
1313 postFetch = ''
1414 mkdir -p $out/share/fonts
pkgs/data/themes/matcha/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "matcha";
5− version = "2019-11-02";
5+ version = "2020-02-06";
66
77 src = fetchFromGitHub {
88 owner = "vinceliuice";
99 repo = pname;
1010 rev = version;
11− sha256 = "0wci9ahap8kynq8cbyxr7aba9ndb1d4kiq42xvzr34vw1rhcahrr";
11+ sha256 = "14kii4dn028yqbsd0pr195di067harh9z2h753856dlxvs8d6vkx";
1212 };
1313
1414 buildInputs = [ gdk-pixbuf librsvg ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 meta = with stdenv.lib; {
2626 description = "A stylish Design theme for GTK based desktop environments";
27− homepage = https://vinceliuice.github.io/theme-matcha;
27+ homepage = "https://vinceliuice.github.io/theme-matcha";
2828 license = licenses.gpl3;
2929 platforms = platforms.unix;
3030 maintainers = [ maintainers.romildo ];
pkgs/desktops/cinnamon/cinnamon-translations/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "cinnamon-translations";
8− version = "4.4.0";
8+ version = "4.4.2";
99
1010 src = fetchFromGitHub {
1111 owner = "linuxmint";
1212 repo = pname;
1313 rev = version;
14− sha256 = "0hh6shfj7vc1mw814l38cakfmh135ba8j604h1rmx4zwspwgvgzh";
14+ sha256 = "1n1nkapcgxmbv0l8hrx5cf588pi4ifx12xbz46lq4p1ijrlfivba";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/development/compilers/nextpnr/default.nix+6−10
@@ -14,14 +14,14 @@ let
1414in
1515with stdenv; mkDerivation rec {
1616 pname = "nextpnr";
17− version = "2019.10.13";
17+ version = "2020.02.04";
1818
1919 srcs = [
2020 (fetchFromGitHub {
2121 owner = "YosysHQ";
2222 repo = "nextpnr";
23− rev = "c365dd1cabc3a4308ab9110534918623622c246b";
24− sha256 = "1344pyq9xb5y1vxsnfgr488drfjsa6ls1jck0z9hwam6vg55s10r";
23+ rev = "ca733561873cd54be047ae30a94efcd71b3f8be5";
24+ sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp";
2525 name = "nextpnr";
2626 })
2727 (fetchFromGitHub {
@@ -45,10 +45,11 @@ with stdenv; mkDerivation rec {
4545
4646 enableParallelBuilding = true;
4747 cmakeFlags =
48− [ "-DARCH=generic;ice40;ecp5"
48+ [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}"
49+ "-DARCH=generic;ice40;ecp5"
4950 "-DBUILD_TESTS=ON"
5051 "-DICEBOX_ROOT=${icestorm}/share/icebox"
51− "-DTRELLIS_ROOT=${trellis}/share/trellis"
52+ "-DTRELLIS_INSTALL_PREFIX=${trellis}"
5253 "-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis"
5354 "-DUSE_OPENMP=ON"
5455 # warning: high RAM usage
@@ -58,12 +59,7 @@ with stdenv; mkDerivation rec {
5859 ++ (lib.optional (enableGui && stdenv.isDarwin)
5960 "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
6061
61− # Fix the version number. This is a bit stupid (and fragile) in practice
62− # but works ok. We should probably make this overrideable upstream.
6362 patchPhase = with builtins; ''
64− substituteInPlace ./CMakeLists.txt \
65− --replace 'git log -1 --format=%h' 'echo ${substring 0 11 (elemAt srcs 0).rev}'
66−
6763 # use PyPy for icestorm if enabled
6864 substituteInPlace ./ice40/family.cmake \
6965 --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'
pkgs/development/compilers/ponyc/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation ( rec {
55 pname = "ponyc";
6− version = "0.33.1";
6+ version = "0.33.2";
77
88 src = fetchFromGitHub {
99 owner = "ponylang";
1010 repo = pname;
1111 rev = version;
12− sha256 = "0wqbnvxdzzwr9q4v9ha9r9jjymr6y8ba1rb2lkzrng4g9p6xqbxy";
12+ sha256 = "0jcdr1r3g8sm3q9fcc87d6x98fg581n6hb90hz7r08mzn4bwvysw";
1313 };
1414
1515 buildInputs = [ llvm makeWrapper which libxml2 ];
pkgs/development/compilers/yosys/default.nix+4−5
@@ -15,14 +15,13 @@
1515
1616stdenv.mkDerivation rec {
1717 pname = "yosys";
18− version = "2020.02.01";
18+ version = "2020.02.07";
1919
2020 src = fetchFromGitHub {
21− owner = "yosyshq";
21+ owner = "YosysHQ";
2222 repo = "yosys";
23− rev = "a1c840ca5d6e8b580e21ae48550570aa9665741a";
24− sha256 = "1vna04dh6l68nifssgs3hxqwn4k529krmm4crj94a8wwhwra52mh";
25− name = "yosys";
23+ rev = "2e8d6ec0b06b4e51e222c15c8049130bc264ae57";
24+ sha256 = "0asnqhxs5r5r2xmvsk9pbgyqgk53j1snh7c9qizcppn4csapda81";
2625 };
2726
2827 enableParallelBuilding = true;
pkgs/development/haskell-modules/configuration-common.nix+8−4
@@ -74,7 +74,7 @@ self: super: {
7474 name = "git-annex-${super.git-annex.version}-src";
7575 url = "git://git-annex.branchable.com/";
7676 rev = "refs/tags/" + super.git-annex.version;
77− sha256 = "0s8sv6h90l2a9xdabj0nirhpr6d2k8s5cddjdkm50x395i014w31";
77+ sha256 = "1shb1jgm78bx88rbsr1nmimjzzfqw96qdr38mcrr1c2qz5ky820v";
7878 };
7979 }).override {
8080 dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -1236,7 +1236,7 @@ self: super: {
12361236 constraints-deriving = dontCheck super.constraints-deriving;
12371237
12381238 # Use a matching version of ghc-lib-parser.
1239− ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2; };
1239+ ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205; };
12401240
12411241 # https://github.com/sol/hpack/issues/366
12421242 hpack = self.hpack_0_33_0;
@@ -1350,7 +1350,7 @@ self: super: {
13501350 # There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
13511351 matterhorn = doJailbreak (super.matterhorn.override {
13521352 brick-skylighting = self.brick-skylighting.override {
1353− brick = self.brick_0_50_1;
1353+ brick = self.brick_0_51;
13541354 };
13551355 });
13561356
@@ -1380,7 +1380,7 @@ self: super: {
13801380
13811381 # Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0)
13821382 ormolu = doJailbreak (super.ormolu.override {
1383− ghc-lib-parser = self.ghc-lib-parser_8_8_2;
1383+ ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205;
13841384 });
13851385
13861386 # krank-0.1.0 does not accept PyF-0.9.0.0.
@@ -1389,4 +1389,8 @@ self: super: {
13891389 # prettyprinter-1.6.0 fails its doctest suite.
13901390 prettyprinter_1_6_0 = dontCheck super.prettyprinter_1_6_0;
13911391
1392+ # the test suite has an overly tight restriction on doctest
1393+ # See https://github.com/ekmett/perhaps/pull/5
1394+ perhaps = doJailbreak super.perhaps;
1395+
13921396} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+6
@@ -81,4 +81,10 @@ self: super: {
8181 hackage-db = self.hackage-db_2_1_0;
8282 });
8383
84+ # cabal2spec needs a recent version of Cabal
85+ cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
86+
87+ # Builds only with ghc-8.8.x and beyond.
88+ policeman = markBroken super.policeman;
89+
8490}
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+2−2
@@ -70,7 +70,7 @@ self: super: {
7070 xmobar = doJailbreak super.xmobar;
7171
7272 # use latest version to fix the build
73− brick = self.brick_0_50_1;
73+ brick = self.brick_0_51;
7474 dbus = self.dbus_1_2_11;
7575 doctemplates = self.doctemplates_0_8;
7676 exact-pi = doJailbreak super.exact-pi;
@@ -82,7 +82,7 @@ self: super: {
8282 HaTeX = self.HaTeX_3_22_0_0;
8383 HsYAML = self.HsYAML_0_2_1_0;
8484 json-autotype = doJailbreak super.json-autotype;
85− lens = self.lens_4_18_1;
85+ lens = self.lens_4_19;
8686 memory = self.memory_0_15_0;
8787 microlens = self.microlens_0_4_11_2;
8888 microlens-ghc = self.microlens-ghc_0_4_12;
pkgs/development/haskell-modules/configuration-hackage2nix.yaml+46−43
@@ -69,7 +69,7 @@ core-packages:
6969default-package-overrides:
7070 # pandoc-2.9 does not accept the 0.3 version yet
7171 - doclayout < 0.3
72− # LTS Haskell 14.22
72+ # LTS Haskell 14.23
7373 - abstract-deque ==0.3
7474 - abstract-deque-tests ==0.3
7575 - abstract-par ==0.3.3
@@ -116,7 +116,7 @@ default-package-overrides:
116116 - ansi-wl-pprint ==0.6.9
117117 - ANum ==0.2.0.2
118118 - aos-signature ==0.1.1
119− - apecs ==0.8.2
119+ - apecs ==0.8.3
120120 - apecs-gloss ==0.2.3
121121 - apecs-physics ==0.4.2
122122 - api-field-json-th ==0.1.0.2
@@ -132,7 +132,6 @@ default-package-overrides:
132132 - arrow-extras ==0.1.0.1
133133 - asciidiagram ==1.3.3.3
134134 - ascii-progress ==0.3.3.0
135− - asif ==6.0.4
136135 - asn1-encoding ==0.9.6
137136 - asn1-parse ==0.9.5
138137 - asn1-types ==0.3.3
@@ -183,7 +182,7 @@ default-package-overrides:
183182 - base-compat-batteries ==0.10.5
184183 - basement ==0.0.11
185184 - base-noprelude ==4.12.0.0
186− - base-orphans ==0.8.1
185+ - base-orphans ==0.8.2
187186 - base-prelude ==1.3
188187 - base-unicode-symbols ==0.2.3
189188 - basic-prelude ==0.7.0
@@ -202,7 +201,7 @@ default-package-overrides:
202201 - bencoding ==0.4.5.2
203202 - between ==0.11.0.0
204203 - bibtex ==0.1.0.6
205− - bifunctors ==5.5.6
204+ - bifunctors ==5.5.7
206205 - bimap ==0.4.0
207206 - bimap-server ==0.1.0.1
208207 - binary-bits ==0.5
@@ -406,7 +405,7 @@ default-package-overrides:
406405 - conduit-throttle ==0.3.1.0
407406 - conduit-zstd ==0.0.1.1
408407 - config-ini ==0.2.4.0
409− - configuration-tools ==0.4.1
408+ - configuration-tools ==0.4.2
410409 - configurator ==0.3.0.0
411410 - configurator-export ==0.1.0.1
412411 - configurator-pg ==0.1.0.3
@@ -640,7 +639,7 @@ default-package-overrides:
640639 - errors ==2.3.0
641640 - errors-ext ==0.4.2
642641 - error-util ==0.0.1.2
643− - ersatz ==0.4.7
642+ - ersatz ==0.4.8
644643 - esqueleto ==3.0.0
645644 - etc ==0.4.1.0
646645 - eventful-core ==0.2.0
@@ -677,13 +676,13 @@ default-package-overrides:
677676 - fast-logger ==2.4.17
678677 - fast-math ==1.0.2
679678 - fb ==2.0.0
680− - fclabels ==2.0.3.3
679+ - fclabels ==2.0.4
681680 - feature-flags ==0.1.0.1
682681 - fedora-dists ==1.0.1
683682 - feed ==1.2.0.1
684683 - FenwickTree ==0.1.2.1
685684 - fft ==0.1.8.6
686− - fgl ==5.7.0.1
685+ - fgl ==5.7.0.2
687686 - fib ==0.1
688687 - filecache ==0.4.1
689688 - file-embed ==0.0.11.1
@@ -709,7 +708,7 @@ default-package-overrides:
709708 - flac ==0.2.0
710709 - flac-picture ==0.1.2
711710 - flags-applicative ==0.1.0.2
712− - flat-mcmc ==1.5.0
711+ - flat-mcmc ==1.5.1
713712 - flay ==0.4
714713 - flexible-defaults ==0.0.3
715714 - FloatingHex ==0.4
@@ -742,7 +741,7 @@ default-package-overrides:
742741 - free-vl ==0.1.4
743742 - friendly-time ==0.4.1
744743 - frisby ==0.2.2
745− - from-sum ==0.2.2.0
744+ - from-sum ==0.2.3.0
746745 - frontmatter ==0.1.0.2
747746 - fsnotify ==0.3.0.1
748747 - fsnotify-conduit ==0.1.1.1
@@ -848,7 +847,7 @@ default-package-overrides:
848847 - graph-core ==0.3.0.0
849848 - graphite ==0.10.0.1
850849 - graphs ==0.7.1
851− - graphviz ==2999.20.0.3
850+ - graphviz ==2999.20.0.4
852851 - graph-wrapper ==0.2.6.0
853852 - gravatar ==0.8.0
854853 - graylog ==0.1.0.1
@@ -1059,7 +1058,7 @@ default-package-overrides:
10591058 - hw-dsv ==0.3.5
10601059 - hweblib ==0.6.3
10611060 - hw-eliasfano ==0.1.1.0
1062− - hw-excess ==0.2.2.2
1061+ - hw-excess ==0.2.2.3
10631062 - hw-fingertree ==0.1.1.1
10641063 - hw-fingertree-strict ==0.1.1.3
10651064 - hw-hedgehog ==0.1.0.5
@@ -1171,7 +1170,7 @@ default-package-overrides:
11711170 - js-jquery ==3.3.1
11721171 - json ==0.9.3
11731172 - json-alt ==1.0.0
1174− - json-feed ==1.0.7
1173+ - json-feed ==1.0.8
11751174 - jsonpath ==0.1.0.2
11761175 - json-rpc ==1.0.1
11771176 - json-rpc-client ==0.2.5.0
@@ -1183,13 +1182,13 @@ default-package-overrides:
11831182 - justified-containers ==0.3.0.0
11841183 - jwt ==0.10.0
11851184 - kan-extensions ==5.2
1186− - kanji ==3.4.0.2
1185+ - kanji ==3.4.1
11871186 - katip ==0.8.3.0
11881187 - kawhi ==0.3.0
11891188 - kazura-queue ==0.1.0.4
11901189 - kdt ==0.2.4
11911190 - keycode ==0.2.2
1192− - keys ==3.12.2
1191+ - keys ==3.12.3
11931192 - kind-apply ==0.3.2.0
11941193 - kind-generics ==0.3.0.0
11951194 - kind-generics-th ==0.1.1.0
@@ -1199,7 +1198,7 @@ default-package-overrides:
11991198 - kraken ==0.1.0
12001199 - l10n ==0.1.0.1
12011200 - labels ==0.3.3
1202− - lackey ==1.0.10
1201+ - lackey ==1.0.11
12031202 - lambdabot-core ==5.2
12041203 - lambdabot-irc-plugins ==5.2
12051204 - LambdaHack ==0.9.5.0
@@ -1211,7 +1210,7 @@ default-package-overrides:
12111210 - language-haskell-extract ==0.2.4
12121211 - language-java ==0.2.9
12131212 - language-javascript ==0.6.0.14
1214− - language-puppet ==1.4.6.1
1213+ - language-puppet ==1.4.6.2
12151214 - lapack ==0.3.1
12161215 - lapack-carray ==0.0.3
12171216 - lapack-comfort-array ==0.0.0.1
@@ -1247,10 +1246,10 @@ default-package-overrides:
12471246 - libffi ==0.1
12481247 - libgit ==0.3.1
12491248 - libgraph ==1.14
1250− - libmpd ==0.9.0.10
1249+ - libmpd ==0.9.1.0
12511250 - liboath-hs ==0.0.1.1
12521251 - libraft ==0.5.0.0
1253− - libyaml ==0.1.1.1
1252+ - libyaml ==0.1.2
12541253 - LibZip ==1.0.1
12551254 - lifted-async ==0.10.0.4
12561255 - lifted-base ==0.2.3.12
@@ -1278,7 +1277,7 @@ default-package-overrides:
12781277 - log-domain ==0.12
12791278 - logfloat ==0.13.3.3
12801279 - logger-thread ==0.1.0.2
1281− - logging-effect ==1.3.8
1280+ - logging-effect ==1.3.9
12821281 - logging-facade ==0.3.0
12831282 - logging-facade-syslog ==1
12841283 - logict ==0.7.0.2
@@ -1404,7 +1403,6 @@ default-package-overrides:
14041403 - mono-traversable-keys ==0.1.0
14051404 - more-containers ==0.2.2.0
14061405 - mountpoints ==1.0.2
1407− - mpi-hs ==0.5.3.0
14081406 - msgpack ==1.0.1.0
14091407 - msgpack-aeson ==0.1.0.0
14101408 - mtl ==2.2.2
@@ -1438,7 +1436,7 @@ default-package-overrides:
14381436 - natural-sort ==0.1.2
14391437 - natural-transformation ==0.4
14401438 - ndjson-conduit ==0.1.0.5
1441− - neat-interpolation ==0.3.2.5
1439+ - neat-interpolation ==0.3.2.6
14421440 - netlib-carray ==0.1
14431441 - netlib-comfort-array ==0.0.0.1
14441442 - netlib-ffi ==0.1.1
@@ -1463,7 +1461,7 @@ default-package-overrides:
14631461 - network-simple-tls ==0.3.2
14641462 - network-transport ==0.5.4
14651463 - network-transport-composed ==0.2.1
1466− - network-uri ==2.6.1.0
1464+ - network-uri ==2.6.2.0
14671465 - newtype ==0.2.2.0
14681466 - newtype-generics ==0.5.4
14691467 - nicify-lib ==1.0.1
@@ -1536,7 +1534,7 @@ default-package-overrides:
15361534 - palette ==0.3.0.2
15371535 - pandoc ==2.7.3
15381536 - pandoc-citeproc ==0.16.2
1539− - pandoc-csv2table ==1.0.7
1537+ - pandoc-csv2table ==1.0.8
15401538 - pandoc-markdown-ghci-filter ==0.1.0.0
15411539 - pandoc-pyplot ==2.1.5.1
15421540 - pandoc-types ==1.17.6.1
@@ -1587,7 +1585,7 @@ default-package-overrides:
15871585 - persistent-iproute ==0.2.4
15881586 - persistent-mysql ==2.9.0
15891587 - persistent-mysql-haskell ==0.5.2
1590− - persistent-pagination ==0.1.1.0
1588+ - persistent-pagination ==0.1.1.1
15911589 - persistent-postgresql ==2.9.1
15921590 - persistent-qq ==2.9.1
15931591 - persistent-sqlite ==2.9.3
@@ -1743,7 +1741,7 @@ default-package-overrides:
17431741 - range-set-list ==0.1.3.1
17441742 - rank1dynamic ==0.4.0
17451743 - rank2classes ==1.3.2.1
1746− - Rasterific ==0.7.5
1744+ - Rasterific ==0.7.5.1
17471745 - rasterific-svg ==0.3.3.2
17481746 - ratel ==1.0.9
17491747 - ratel-wai ==1.1.1
@@ -1859,7 +1857,7 @@ default-package-overrides:
18591857 - scientific ==0.3.6.2
18601858 - scotty ==0.11.5
18611859 - scrypt ==0.5.0
1862− - sdl2 ==2.5.0.0
1860+ - sdl2 ==2.5.1.0
18631861 - sdl2-gfx ==0.2
18641862 - sdl2-image ==2.0.0
18651863 - sdl2-mixer ==1.1.0
@@ -1930,7 +1928,7 @@ default-package-overrides:
19301928 - sexpr-parser ==0.1.1.2
19311929 - SHA ==1.6.4.4
19321930 - shake-language-c ==0.12.0
1933− - shakespeare ==2.0.23
1931+ - shakespeare ==2.0.24
19341932 - shared-memory ==0.2.0.0
19351933 - shell-conduit ==4.7.0
19361934 - shell-escape ==0.2.0
@@ -1972,7 +1970,7 @@ default-package-overrides:
19721970 - slack-web ==0.2.0.11
19731971 - smallcheck ==1.1.5
19741972 - smallcheck-series ==0.6.1
1975− - smoothie ==0.4.2.9
1973+ - smoothie ==0.4.2.10
19761974 - snap-blaze ==0.2.1.5
19771975 - snap-core ==1.0.4.1
19781976 - snap-server ==1.1.1.1
@@ -2020,10 +2018,9 @@ default-package-overrides:
20202018 - stm-split ==0.0.2.1
20212019 - stopwatch ==0.1.0.6
20222020 - storable-complex ==0.2.3.0
2023− - storable-record ==0.0.4
2021+ - storable-record ==0.0.4.1
20242022 - storable-tuple ==0.0.3.3
20252023 - storablevector ==0.2.13
2026− - store ==0.5.1.2
20272024 - store-core ==0.4.4.2
20282025 - Strafunski-StrategyLib ==5.0.1.0
20292026 - stratosphere ==0.40.0
@@ -2054,7 +2051,7 @@ default-package-overrides:
20542051 - stripe-signature ==1.0.0.1
20552052 - stripe-wreq ==1.0.1.0
20562053 - strive ==5.0.9
2057− - structs ==0.1.2
2054+ - structs ==0.1.3
20582055 - structured-cli ==2.5.2.0
20592056 - summoner ==1.3.0.1
20602057 - sum-type-boilerplate ==0.1.1
@@ -2102,9 +2099,9 @@ default-package-overrides:
21022099 - tasty-hunit ==0.10.0.2
21032100 - tasty-kat ==0.0.3
21042101 - tasty-leancheck ==0.0.1
2105− - tasty-lua ==0.2.0.1
2102+ - tasty-lua ==0.2.2
21062103 - tasty-program ==1.0.5
2107− - tasty-quickcheck ==0.10.1
2104+ - tasty-quickcheck ==0.10.1.1
21082105 - tasty-silver ==3.1.13
21092106 - tasty-smallcheck ==0.8.1
21102107 - tasty-th ==0.1.7
@@ -2303,7 +2300,7 @@ default-package-overrides:
23032300 - users-test ==0.5.0.1
23042301 - utf8-light ==0.4.2
23052302 - utf8-string ==1.0.1.1
2306− - util ==0.1.17.0
2303+ - util ==0.1.17.1
23072304 - utility-ht ==0.0.14
23082305 - uuid ==1.3.13
23092306 - uuid-types ==1.0.3
@@ -2322,7 +2319,7 @@ default-package-overrides:
23222319 - valor ==0.1.0.0
23232320 - vault ==0.3.1.3
23242321 - vec ==0.1.1.1
2325− - vector ==0.12.0.3
2322+ - vector ==0.12.1.2
23262323 - vector-algorithms ==0.8.0.3
23272324 - vector-binary-instances ==0.2.5.1
23282325 - vector-buffer ==0.4.1
@@ -2335,7 +2332,7 @@ default-package-overrides:
23352332 - vector-split ==1.0.0.2
23362333 - vector-th-unbox ==0.2.1.7
23372334 - verbosity ==0.3.0.0
2338− - versions ==3.5.2
2335+ - versions ==3.5.3
23392336 - ViennaRNAParser ==1.3.3
23402337 - viewprof ==0.0.0.32
23412338 - vinyl ==0.11.0
@@ -2397,7 +2394,7 @@ default-package-overrides:
23972394 - wizards ==1.0.3
23982395 - wl-pprint-annotated ==0.1.0.1
23992396 - wl-pprint-console ==0.1.0.2
2400− - wl-pprint-text ==1.2.0.0
2397+ - wl-pprint-text ==1.2.0.1
24012398 - word24 ==2.0.1
24022399 - word8 ==0.1.3
24032400 - wordpress-auth ==1.0.0.0
@@ -2452,13 +2449,13 @@ default-package-overrides:
24522449 - yeshql ==4.1.0.1
24532450 - yeshql-core ==4.1.0.2
24542451 - yeshql-hdbc ==4.1.0.2
2455− - yesod ==1.6.0
2452+ - yesod ==1.6.0.1
24562453 - yesod-alerts ==0.1.3.0
2457− - yesod-auth ==1.6.8
2454+ - yesod-auth ==1.6.8.1
24582455 - yesod-auth-hashdb ==1.7.1.2
24592456 - yesod-auth-oauth2 ==0.6.1.2
24602457 - yesod-bin ==1.6.0.4
2461− - yesod-core ==1.6.17
2458+ - yesod-core ==1.6.17.2
24622459 - yesod-csp ==0.2.5.0
24632460 - yesod-eventsource ==1.6.0
24642461 - yesod-fb ==0.5.0
@@ -3078,6 +3075,7 @@ broken-packages:
30783075 - atomic-primops-vector
30793076 - atomo
30803077 - ats-format
3078+ - ats-pkg
30813079 - ats-setup
30823080 - ats-storable
30833081 - attic-schedule
@@ -6068,6 +6066,7 @@ broken-packages:
60686066 - hs-twitterarchiver
60696067 - hs-vcard
60706068 - hs-watchman
6069+ - hs2ats
60716070 - hs2bf
60726071 - Hs2lib
60736072 - hsaml2
@@ -6784,6 +6783,7 @@ broken-packages:
67846783 - lame
67856784 - lame-tester
67866785 - lang
6786+ - language-ats
67876787 - language-bash
67886788 - language-boogie
67896789 - language-c-comments
@@ -7084,6 +7084,7 @@ broken-packages:
70847084 - lxd-client
70857085 - lye
70867086 - Lykah
7087+ - lz4-bytes
70877088 - lz4-conduit
70887089 - lzma-enumerator
70897090 - lzma-streams
@@ -7945,7 +7946,6 @@ broken-packages:
79457946 - perfect-vector-shuffle
79467947 - PerfectHash
79477948 - perfecthash
7948− - perhaps
79497949 - periodic
79507950 - perm
79517951 - permutations
@@ -8950,6 +8950,7 @@ broken-packages:
89508950 - sha-streams
89518951 - shade
89528952 - shadower
8953+ - shake-ats
89538954 - shake-cabal-build
89548955 - shake-extras
89558956 - shake-minify
@@ -9035,6 +9036,7 @@ broken-packages:
90359036 - simseq
90369037 - singleton-dict
90379038 - singleton-typelits
9039+ - singletons-presburger
90389040 - singnal
90399041 - singular-factory
90409042 - sink
@@ -10009,6 +10011,7 @@ broken-packages:
1000910011 - uuagc-bootstrap
1001010012 - uuagc-diagrams
1001110013 - uuid-aeson
10014+ - uuid-bytes
1001210015 - uuid-orphans
1001310016 - uvector
1001410017 - uvector-algorithms
pkgs/development/haskell-modules/configuration-nix.nix+3
@@ -530,6 +530,9 @@ self: super: builtins.intersectAttrs super {
530530 '';
531531 });
532532
533+ # Break infinite recursion cycle with criterion and network-uri.
534+ js-flot = dontCheck super.js-flot;
535+
533536 # Break infinite recursion cycle between QuickCheck and splitmix.
534537 splitmix = dontCheck super.splitmix;
535538
pkgs/development/haskell-modules/hackage-packages.nix+981−1132
@@ -3280,18 +3280,18 @@ self: {
32803280
32813281 "Color" = callPackage
32823282 ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
3283− , data-default-class, deepseq, doctest, hspec, HUnit, QuickCheck
3284− , random, template-haskell, vector
3283+ , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
3284+ , QuickCheck, random, template-haskell, vector
32853285 }:
32863286 mkDerivation {
32873287 pname = "Color";
3288− version = "0.1.1";
3289− sha256 = "0jwqyvch7mpg83q57c50qc0visgc0nav6ihb8gr81wdp8i3f680k";
3288+ version = "0.1.2";
3289+ sha256 = "078qc0fjzhn4v1zq37hql3b84cnv39kc48hxxk9f3ngl7yn3d8va";
32903290 setupHaskellDepends = [ base Cabal cabal-doctest ];
32913291 libraryHaskellDepends = [ base data-default-class deepseq vector ];
32923292 testHaskellDepends = [
3293− base colour doctest hspec HUnit QuickCheck random template-haskell
3294− vector
3293+ base colour doctest hspec HUnit JuicyPixels QuickCheck random
3294+ template-haskell vector
32953295 ];
32963296 benchmarkHaskellDepends = [ base colour criterion deepseq random ];
32973297 description = "Color spaces and conversions between them";
@@ -5958,8 +5958,8 @@ self: {
59585958 }:
59595959 mkDerivation {
59605960 pname = "Fin";
5961− version = "0.2.8.0";
5962− sha256 = "1smzghfifiqakbv9308bz5b4mkzmrfvgs6zpry5nw2lbqh7crcc7";
5961+ version = "0.2.9.0";
5962+ sha256 = "1wkbdjrpb7ydc659h76yrrhyv7akwx64k7cxv5fmjrwn4vgd0r8a";
59635963 libraryHaskellDepends = [
59645964 alg base foldable1 natural-induction peano universe-base
59655965 ];
@@ -16779,23 +16779,6 @@ self: {
1677916779 }) {};
1678016780
1678116781 "Rasterific" = callPackage
16782− ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
16783− , free, JuicyPixels, mtl, primitive, transformers, vector
16784− , vector-algorithms
16785− }:
16786− mkDerivation {
16787− pname = "Rasterific";
16788− version = "0.7.5";
16789− sha256 = "158s0w95x0yxhffcccvhil827jmv7mmbh65nbg8qypvw9j4ldb9j";
16790− libraryHaskellDepends = [
16791− base bytestring containers dlist FontyFruity free JuicyPixels mtl
16792− primitive transformers vector vector-algorithms
16793− ];
16794− description = "A pure haskell drawing engine";
16795− license = stdenv.lib.licenses.bsd3;
16796− }) {};
16797−
16798− "Rasterific_0_7_5_1" = callPackage
1679916782 ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
1680016783 , free, JuicyPixels, mtl, primitive, transformers, vector
1680116784 , vector-algorithms
@@ -16810,7 +16793,6 @@ self: {
1681016793 ];
1681116794 description = "A pure haskell drawing engine";
1681216795 license = stdenv.lib.licenses.bsd3;
16813− hydraPlatforms = stdenv.lib.platforms.none;
1681416796 }) {};
1681516797
1681616798 "ReadArgs" = callPackage
@@ -22611,8 +22593,8 @@ self: {
2261122593 pname = "acme-mutable-package";
2261222594 version = "0";
2261322595 sha256 = "16da6pkkdr2g77dn3n4v9x6mwi6yz3xlpisvpn0id2xz0bayipmr";
22614− revision = "3";
22615− editedCabalFile = "094kr4ib0hldgccr5bvy9azpfvkf5dmq3hq6xk5hyha6djjkx2gc";
22596+ revision = "4";
22597+ editedCabalFile = "1154vbz0yar1xd8jn2v2dl5fc2pkawwp93yd0g5dcrb9bbx6pagf";
2261622598 setupHaskellDepends = [ base Cabal ];
2261722599 libraryHaskellDepends = [ base ];
2261822600 description = "A mutable package";
@@ -23035,6 +23017,27 @@ self: {
2303523017 license = stdenv.lib.licenses.bsd3;
2303623018 }) {};
2303723019
23020+ "ad_4_4" = callPackage
23021+ ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
23022+ , containers, criterion, data-reify, directory, doctest, erf
23023+ , filepath, free, nats, reflection, semigroups, transformers
23024+ }:
23025+ mkDerivation {
23026+ pname = "ad";
23027+ version = "4.4";
23028+ sha256 = "1v7m5nk9aa0sfqfqmv15dq87s2nl7i3v1d5xx0xla9ydhlqizy4x";
23029+ setupHaskellDepends = [ base Cabal cabal-doctest ];
23030+ libraryHaskellDepends = [
23031+ array base comonad containers data-reify erf free nats reflection
23032+ semigroups transformers
23033+ ];
23034+ testHaskellDepends = [ base directory doctest filepath ];
23035+ benchmarkHaskellDepends = [ base criterion erf ];
23036+ description = "Automatic Differentiation";
23037+ license = stdenv.lib.licenses.bsd3;
23038+ hydraPlatforms = stdenv.lib.platforms.none;
23039+ }) {};
23040+
2303823041 "adaptive-containers" = callPackage
2303923042 ({ mkDerivation, base }:
2304023043 mkDerivation {
@@ -23153,6 +23156,19 @@ self: {
2315323156 broken = true;
2315423157 }) {};
2315523158
23159+ "adjunction" = callPackage
23160+ ({ mkDerivation, base, gauge, hs-functors }:
23161+ mkDerivation {
23162+ pname = "adjunction";
23163+ version = "0.0.0.0";
23164+ sha256 = "1n83ak423jwyj3w708alj9ngczzll05jyn60d0fgx8bvr3hlmi0i";
23165+ libraryHaskellDepends = [ base hs-functors ];
23166+ testHaskellDepends = [ base hs-functors ];
23167+ benchmarkHaskellDepends = [ base gauge hs-functors ];
23168+ description = "See README for more info";
23169+ license = stdenv.lib.licenses.bsd3;
23170+ }) {};
23171+
2315623172 "adjunctions" = callPackage
2315723173 ({ mkDerivation, array, base, comonad, containers, contravariant
2315823174 , distributive, free, generic-deriving, hspec, hspec-discover, mtl
@@ -23547,6 +23563,18 @@ self: {
2354723563 broken = true;
2354823564 }) {};
2354923565
23566+ "aeson-default" = callPackage
23567+ ({ mkDerivation, aeson, base, containers }:
23568+ mkDerivation {
23569+ pname = "aeson-default";
23570+ version = "0.9.1.0";
23571+ sha256 = "0fmjxanahqdkrrgy56i2xbm3547c512k4p4if6c6lvrxcfvb8zjy";
23572+ libraryHaskellDepends = [ aeson base containers ];
23573+ testHaskellDepends = [ aeson base containers ];
23574+ description = "Apply default value to FromJSON instacnes' Maybe fields";
23575+ license = stdenv.lib.licenses.bsd3;
23576+ }) {};
23577+
2355023578 "aeson-diff" = callPackage
2355123579 ({ mkDerivation, aeson, base, bytestring, directory, doctest
2355223580 , edit-distance-vector, filepath, Glob, hashable, mtl
@@ -23802,8 +23830,8 @@ self: {
2380223830 }:
2380323831 mkDerivation {
2380423832 pname = "aeson-match-qq";
23805− version = "1.0.0";
23806− sha256 = "0py6h62a9h7wmrgcc79inbpx5b3jv660jlf5hqc1hdnvmf96prkr";
23833+ version = "1.1.0";
23834+ sha256 = "0qkj38b05klzwrgy0vyr9qnkllzz9v225b3d60f6mbx3q3nxdk9x";
2380723835 libraryHaskellDepends = [
2380823836 aeson attoparsec base bytestring either haskell-src-meta scientific
2380923837 template-haskell text unordered-containers vector
@@ -23811,7 +23839,7 @@ self: {
2381123839 testHaskellDepends = [
2381223840 aeson aeson-qq base hspec unordered-containers
2381323841 ];
23814− description = "Matching Aeson values with a quasiquoter";
23842+ description = "Declarative JSON matchers";
2381523843 license = stdenv.lib.licenses.bsd2;
2381623844 }) {};
2381723845
@@ -24948,10 +24976,8 @@ self: {
2494824976 }:
2494924977 mkDerivation {
2495024978 pname = "alex-meta";
24951− version = "0.3.0.9";
24952− sha256 = "0882p9j272dhq94kgmg6pnxzi3qfwa01fk7npsz748rgx6ggycyr";
24953− revision = "1";
24954− editedCabalFile = "0p6j9ilvn5gjx0n7v1war0z8rlmcz1qnvpc8lcik8l7baydz6qjl";
24979+ version = "0.3.0.11";
24980+ sha256 = "0pb6m2h9r3j71iy8ch8kgvssblidlr6r7k12fa1q2v7wi5q2mq91";
2495524981 libraryHaskellDepends = [
2495624982 array base containers haskell-src-meta QuickCheck template-haskell
2495724983 ];
@@ -25170,6 +25196,27 @@ self: {
2517025196 broken = true;
2517125197 }) {};
2517225198
25199+ "algebraic-graphs_0_5" = callPackage
25200+ ({ mkDerivation, array, base, containers, deepseq, extra
25201+ , inspection-testing, mtl, QuickCheck, transformers
25202+ }:
25203+ mkDerivation {
25204+ pname = "algebraic-graphs";
25205+ version = "0.5";
25206+ sha256 = "02y5g459zl6hgdyq0kkqv4gz9v2xp7y2al9m4g46wis5hb7zxfc9";
25207+ libraryHaskellDepends = [
25208+ array base containers deepseq mtl transformers
25209+ ];
25210+ testHaskellDepends = [
25211+ array base containers deepseq extra inspection-testing mtl
25212+ QuickCheck transformers
25213+ ];
25214+ description = "A library for algebraic graph construction and transformation";
25215+ license = stdenv.lib.licenses.mit;
25216+ hydraPlatforms = stdenv.lib.platforms.none;
25217+ broken = true;
25218+ }) {};
25219+
2517325220 "algebraic-prelude" = callPackage
2517425221 ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
2517525222 mkDerivation {
@@ -29616,23 +29663,6 @@ self: {
2961629663 }) {};
2961729664
2961829665 "apecs" = callPackage
29619− ({ mkDerivation, array, base, containers, criterion, linear, mtl
29620− , QuickCheck, template-haskell, vector
29621− }:
29622− mkDerivation {
29623− pname = "apecs";
29624− version = "0.8.2";
29625− sha256 = "06dhq7knzxj48563ll7r1srlgq5nd2kbk5fzrf7x6yjp0w2c9kmp";
29626− libraryHaskellDepends = [
29627− array base containers mtl template-haskell vector
29628− ];
29629− testHaskellDepends = [ base containers linear QuickCheck vector ];
29630− benchmarkHaskellDepends = [ base criterion linear ];
29631− description = "Fast Entity-Component-System library for game programming";
29632− license = stdenv.lib.licenses.bsd3;
29633− }) {};
29634−
29635− "apecs_0_8_3" = callPackage
2963629666 ({ mkDerivation, array, base, containers, criterion, linear, mtl
2963729667 , QuickCheck, template-haskell, vector
2963829668 }:
@@ -29647,7 +29677,6 @@ self: {
2964729677 benchmarkHaskellDepends = [ base criterion linear ];
2964829678 description = "Fast Entity-Component-System library for game programming";
2964929679 license = stdenv.lib.licenses.bsd3;
29650− hydraPlatforms = stdenv.lib.platforms.none;
2965129680 }) {};
2965229681
2965329682 "apecs-gloss" = callPackage
@@ -31121,8 +31150,8 @@ self: {
3112131150 }:
3112231151 mkDerivation {
3112331152 pname = "arduino-copilot";
31124− version = "1.3.0";
31125− sha256 = "0524xga8r55zpf6fw4vg7al2d6i9q4qinsx3zlqq0825qq8pp5nr";
31153+ version = "1.4.0";
31154+ sha256 = "031vi24iz25qrzjw3xha1sajzrgjrkypypy0ngfpffzl5zlarpsb";
3112631155 libraryHaskellDepends = [
3112731156 base containers copilot copilot-c99 copilot-language directory
3112831157 filepath mtl optparse-applicative unix
@@ -33343,6 +33372,8 @@ self: {
3334333372 doHaddock = false;
3334433373 description = "A build tool for ATS";
3334533374 license = stdenv.lib.licenses.bsd3;
33375+ hydraPlatforms = stdenv.lib.platforms.none;
33376+ broken = true;
3334633377 }) {};
3334733378
3334833379 "ats-setup" = callPackage
@@ -36399,20 +36430,6 @@ self: {
3639936430 }) {};
3640036431
3640136432 "base-orphans" = callPackage
36402− ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
36403− }:
36404− mkDerivation {
36405− pname = "base-orphans";
36406− version = "0.8.1";
36407− sha256 = "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4";
36408− libraryHaskellDepends = [ base ghc-prim ];
36409− testHaskellDepends = [ base hspec QuickCheck ];
36410− testToolDepends = [ hspec-discover ];
36411− description = "Backwards-compatible orphan instances for base";
36412− license = stdenv.lib.licenses.mit;
36413− }) {};
36414−
36415− "base-orphans_0_8_2" = callPackage
3641636433 ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
3641736434 }:
3641836435 mkDerivation {
@@ -36424,7 +36441,6 @@ self: {
3642436441 testToolDepends = [ hspec-discover ];
3642536442 description = "Backwards-compatible orphan instances for base";
3642636443 license = stdenv.lib.licenses.mit;
36427− hydraPlatforms = stdenv.lib.platforms.none;
3642836444 }) {};
3642936445
3643036446 "base-prelude" = callPackage
@@ -36604,8 +36620,10 @@ self: {
3660436620 }:
3660536621 mkDerivation {
3660636622 pname = "base64";
36607− version = "0.4.0";
36608− sha256 = "0mq9pnlcmjxalkq6i9shp6652l34qqp6gsahma9pi2rvk1klk7vv";
36623+ version = "0.4.1";
36624+ sha256 = "06mwamlqdz90k7nh3x4w0j0mjkbhkns11hvj9zd8d1yw6wy3l4hd";
36625+ revision = "1";
36626+ editedCabalFile = "1jvx3wpnfwzxfz5w3bqglqcv539fkk7wivl8ylm126pqh7sjdp5f";
3660936627 libraryHaskellDepends = [ base bytestring text ];
3661036628 testHaskellDepends = [
3661136629 base base64-bytestring bytestring random-bytestring tasty
@@ -36615,7 +36633,7 @@ self: {
3661536633 base base64-bytestring bytestring deepseq gauge memory
3661636634 random-bytestring text
3661736635 ];
36618− description = "RFC 4648-compliant padded and unpadded base64 and base64url encodings";
36636+ description = "Fast RFC 4648-compliant Base64 encoding";
3661936637 license = stdenv.lib.licenses.bsd3;
3662036638 }) {};
3662136639
@@ -36692,6 +36710,8 @@ self: {
3669236710 pname = "base64-lens";
3669336711 version = "0.2.0";
3669436712 sha256 = "0d4lri7wpaxx7hgd7slxj5jl2qkgfairzsga4vajl05g49amyk80";
36713+ revision = "1";
36714+ editedCabalFile = "07x38p4zcv05y94gjn5j3j1ydv06vi17fbjnz4ckcgc3ay0dzbzf";
3669536715 setupHaskellDepends = [ base Cabal cabal-doctest ];
3669636716 libraryHaskellDepends = [ base base64 bytestring lens text ];
3669736717 testHaskellDepends = [ base doctest lens ];
@@ -38208,28 +38228,6 @@ self: {
3820838228 }) {};
3820938229
3821038230 "bifunctors" = callPackage
38211− ({ mkDerivation, base, base-orphans, comonad, containers, hspec
38212− , hspec-discover, QuickCheck, tagged, template-haskell
38213− , th-abstraction, transformers, transformers-compat
38214− }:
38215− mkDerivation {
38216− pname = "bifunctors";
38217− version = "5.5.6";
38218− sha256 = "1jnsnc0rj3vkx8rjwsf2aacla9xzdfy1am9mmjk8crxp2gkazcnc";
38219− libraryHaskellDepends = [
38220− base base-orphans comonad containers tagged template-haskell
38221− th-abstraction transformers
38222− ];
38223− testHaskellDepends = [
38224− base hspec QuickCheck template-haskell transformers
38225− transformers-compat
38226− ];
38227− testToolDepends = [ hspec-discover ];
38228− description = "Bifunctors";
38229− license = stdenv.lib.licenses.bsd3;
38230− }) {};
38231−
38232− "bifunctors_5_5_7" = callPackage
3823338231 ({ mkDerivation, base, base-orphans, comonad, containers, hspec
3823438232 , hspec-discover, QuickCheck, tagged, template-haskell
3823538233 , th-abstraction, transformers, transformers-compat
@@ -38249,7 +38247,6 @@ self: {
3824938247 testToolDepends = [ hspec-discover ];
3825038248 description = "Bifunctors";
3825138249 license = stdenv.lib.licenses.bsd3;
38252− hydraPlatforms = stdenv.lib.platforms.none;
3825338250 }) {};
3825438251
3825538252 "bighugethesaurus" = callPackage
@@ -38912,14 +38909,12 @@ self: {
3891238909 }) {};
3891338910
3891438911 "binary-strict" = callPackage
38915− ({ mkDerivation, array, base, bytestring, containers, mtl }:
38912+ ({ mkDerivation, array, base, bytestring, mtl }:
3891638913 mkDerivation {
3891738914 pname = "binary-strict";
38918− version = "0.4.8.3";
38919− sha256 = "1c9cm428zp8ncrjca5y5i0y91rzppmrk4zpjkp1ppbpxv5dzpf4f";
38920− revision = "1";
38921− editedCabalFile = "1y4x4zhqs8lxxy9qcmkf93g9a1fa6bkn9my8pb9ac75qnc8mi42x";
38922− libraryHaskellDepends = [ array base bytestring containers mtl ];
38915+ version = "0.4.8.4";
38916+ sha256 = "07b62k4vqdxwaa8fp3zy2xgzc8j1wgzjh04jij2dabk0329flham";
38917+ libraryHaskellDepends = [ array base bytestring mtl ];
3892338918 description = "Binary deserialisation using strict ByteStrings";
3892438919 license = stdenv.lib.licenses.bsd3;
3892538920 hydraPlatforms = stdenv.lib.platforms.none;
@@ -40132,8 +40127,8 @@ self: {
4013240127 }:
4013340128 mkDerivation {
4013440129 pname = "bioinformatics-toolkit";
40135− version = "0.9.1";
40136− sha256 = "1blx00zkmw85c4pp36fp6jig8yy1qsc68vn40pglm0j3lgwagv9w";
40130+ version = "0.9.2";
40131+ sha256 = "1glf8wnswn60mcyrwn6y1ma6db1k6zckjmzbm28nvr961plp108b";
4013740132 enableSeparateDataOutput = true;
4013840133 libraryHaskellDepends = [
4013940134 aeson aeson-pretty attoparsec base bytestring bytestring-lexing
@@ -43393,7 +43388,7 @@ self: {
4339343388 license = stdenv.lib.licenses.bsd3;
4339443389 }) {};
4339543390
43396− "brick_0_50_1" = callPackage
43391+ "brick_0_51" = callPackage
4339743392 ({ mkDerivation, base, bytestring, config-ini, containers
4339843393 , contravariant, data-clist, deepseq, directory, dlist, filepath
4339943394 , microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -43402,8 +43397,8 @@ self: {
4340243397 }:
4340343398 mkDerivation {
4340443399 pname = "brick";
43405− version = "0.50.1";
43406− sha256 = "0wv69pbs4xqfdqw9ag32fhqhmh8djxb14h8jpyblmykirlznx77y";
43400+ version = "0.51";
43401+ sha256 = "05phqqq4sb7b11maava7y9by1lz6drzzhggvb2nsxsbajlka41h8";
4340743402 isLibrary = true;
4340843403 isExecutable = true;
4340943404 libraryHaskellDepends = [
@@ -43638,6 +43633,8 @@ self: {
4363843633 pname = "brittany";
4363943634 version = "0.12.1.1";
4364043635 sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z";
43636+ revision = "1";
43637+ editedCabalFile = "0wqg0yl3da1dgpqqv5q0ml3k0njn7pgipaac4vd9gidv3d1pyd74";
4364143638 isLibrary = true;
4364243639 isExecutable = true;
4364343640 libraryHaskellDepends = [
@@ -43761,8 +43758,8 @@ self: {
4376143758 }:
4376243759 mkDerivation {
4376343760 pname = "brok";
43764− version = "0.1.7.0";
43765− sha256 = "1961s6ccr5x81jym34y1437pa7ml4jsxnw4gd1r496h8mh9lcm99";
43761+ version = "0.2.0.0";
43762+ sha256 = "1fsh05433gkm89j4nf9whcif0iiscxbd32q307rjm1fwsfwp9c46";
4376643763 isLibrary = true;
4376743764 isExecutable = true;
4376843765 libraryHaskellDepends = [
@@ -45034,7 +45031,7 @@ self: {
4503445031 license = stdenv.lib.licenses.bsd3;
4503545032 }) {};
4503645033
45037− "bytes_0_16" = callPackage
45034+ "bytes_0_17" = callPackage
4503845035 ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal
4503945036 , cabal-doctest, cereal, containers, directory, doctest, filepath
4504045037 , hashable, mtl, scientific, text, time, transformers
@@ -45042,10 +45039,8 @@ self: {
4504245039 }:
4504345040 mkDerivation {
4504445041 pname = "bytes";
45045− version = "0.16";
45046− sha256 = "1m8nkviq4ckqi9v1w1fxzicdzmvb3wfxcmqmppjrrmkwawn4c6i9";
45047− revision = "1";
45048− editedCabalFile = "080sdihajl7fbcyp2j4mbq3zlh8jl6dsn51gk89h1r5nl3zzh3gz";
45042+ version = "0.17";
45043+ sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3";
4504945044 setupHaskellDepends = [ base Cabal cabal-doctest ];
4505045045 libraryHaskellDepends = [
4505145046 base binary binary-orphans bytestring cereal containers hashable
@@ -45100,8 +45095,8 @@ self: {
4510045095 }:
4510145096 mkDerivation {
4510245097 pname = "bytesmith";
45103− version = "0.3.3.0";
45104− sha256 = "08q2wpdj3na06n7k1ig27i67csby6yy2vhrgcdpmsi1jx8as9nwh";
45098+ version = "0.3.4.0";
45099+ sha256 = "0xl7iigb260z66na22zvwif18a2rng7damvrz53r818kdqmllg4v";
4510545100 libraryHaskellDepends = [
4510645101 base byteslice bytestring contiguous primitive run-st text-short
4510745102 wide-word
@@ -46704,15 +46699,15 @@ self: {
4670446699 broken = true;
4670546700 }) {};
4670646701
46707− "cabal-rpm_2_0_0" = callPackage
46702+ "cabal-rpm_2_0_1" = callPackage
4670846703 ({ mkDerivation, base, bytestring, Cabal, directory, filepath
4670946704 , http-client, http-client-tls, http-conduit, optparse-applicative
4671046705 , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
4671146706 }:
4671246707 mkDerivation {
4671346708 pname = "cabal-rpm";
46714− version = "2.0.0";
46715− sha256 = "1gr68l5bg2mfl6b8nbfzcinibldk271psxp5wkiw14mclyx7ln8g";
46709+ version = "2.0.1";
46710+ sha256 = "0kspqf3lsaczwgidih9f7xlgpdx9asarb3s8s3n2bwq5g68gh2l7";
4671646711 isLibrary = false;
4671746712 isExecutable = true;
4671846713 executableHaskellDepends = [
@@ -48193,6 +48188,8 @@ self: {
4819348188 pname = "capnp";
4819448189 version = "0.4.0.0";
4819548190 sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx";
48191+ revision = "1";
48192+ editedCabalFile = "16h6xvl3xr91rfn5l9lyg2jq14mffxjnkzhva4gn4bds01g2d2jl";
4819648193 isLibrary = true;
4819748194 isExecutable = true;
4819848195 libraryHaskellDepends = [
@@ -54921,12 +54918,12 @@ self: {
5492154918 , http-client, http-client-tls, http-streams, http-types
5492254919 , io-streams, memory, network, servant, servant-client
5492354920 , servant-client-core, text, time, transformers, unagi-streams
54924− , unordered-containers, vector, websockets, wuss
54921+ , unordered-containers, uuid, vector, websockets, wuss
5492554922 }:
5492654923 mkDerivation {
5492754924 pname = "coinbase-pro";
54928− version = "0.7.2.0";
54929− sha256 = "1vkw9pda8pn5kljpv6hx0mdml5yjgz354dvfv02akl81ds3r0lhq";
54925+ version = "0.8.0.0";
54926+ sha256 = "021c05qkrvgxlylvrrlb81bjxl49v5varn0fi5wqs5sda15766n3";
5493054927 isLibrary = true;
5493154928 isExecutable = true;
5493254929 libraryHaskellDepends = [
@@ -54934,14 +54931,14 @@ self: {
5493454931 cryptonite HsOpenSSL http-api-data http-client http-client-tls
5493554932 http-streams http-types io-streams memory network servant
5493654933 servant-client servant-client-core text time transformers
54937− unagi-streams unordered-containers vector websockets wuss
54934+ unagi-streams unordered-containers uuid vector websockets wuss
5493854935 ];
5493954936 executableHaskellDepends = [
5494054937 aeson aeson-casing async base binary bytestring containers
5494154938 cryptonite HsOpenSSL http-api-data http-client http-client-tls
5494254939 http-streams http-types io-streams memory network servant
5494354940 servant-client servant-client-core text time transformers
54944− unagi-streams unordered-containers vector websockets wuss
54941+ unagi-streams unordered-containers uuid vector websockets wuss
5494554942 ];
5494654943 description = "Client for Coinbase Pro";
5494754944 license = stdenv.lib.licenses.mit;
@@ -58440,41 +58437,6 @@ self: {
5844058437 }) {};
5844158438
5844258439 "configuration-tools" = callPackage
58443− ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
58444− , base-unicode-symbols, base64-bytestring, bytestring, Cabal
58445− , case-insensitive, connection, data-default, deepseq, directory
58446− , dlist, enclosed-exceptions, filepath, http-client
58447− , http-client-tls, http-types, monad-control, mtl, network-uri
58448− , optparse-applicative, process, profunctors, semigroupoids
58449− , semigroups, text, tls, transformers, unordered-containers, wai
58450− , warp, warp-tls, x509, x509-system, x509-validation, yaml
58451− }:
58452− mkDerivation {
58453− pname = "configuration-tools";
58454− version = "0.4.1";
58455− sha256 = "1c6yk6516v4ld8rmhwg4s4f3s6k40gx3dsqfrl2y9lcx3477nlj8";
58456− setupHaskellDepends = [
58457− base bytestring Cabal directory filepath process
58458− ];
58459− libraryHaskellDepends = [
58460− aeson ansi-wl-pprint attoparsec base base-unicode-symbols
58461− base64-bytestring bytestring Cabal case-insensitive connection
58462− data-default deepseq directory dlist enclosed-exceptions filepath
58463− http-client http-client-tls http-types monad-control mtl
58464− network-uri optparse-applicative process profunctors semigroupoids
58465− semigroups text tls transformers unordered-containers x509
58466− x509-system x509-validation yaml
58467− ];
58468− testHaskellDepends = [
58469− base base-unicode-symbols bytestring Cabal enclosed-exceptions
58470− http-types monad-control mtl text transformers unordered-containers
58471− wai warp warp-tls yaml
58472− ];
58473− description = "Tools for specifying and parsing configurations";
58474− license = stdenv.lib.licenses.mit;
58475− }) {};
58476−
58477− "configuration-tools_0_4_2" = callPackage
5847858440 ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
5847958441 , base-unicode-symbols, base64-bytestring, bytestring, Cabal
5848058442 , case-insensitive, connection, data-default, deepseq, directory
@@ -58507,7 +58469,6 @@ self: {
5850758469 ];
5850858470 description = "Tools for specifying and parsing configurations";
5850958471 license = stdenv.lib.licenses.mit;
58510− hydraPlatforms = stdenv.lib.platforms.none;
5851158472 }) {};
5851258473
5851358474 "configurator" = callPackage
@@ -59055,15 +59016,15 @@ self: {
5905559016 license = stdenv.lib.licenses.bsd2;
5905659017 }) {};
5905759018
59058− "constraints_0_11_2" = callPackage
59019+ "constraints_0_12" = callPackage
5905959020 ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
5906059021 , hspec-discover, mtl, semigroups, transformers
5906159022 , transformers-compat, type-equality
5906259023 }:
5906359024 mkDerivation {
5906459025 pname = "constraints";
59065− version = "0.11.2";
59066− sha256 = "10mnhg7p5gk4i3bzldl07qkrihnvmfkgsp32w7p9i7x8cmj5akjq";
59026+ version = "0.12";
59027+ sha256 = "08q2fq2xy2ija164k5a178jjffdii57nrx2x9ddz24zh2ld56szj";
5906759028 libraryHaskellDepends = [
5906859029 base binary deepseq ghc-prim hashable mtl semigroups transformers
5906959030 transformers-compat type-equality
@@ -60365,8 +60326,8 @@ self: {
6036560326 }:
6036660327 mkDerivation {
6036760328 pname = "core-program";
60368− version = "0.2.4.1";
60369− sha256 = "0ji0vnk7k4rgib6zpid7fjqy1ggf3m88cm6j23bg0lvmj5rvml5c";
60329+ version = "0.2.4.2";
60330+ sha256 = "0zs62mn87fdrjwi1dp11hkr7nbb7v3ikxk1ph6cnjdk0di9hrr6a";
6037060331 libraryHaskellDepends = [
6037160332 async base bytestring chronologique core-data core-text directory
6037260333 exceptions filepath fsnotify hashable hourglass mtl prettyprinter
@@ -64133,8 +64094,8 @@ self: {
6413364094 }:
6413464095 mkDerivation {
6413564096 pname = "daemons";
64136− version = "0.2.1";
64137− sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
64097+ version = "0.3.0";
64098+ sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3";
6413864099 isLibrary = true;
6413964100 isExecutable = true;
6414064101 enableSeparateDataOutput = true;
@@ -67913,14 +67874,14 @@ self: {
6791367874 license = stdenv.lib.licenses.bsd3;
6791467875 }) {};
6791567876
67916− "decidable_0_2_1_0" = callPackage
67877+ "decidable_0_3_0_0" = callPackage
6791767878 ({ mkDerivation, base, functor-products, microlens, singletons
6791867879 , vinyl
6791967880 }:
6792067881 mkDerivation {
6792167882 pname = "decidable";
67922− version = "0.2.1.0";
67923− sha256 = "1l307j4n9xagarbqqa48c729fs63qlzy5sqzgfyzfqwnas8yrqhx";
67883+ version = "0.3.0.0";
67884+ sha256 = "1phzfp2q82ylxj09150v1gqmk8858qjw9prhn32zjfnyzfzcg3mq";
6792467885 libraryHaskellDepends = [
6792567886 base functor-products microlens singletons vinyl
6792667887 ];
@@ -69726,6 +69687,8 @@ self: {
6972669687 pname = "dhall-bash";
6972769688 version = "1.0.27";
6972869689 sha256 = "0mmf53fqgf8g6s80g6wss86lcfkrpjc51w5givy7kg9js00d48px";
69690+ revision = "1";
69691+ editedCabalFile = "1w4hbk6xx04q0f1sxgwmp3h5s3cwc3w22vbvdxz052nhdcj3sigw";
6972969692 isLibrary = true;
6973069693 isExecutable = true;
6973169694 libraryHaskellDepends = [
@@ -73321,8 +73284,8 @@ self: {
7332173284 }:
7332273285 mkDerivation {
7332373286 pname = "dmcc";
73324− version = "1.1.0.1";
73325− sha256 = "1agha3ppi1jh08pjn6s7jbfqqll0svwxpq2an69hcgl5kf01y0c7";
73287+ version = "1.1.0.2";
73288+ sha256 = "0xm5lxnaqlrsgxvcr4xhf85angv5is1rhy992frkiz75w74adzd7";
7332673289 isLibrary = true;
7332773290 isExecutable = true;
7332873291 libraryHaskellDepends = [
@@ -76547,6 +76510,17 @@ self: {
7654776510 license = stdenv.lib.licenses.bsd3;
7654876511 }) {};
7654976512
76513+ "eccrypto-ed25519-bindings" = callPackage
76514+ ({ mkDerivation, base, bytestring, eccrypto }:
76515+ mkDerivation {
76516+ pname = "eccrypto-ed25519-bindings";
76517+ version = "0.1.0.0";
76518+ sha256 = "1yi93a9x5sl3h50cky7l9df3077kwr3grp2iw9s5iykcwi6jdzg7";
76519+ libraryHaskellDepends = [ base bytestring eccrypto ];
76520+ description = "provides \"ed25519\" API using \"eccrypto\"";
76521+ license = stdenv.lib.licenses.bsd3;
76522+ }) {};
76523+
7655076524 "ecdsa" = callPackage
7655176525 ({ mkDerivation, base, bytestring, crypto-api, crypto-pubkey-types
7655276526 , hecc
@@ -77325,8 +77299,8 @@ self: {
7732577299 ({ mkDerivation, base, doctest }:
7732677300 mkDerivation {
7732777301 pname = "either-list-functions";
77328− version = "0.0.0.3";
77329− sha256 = "1b01aj05dbx51hgyhmggh1zgcbwfvyijkxj7knqpbgpj7hymv00y";
77302+ version = "0.0.2.0";
77303+ sha256 = "04xl2xrlrmf0znic1vx521d73i6znyyjijp58h6ak0sx45kclw39";
7733077304 libraryHaskellDepends = [ base ];
7733177305 testHaskellDepends = [ base doctest ];
7733277306 description = "Functions involving lists of Either";
@@ -79474,14 +79448,34 @@ self: {
7947479448 license = stdenv.lib.licenses.bsd3;
7947579449 }) {};
7947679450
79451+ "envy_2_1_0_0" = callPackage
79452+ ({ mkDerivation, base, bytestring, containers, hspec, mtl
79453+ , QuickCheck, quickcheck-instances, text, time, transformers
79454+ }:
79455+ mkDerivation {
79456+ pname = "envy";
79457+ version = "2.1.0.0";
79458+ sha256 = "0s6jp2npnp0x5hndnhkjwc9bhdghzlpl0n38804afiwxai9bawy8";
79459+ libraryHaskellDepends = [
79460+ base bytestring containers mtl text time transformers
79461+ ];
79462+ testHaskellDepends = [
79463+ base bytestring hspec mtl QuickCheck quickcheck-instances text time
79464+ transformers
79465+ ];
79466+ description = "An environmentally friendly way to deal with environment variables";
79467+ license = stdenv.lib.licenses.bsd3;
79468+ hydraPlatforms = stdenv.lib.platforms.none;
79469+ }) {};
79470+
7947779471 "envy-extensible" = callPackage
7947879472 ({ mkDerivation, base, doctest, envy, extensible, hspec
7947979473 , hspec-discover, main-tester, QuickCheck
7948079474 }:
7948179475 mkDerivation {
7948279476 pname = "envy-extensible";
79483− version = "0.1.0.0";
79484− sha256 = "1m5qly9la0b3rxp8amni7nhgisg5vmp3zi76hc1586c202cnsl70";
79477+ version = "0.2.0.1";
79478+ sha256 = "0800a7drik9h3bxnkqriwjg2j31j8k3pw5fsmswnmfh4wwv2bb6v";
7948579479 libraryHaskellDepends = [ base envy extensible ];
7948679480 testHaskellDepends = [
7948779481 base doctest envy extensible hspec main-tester QuickCheck
@@ -79743,21 +79737,23 @@ self: {
7974379737 }) {};
7974479738
7974579739 "erd" = callPackage
79746− ({ mkDerivation, base, bytestring, containers, graphviz, hspec
79747− , parsec, QuickCheck, raw-strings-qq, tasty, tasty-hunit, text
79740+ ({ mkDerivation, base, bytestring, containers, directory, filepath
79741+ , gitrev, graphviz, parsec, raw-strings-qq, tasty, tasty-hunit
79742+ , text, yaml
7974879743 }:
7974979744 mkDerivation {
7975079745 pname = "erd";
79751− version = "0.2.0.0";
79752− sha256 = "1lxqjvsmkqhqaw63r6qp6z9kjz73ki6y3vr85bjs5i0m7ff87799";
79746+ version = "0.2.1.0";
79747+ sha256 = "1p21q4x5l29mhnm17j77b4w5rqc9n4jd24czawz7p1srmzvl67hs";
7975379748 isLibrary = false;
7975479749 isExecutable = true;
7975579750 executableHaskellDepends = [
79756− base bytestring containers graphviz parsec text
79751+ base bytestring containers directory filepath gitrev graphviz
79752+ parsec raw-strings-qq text yaml
7975779753 ];
7975879754 testHaskellDepends = [
79759− base bytestring containers graphviz hspec parsec QuickCheck
79760− raw-strings-qq tasty tasty-hunit text
79755+ base bytestring containers directory filepath gitrev graphviz
79756+ parsec raw-strings-qq tasty tasty-hunit text yaml
7976179757 ];
7976279758 description = "An entity-relationship diagram generator from a plain text description";
7976379759 license = stdenv.lib.licenses.publicDomain;
@@ -80072,34 +80068,6 @@ self: {
8007280068 }) {};
8007380069
8007480070 "ersatz" = callPackage
80075− ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
80076− , cabal-doctest, containers, data-default, directory, doctest, fail
80077− , filepath, lens, mtl, parsec, process, semigroups, temporary
80078− , transformers, unordered-containers
80079− }:
80080− mkDerivation {
80081− pname = "ersatz";
80082− version = "0.4.7";
80083− sha256 = "0kddsh02yrpn7xack6xcs0c93hmf4gkmh56zip2n6q7j0xgdrl6d";
80084− isLibrary = true;
80085− isExecutable = true;
80086− enableSeparateDataOutput = true;
80087− setupHaskellDepends = [ base Cabal cabal-doctest ];
80088− libraryHaskellDepends = [
80089− array attoparsec base bytestring containers data-default lens mtl
80090− process semigroups temporary transformers unordered-containers
80091− ];
80092− executableHaskellDepends = [
80093− array base containers fail lens mtl parsec semigroups
80094− ];
80095− testHaskellDepends = [ array base directory doctest filepath mtl ];
80096− description = "A monad for expressing SAT or QSAT problems using observable sharing";
80097− license = stdenv.lib.licenses.bsd3;
80098− hydraPlatforms = stdenv.lib.platforms.none;
80099− broken = true;
80100− }) {};
80101−
80102− "ersatz_0_4_8" = callPackage
8010380071 ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
8010480072 , cabal-doctest, containers, data-default, directory, doctest, fail
8010580073 , filepath, lens, mtl, parsec, process, semigroups, temporary
@@ -83461,6 +83429,26 @@ self: {
8346183429 license = stdenv.lib.licenses.gpl3;
8346283430 }) {};
8346383431
83432+ "fast-digits_0_3_0_0" = callPackage
83433+ ({ mkDerivation, base, digits, gauge, integer-gmp, QuickCheck
83434+ , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck
83435+ }:
83436+ mkDerivation {
83437+ pname = "fast-digits";
83438+ version = "0.3.0.0";
83439+ sha256 = "1vlmjlkmv1nmw1rriafm2hzkmqd5xnwgzmvrg6xxqj1ab5sdsafs";
83440+ libraryHaskellDepends = [ base integer-gmp ];
83441+ testHaskellDepends = [
83442+ base digits QuickCheck smallcheck tasty tasty-quickcheck
83443+ tasty-smallcheck
83444+ ];
83445+ benchmarkHaskellDepends = [ base digits gauge ];
83446+ doHaddock = false;
83447+ description = "Integer-to-digits conversion";
83448+ license = stdenv.lib.licenses.gpl3;
83449+ hydraPlatforms = stdenv.lib.platforms.none;
83450+ }) {};
83451+
8346483452 "fast-downward" = callPackage
8346583453 ({ mkDerivation, base, containers, mtl, process, temporary, text
8346683454 , transformers
@@ -84119,13 +84107,13 @@ self: {
8411984107 ({ mkDerivation, base, doctest, first-class-families, Glob }:
8412084108 mkDerivation {
8412184109 pname = "fcf-containers";
84122− version = "0.1.0";
84123− sha256 = "1rvchhv59640iiwx2f9byf5klayx150aws1wz54v85bfcsxwsrac";
84110+ version = "0.2.0";
84111+ sha256 = "02ymhc7ms6k7ms966px8a4zhgsd71ncyb4c08b0x51n6v442cwmh";
8412484112 isLibrary = true;
8412584113 isExecutable = true;
8412684114 libraryHaskellDepends = [ base first-class-families ];
8412784115 executableHaskellDepends = [ base first-class-families ];
84128− testHaskellDepends = [ base doctest Glob ];
84116+ testHaskellDepends = [ base doctest first-class-families Glob ];
8412984117 description = "Data structures and algorithms for first-class-families";
8413084118 license = stdenv.lib.licenses.bsd3;
8413184119 }) {};
@@ -84158,25 +84146,6 @@ self: {
8415884146 }) {};
8415984147
8416084148 "fclabels" = callPackage
84161− ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell
84162− , transformers
84163− }:
84164− mkDerivation {
84165− pname = "fclabels";
84166− version = "2.0.3.3";
84167− sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
84168− revision = "4";
84169− editedCabalFile = "09pn1q4gjlhw956asmhzva1rhrafmn69xmd1sc80fh3c8vjd3icz";
84170− libraryHaskellDepends = [ base mtl template-haskell transformers ];
84171− testHaskellDepends = [
84172− base HUnit mtl template-haskell transformers
84173− ];
84174− benchmarkHaskellDepends = [ base criterion ];
84175− description = "First class accessor labels implemented as lenses";
84176− license = stdenv.lib.licenses.bsd3;
84177− }) {};
84178−
84179− "fclabels_2_0_4" = callPackage
8418084149 ({ mkDerivation, base, base-orphans, criterion, HUnit, mtl
8418184150 , template-haskell, transformers
8418284151 }:
@@ -84193,7 +84162,6 @@ self: {
8419384162 benchmarkHaskellDepends = [ base criterion ];
8419484163 description = "First class accessor labels implemented as lenses";
8419584164 license = stdenv.lib.licenses.bsd3;
84196− hydraPlatforms = stdenv.lib.platforms.none;
8419784165 }) {};
8419884166
8419984167 "fclabels-monadlib" = callPackage
@@ -85139,23 +85107,6 @@ self: {
8513985107 }) {};
8514085108
8514185109 "fgl" = callPackage
85142− ({ mkDerivation, array, base, containers, deepseq, hspec
85143− , microbench, QuickCheck, transformers
85144− }:
85145− mkDerivation {
85146− pname = "fgl";
85147− version = "5.7.0.1";
85148− sha256 = "04793yh778ck3kz1z2svnfdwwls2kisbnky4lzvf4zjfgpv7mkpz";
85149− libraryHaskellDepends = [
85150− array base containers deepseq transformers
85151− ];
85152− testHaskellDepends = [ base containers hspec QuickCheck ];
85153− benchmarkHaskellDepends = [ base deepseq microbench ];
85154− description = "Martin Erwig's Functional Graph Library";
85155− license = stdenv.lib.licenses.bsd3;
85156− }) {};
85157−
85158− "fgl_5_7_0_2" = callPackage
8515985110 ({ mkDerivation, array, base, containers, deepseq, hspec
8516085111 , microbench, QuickCheck, transformers
8516185112 }:
@@ -85170,7 +85121,6 @@ self: {
8517085121 benchmarkHaskellDepends = [ base deepseq microbench ];
8517185122 description = "Martin Erwig's Functional Graph Library";
8517285123 license = stdenv.lib.licenses.bsd3;
85173− hydraPlatforms = stdenv.lib.platforms.none;
8517485124 }) {};
8517585125
8517685126 "fgl-arbitrary" = callPackage
@@ -86181,6 +86131,23 @@ self: {
8618186131 hydraPlatforms = stdenv.lib.platforms.none;
8618286132 }) {};
8618386133
86134+ "first-class-instances" = callPackage
86135+ ({ mkDerivation, base, Cabal, containers, hspec, hspec-discover
86136+ , template-haskell
86137+ }:
86138+ mkDerivation {
86139+ pname = "first-class-instances";
86140+ version = "0.1.0.0";
86141+ sha256 = "0d3pay7x31a5d9g4rkb0sflk97qcnpyg3fh81247b6r21gl5qbr3";
86142+ libraryHaskellDepends = [ base Cabal containers template-haskell ];
86143+ testHaskellDepends = [
86144+ base Cabal containers hspec hspec-discover template-haskell
86145+ ];
86146+ testToolDepends = [ hspec-discover ];
86147+ description = "First class typeclass instances";
86148+ license = stdenv.lib.licenses.bsd3;
86149+ }) {};
86150+
8618486151 "first-class-patterns" = callPackage
8618586152 ({ mkDerivation, base, transformers }:
8618686153 mkDerivation {
@@ -86926,26 +86893,6 @@ self: {
8692686893 }) {};
8692786894
8692886895 "flat-mcmc" = callPackage
86929− ({ mkDerivation, base, formatting, mcmc-types, monad-par
86930− , monad-par-extras, mwc-probability, pipes, primitive, text
86931− , transformers, vector
86932− }:
86933− mkDerivation {
86934− pname = "flat-mcmc";
86935− version = "1.5.0";
86936− sha256 = "1zgi69vgwss7hhv893n5z3av0byb5hiblha7k3ck4bbfmkgakkl7";
86937− revision = "1";
86938− editedCabalFile = "1pjkyvs4c6yx6jva08zw2b1qfhhv9q71sy806f5lddjsknnym2fn";
86939− libraryHaskellDepends = [
86940− base formatting mcmc-types monad-par monad-par-extras
86941− mwc-probability pipes primitive text transformers vector
86942− ];
86943− testHaskellDepends = [ base vector ];
86944− description = "Painless general-purpose sampling";
86945− license = stdenv.lib.licenses.mit;
86946− }) {};
86947−
86948− "flat-mcmc_1_5_1" = callPackage
8694986896 ({ mkDerivation, base, formatting, mcmc-types, monad-par
8695086897 , monad-par-extras, mwc-probability, pipes, primitive, text
8695186898 , transformers, vector
@@ -86961,7 +86908,6 @@ self: {
8696186908 testHaskellDepends = [ base vector ];
8696286909 description = "Painless general-purpose sampling";
8696386910 license = stdenv.lib.licenses.mit;
86964− hydraPlatforms = stdenv.lib.platforms.none;
8696586911 }) {};
8696686912
8696786913 "flat-tex" = callPackage
@@ -90127,18 +90073,6 @@ self: {
9012790073 }) {};
9012890074
9012990075 "from-sum" = callPackage
90130− ({ mkDerivation, base, doctest, Glob, transformers }:
90131− mkDerivation {
90132− pname = "from-sum";
90133− version = "0.2.2.0";
90134− sha256 = "05fppk2hkxn67xfl6kdzdp2a5mfz63dv4yx7mvr9fbdrarxrf326";
90135− libraryHaskellDepends = [ base transformers ];
90136− testHaskellDepends = [ base doctest Glob ];
90137− description = "Canonical fromMaybeM and fromEitherM functions";
90138− license = stdenv.lib.licenses.bsd3;
90139− }) {};
90140−
90141− "from-sum_0_2_3_0" = callPackage
9014290076 ({ mkDerivation, base, doctest, Glob, transformers }:
9014390077 mkDerivation {
9014490078 pname = "from-sum";
@@ -90148,7 +90082,6 @@ self: {
9014890082 testHaskellDepends = [ base doctest Glob ];
9014990083 description = "Combinators for working with Maybe and Either";
9015090084 license = stdenv.lib.licenses.bsd3;
90151− hydraPlatforms = stdenv.lib.platforms.none;
9015290085 }) {};
9015390086
9015490087 "fromhtml" = callPackage
@@ -90167,18 +90100,18 @@ self: {
9016790100
9016890101 "front" = callPackage
9016990102 ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup
90170− , bytestring, conduit, fay, fay-dom, fay-websockets, mtl, stm
90171− , stm-lifted, text, websockets
90103+ , bytestring, conduit, fay, fay-dom, fay-websockets, mtl, stm, text
90104+ , websockets
9017290105 }:
9017390106 mkDerivation {
9017490107 pname = "front";
90175− version = "0.0.0.2";
90176− sha256 = "106y0qnz5lyvxy69s24fapqkys6i373kl2v51bpkvfwq5ppax0b0";
90108+ version = "0.0.0.3";
90109+ sha256 = "0n2w3rcl20njqrxx9ws2jrw3yjrxhxzl6q916apyh07bricmmkw9";
9017790110 isLibrary = true;
9017890111 isExecutable = true;
9017990112 libraryHaskellDepends = [
9018090113 aeson async base blaze-html blaze-markup bytestring conduit fay
90181− fay-dom fay-websockets mtl stm stm-lifted text websockets
90114+ fay-dom fay-websockets mtl stm text websockets
9018290115 ];
9018390116 description = "A reactive frontend web framework";
9018490117 license = stdenv.lib.licenses.bsd3;
@@ -91360,15 +91293,15 @@ self: {
9136091293 license = stdenv.lib.licenses.bsd3;
9136191294 }) {};
9136291295
91363− "fused-effects_1_0_0_0" = callPackage
91296+ "fused-effects_1_0_0_1" = callPackage
9136491297 ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
9136591298 , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
9136691299 , tasty-hunit, transformers
9136791300 }:
9136891301 mkDerivation {
9136991302 pname = "fused-effects";
91370− version = "1.0.0.0";
91371− sha256 = "120jvgh35wl5vb2qad8c1dhpr1ddlbhm5b03dy9kcb7d8s89qfs6";
91303+ version = "1.0.0.1";
91304+ sha256 = "1v11m8i4ffadfiy3bxwgjcrx5z5gzxv4ciniqzv01b0jxajfkg9g";
9137291305 libraryHaskellDepends = [ base transformers ];
9137391306 testHaskellDepends = [
9137491307 base containers hedgehog hedgehog-fn inspection-testing mtl tasty
@@ -91480,6 +91413,17 @@ self: {
9148091413 broken = true;
9148191414 }) {};
9148291415
91416+ "fusion-plugin" = callPackage
91417+ ({ mkDerivation, base, ghc, syb }:
91418+ mkDerivation {
91419+ pname = "fusion-plugin";
91420+ version = "0.1.0";
91421+ sha256 = "0qns66bakz2vlvglglz3qjg8f7483sldlm25v5lph8fdkj2psrfx";
91422+ libraryHaskellDepends = [ base ghc syb ];
91423+ description = "GHC plugin to make stream fusion more predictable";
91424+ license = stdenv.lib.licenses.bsd3;
91425+ }) {};
91426+
9148391427 "futhark" = callPackage
9148491428 ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
9148591429 , blaze-html, bytestring, containers, data-binary-ieee754
@@ -91497,6 +91441,8 @@ self: {
9149791441 pname = "futhark";
9149891442 version = "0.14.1";
9149991443 sha256 = "1bg0r9b0jg9j12lcc6wa684yjm58l020m9x5abpc54cghigywswj";
91444+ revision = "1";
91445+ editedCabalFile = "0iqg18jz8lgbh9iq1zgs8j9q5smzzi8w1asryz4dx8y6dl7n97p5";
9150091446 isLibrary = true;
9150191447 isExecutable = true;
9150291448 libraryHaskellDepends = [
@@ -94504,7 +94450,7 @@ self: {
9450494450 sed -i "s|\"-s\"|\"\"|" ./Setup.hs
9450594451 sed -i "s|numJobs (bf bi)++||" ./Setup.hs
9450694452 '';
94507− preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH'';
94453+ preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';
9450894454 description = "Grammatical Framework";
9450994455 license = "unknown";
9451094456 hydraPlatforms = stdenv.lib.platforms.none;
@@ -95047,15 +94993,15 @@ self: {
9504794993 license = stdenv.lib.licenses.bsd3;
9504894994 }) {};
9504994995
95050− "ghc-lib_8_8_2" = callPackage
94996+ "ghc-lib_8_8_2_20200205" = callPackage
9505194997 ({ mkDerivation, alex, array, base, binary, bytestring, containers
9505294998 , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
9505394999 , hpc, pretty, process, time, transformers, unix
9505495000 }:
9505595001 mkDerivation {
9505695002 pname = "ghc-lib";
95057− version = "8.8.2";
95058− sha256 = "0dsb41vk9agywzw7nayraq9hhi95vz6aw9yz8jgggh1an4vkg833";
95003+ version = "8.8.2.20200205";
95004+ sha256 = "13sq702fv3p8jwvsswxz51lp0h33hd1abxrrflxyqlhz84hn9lk9";
9505995005 enableSeparateDataOutput = true;
9506095006 libraryHaskellDepends = [
9506195007 array base binary bytestring containers deepseq directory filepath
@@ -95086,15 +95032,15 @@ self: {
9508695032 license = stdenv.lib.licenses.bsd3;
9508795033 }) {};
9508895034
95089− "ghc-lib-parser_8_8_2" = callPackage
95035+ "ghc-lib-parser_8_8_2_20200205" = callPackage
9509095036 ({ mkDerivation, alex, array, base, binary, bytestring, containers
9509195037 , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
9509295038 , process, time, transformers, unix
9509395039 }:
9509495040 mkDerivation {
9509595041 pname = "ghc-lib-parser";
95096− version = "8.8.2";
95097− sha256 = "0q9pxdwmzm5hr6snpbkn1d3165h0lrdncgid5aqffqwz2hc1d2z0";
95042+ version = "8.8.2.20200205";
95043+ sha256 = "17rhzlwya0v6l146hmg6z3j224sr31s2pszspwyab790pncyrxgq";
9509895044 enableSeparateDataOutput = true;
9509995045 libraryHaskellDepends = [
9510095046 array base binary bytestring containers deepseq directory filepath
@@ -95112,8 +95058,8 @@ self: {
9511295058 }:
9511395059 mkDerivation {
9511495060 pname = "ghc-lib-parser-ex";
95115− version = "8.8.3.0";
95116− sha256 = "01xlp9drkwdh5n822x2pvga95lpvwa195lf9wpnx8z9v5sj2lksa";
95061+ version = "8.8.4.0";
95062+ sha256 = "17vvqk2kkh8rd7shpdzassijfrdljbgbgm955l75569chsbf5xma";
9511795063 libraryHaskellDepends = [
9511895064 base bytestring ghc-lib-parser uniplate
9511995065 ];
@@ -95285,6 +95231,8 @@ self: {
9528595231 pname = "ghc-paths";
9528695232 version = "0.1.0.12";
9528795233 sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf";
95234+ revision = "1";
95235+ editedCabalFile = "1gb4hn87a78j1c2y1adi81y03irzkaxywscjkphfajsxc7f0ydw5";
9528895236 setupHaskellDepends = [ base Cabal directory ];
9528995237 libraryHaskellDepends = [ base ];
9529095238 description = "Knowledge of GHC's installation directories";
@@ -95648,6 +95596,30 @@ self: {
9564895596 license = stdenv.lib.licenses.bsd2;
9564995597 }) {};
9565095598
95599+ "ghc-typelits-extra_0_3_3" = callPackage
95600+ ({ mkDerivation, base, containers, ghc, ghc-prim
95601+ , ghc-tcplugins-extra, ghc-typelits-knownnat
95602+ , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
95603+ , transformers
95604+ }:
95605+ mkDerivation {
95606+ pname = "ghc-typelits-extra";
95607+ version = "0.3.3";
95608+ sha256 = "0gdnp7pp3v5742qs9vkg2bh1sws9bcc11z4119fdapflglqq22mc";
95609+ libraryHaskellDepends = [
95610+ base containers ghc ghc-prim ghc-tcplugins-extra
95611+ ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
95612+ transformers
95613+ ];
95614+ testHaskellDepends = [
95615+ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
95616+ tasty-hunit
95617+ ];
95618+ description = "Additional type-level operations on GHC.TypeLits.Nat";
95619+ license = stdenv.lib.licenses.bsd2;
95620+ hydraPlatforms = stdenv.lib.platforms.none;
95621+ }) {};
95622+
9565195623 "ghc-typelits-knownnat" = callPackage
9565295624 ({ mkDerivation, base, ghc, ghc-tcplugins-extra
9565395625 , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -95668,15 +95640,15 @@ self: {
9566895640 license = stdenv.lib.licenses.bsd2;
9566995641 }) {};
9567095642
95671− "ghc-typelits-knownnat_0_7_1" = callPackage
95643+ "ghc-typelits-knownnat_0_7_2" = callPackage
9567295644 ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
9567395645 , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
9567495646 , template-haskell, transformers
9567595647 }:
9567695648 mkDerivation {
9567795649 pname = "ghc-typelits-knownnat";
95678− version = "0.7.1";
95679− sha256 = "00pfkb6iw4isfmp0jmcqsqyb84xf6b4xnljn3bmax2x8ci9vpm0c";
95650+ version = "0.7.2";
95651+ sha256 = "1wdippdn029rpd1v3mk470gyp8v13d2bna8p8q6cn7q7nhm1dhhc";
9568095652 libraryHaskellDepends = [
9568195653 base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise
9568295654 template-haskell transformers
@@ -95705,16 +95677,18 @@ self: {
9570595677 license = stdenv.lib.licenses.bsd2;
9570695678 }) {};
9570795679
95708− "ghc-typelits-natnormalise_0_7" = callPackage
95680+ "ghc-typelits-natnormalise_0_7_1" = callPackage
9570995681 ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
95710− , integer-gmp, tasty, tasty-hunit, template-haskell, transformers
95682+ , integer-gmp, syb, tasty, tasty-hunit, template-haskell
95683+ , transformers
9571195684 }:
9571295685 mkDerivation {
9571395686 pname = "ghc-typelits-natnormalise";
95714− version = "0.7";
95715− sha256 = "1rfw67hhhka3ga8v3224ain7jvdc390glz5cr7vvxm1yqs1wgwx4";
95687+ version = "0.7.1";
95688+ sha256 = "1sbwzbs3bnvyla44kcsxs6h12sdfqzbm6n0swy2scp5p271fr0i3";
9571695689 libraryHaskellDepends = [
95717− base containers ghc ghc-tcplugins-extra integer-gmp transformers
95690+ base containers ghc ghc-tcplugins-extra integer-gmp syb
95691+ transformers
9571895692 ];
9571995693 testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
9572095694 description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
@@ -95723,19 +95697,18 @@ self: {
9572395697 }) {};
9572495698
9572595699 "ghc-typelits-presburger" = callPackage
95726− ({ mkDerivation, base, containers, equational-reasoning, ghc
95727− , ghc-tcplugins-extra, mtl, pretty, reflection, singletons, syb
95728− , transformers
95700+ ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl
95701+ , pretty, reflection, syb, transformers
9572995702 }:
9573095703 mkDerivation {
9573195704 pname = "ghc-typelits-presburger";
95732− version = "0.2.0.5";
95733− sha256 = "03n6ddvn6p1nk6yw141zdw60iqda7k3sbaacc9s04mmnmshvia1n";
95705+ version = "0.3.0.0";
95706+ sha256 = "1jahwmy2cywnnlvrjizak1wqih7pki9r35qazcz7mih68pd9gnhz";
9573495707 isLibrary = true;
9573595708 isExecutable = true;
9573695709 libraryHaskellDepends = [
95737− base containers equational-reasoning ghc ghc-tcplugins-extra mtl
95738− pretty reflection singletons syb transformers
95710+ base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
95711+ transformers
9573995712 ];
9574095713 description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
9574195714 license = stdenv.lib.licenses.bsd3;
@@ -96017,15 +95990,16 @@ self: {
9601795990 , haddock-library, hashable, haskell-lsp, haskell-lsp-types
9601895991 , hie-bios, hslogger, lens, lsp-test, mtl, network-uri
9601995992 , optparse-applicative, parser-combinators, prettyprinter
96020− , prettyprinter-ansi-terminal, regex-tdfa, rope-utf16-splay
96021− , safe-exceptions, shake, sorted-list, stm, syb, tasty
96022− , tasty-expected-failure, tasty-hunit, text, time, transformers
96023− , unix, unordered-containers, utf8-string
95993+ , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
95994+ , regex-tdfa, rope-utf16-splay, safe-exceptions, shake, sorted-list
95995+ , stm, syb, tasty, tasty-expected-failure, tasty-hunit
95996+ , tasty-quickcheck, text, time, transformers, unix
95997+ , unordered-containers, utf8-string
9602495998 }:
9602595999 mkDerivation {
9602696000 pname = "ghcide";
96027− version = "0.0.6";
96028− sha256 = "1vp0x4z0444zz8zaibk1r8lb0xjymdqpagm87xsf3csbzkqfhsjb";
96001+ version = "0.1.0";
96002+ sha256 = "0yb8k64wnm9dx93925ddlwy8kimd6a44m9azs9d5x6nahigi406m";
9602996003 isLibrary = true;
9603096004 isExecutable = true;
9603196005 libraryHaskellDepends = [
@@ -96043,8 +96017,10 @@ self: {
9604396017 ];
9604496018 testHaskellDepends = [
9604596019 aeson base bytestring containers directory extra filepath ghc
96046− ghc-typelits-knownnat haskell-lsp-types lens lsp-test
96047− parser-combinators tasty tasty-expected-failure tasty-hunit text
96020+ ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types
96021+ lens lsp-test parser-combinators QuickCheck quickcheck-instances
96022+ rope-utf16-splay tasty tasty-expected-failure tasty-hunit
96023+ tasty-quickcheck text
9604896024 ];
9604996025 description = "The core of an IDE";
9605096026 license = stdenv.lib.licenses.asl20;
@@ -97682,8 +97658,8 @@ self: {
9768297658 }:
9768397659 mkDerivation {
9768497660 pname = "git-annex";
97685− version = "7.20191230";
97686− sha256 = "1xsd4vhiv3zkcqjh2pxhbkjx75hcalcc9bpdlfc27wzxsxyrwz12";
97661+ version = "7.20200204";
97662+ sha256 = "09jf3hbi8gvv0zwyhyyidc3mqjz9p4ji3wg9kh4f0hgx5vcwzsms";
9768797663 configureFlags = [
9768897664 "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
9768997665 "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -97738,8 +97714,8 @@ self: {
9773897714 }:
9773997715 mkDerivation {
9774097716 pname = "git-brunch";
97741− version = "1.1.0.0";
97742− sha256 = "0nkyq5bgq6mc27j4qrydwjyb8zhhgiyjdbpk9d1xfb0z4c817131";
97717+ version = "1.1.2.0";
97718+ sha256 = "02swvnwa5iqnrsw6r709qxy1hjp7df4i0qlhkqhshfdva6xy3376";
9774397719 isLibrary = false;
9774497720 isExecutable = true;
9774597721 executableHaskellDepends = [
@@ -103980,32 +103956,6 @@ self: {
103980103956 }) {};
103981103957
103982103958 "graphviz" = callPackage
103983− ({ mkDerivation, base, bytestring, colour, containers, criterion
103984− , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz
103985− , hspec, hspec-discover, mtl, polyparse, process, QuickCheck
103986− , temporary, text, wl-pprint-text
103987− }:
103988− mkDerivation {
103989− pname = "graphviz";
103990− version = "2999.20.0.3";
103991− sha256 = "04k26zw61nfv1pkd00iaq89pgsaiym0sf4cbzkmm2k2fj5xa587g";
103992− isLibrary = true;
103993− isExecutable = true;
103994− libraryHaskellDepends = [
103995− base bytestring colour containers directory dlist fgl filepath mtl
103996− polyparse process temporary text wl-pprint-text
103997− ];
103998− testHaskellDepends = [
103999− base containers fgl fgl-arbitrary filepath hspec QuickCheck text
104000− ];
104001− testSystemDepends = [ graphviz ];
104002− testToolDepends = [ hspec-discover ];
104003− benchmarkHaskellDepends = [ base criterion deepseq text ];
104004− description = "Bindings to Graphviz for graph visualisation";
104005− license = stdenv.lib.licenses.bsd3;
104006− }) {inherit (pkgs) graphviz;};
104007−
104008− "graphviz_2999_20_0_4" = callPackage
104009103959 ({ mkDerivation, base, bytestring, colour, containers, criterion
104010103960 , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz
104011103961 , hspec, hspec-discover, mtl, polyparse, process, QuickCheck
@@ -104029,7 +103979,6 @@ self: {
104029103979 benchmarkHaskellDepends = [ base criterion deepseq text ];
104030103980 description = "Bindings to Graphviz for graph visualisation";
104031103981 license = stdenv.lib.licenses.bsd3;
104032− hydraPlatforms = stdenv.lib.platforms.none;
104033103982 }) {inherit (pkgs) graphviz;};
104034103983
104035103984 "graql" = callPackage
@@ -107525,8 +107474,8 @@ self: {
107525107474 }:
107526107475 mkDerivation {
107527107476 pname = "hackport";
107528− version = "0.6.3";
107529− sha256 = "1bj4jafr81xl2dvc8ym29dnp9vmbv7njaqkkfypzvm0ws09mcvh1";
107477+ version = "0.6.4";
107478+ sha256 = "185b2mincqzla8j675lv4ydi8fvsj3ikyq4g8jivygbkcpawi5f5";
107530107479 isLibrary = false;
107531107480 isExecutable = true;
107532107481 executableHaskellDepends = [
@@ -107540,7 +107489,7 @@ self: {
107540107489 testHaskellDepends = [
107541107490 array base binary bytestring containers deepseq directory
107542107491 extensible-exceptions filepath HUnit parsec pretty process split
107543− time unix xml
107492+ text time transformers unix xml
107544107493 ];
107545107494 description = "Hackage and Portage integration tool";
107546107495 license = "GPL";
@@ -107879,17 +107828,14 @@ self: {
107879107828 }:
107880107829 mkDerivation {
107881107830 pname = "haeredes";
107882− version = "0.5.1";
107883− sha256 = "1y4r487z2k6l7xi5bi1rb3rz0i7yki2j2mmpnpfdy2bba1s51a6n";
107831+ version = "0.5.2";
107832+ sha256 = "0qqz22aghl00hy240hvws3sgaw2jvhqicms0c1y76b68af1dlkyh";
107884107833 isLibrary = false;
107885107834 isExecutable = true;
107886107835 executableHaskellDepends = [
107887107836 base bytestring cmdargs dns iproute parallel-io
107888107837 ];
107889− testHaskellDepends = [
107890− base bytestring cmdargs dns doctest filemanip iproute parallel-io
107891− process
107892− ];
107838+ testHaskellDepends = [ base doctest filemanip process ];
107893107839 description = "Confirm delegation of NS and MX records";
107894107840 license = stdenv.lib.licenses.agpl3;
107895107841 }) {};
@@ -109111,8 +109057,8 @@ self: {
109111109057 ({ mkDerivation, base, containers, random }:
109112109058 mkDerivation {
109113109059 pname = "hanabi-dealer";
109114− version = "0.4.0.1";
109115− sha256 = "1baxmy5lz8w8yjnaslzrmpnwx7rgqixkwbkzfb034024wlb9w0am";
109060+ version = "0.5.0.0";
109061+ sha256 = "01dhx6il56pvl9iwaxylyy4sg2gs67w2sr6svahx32lbrnyxnkp8";
109116109062 isLibrary = true;
109117109063 isExecutable = true;
109118109064 libraryHaskellDepends = [ base containers random ];
@@ -110214,17 +110160,15 @@ self: {
110214110160 }) {};
110215110161
110216110162 "happy-meta" = callPackage
110217− ({ mkDerivation, array, base, containers, happy, haskell-src-meta
110218− , mtl, template-haskell
110163+ ({ mkDerivation, array, base, containers, fail, happy
110164+ , haskell-src-meta, mtl, template-haskell
110219110165 }:
110220110166 mkDerivation {
110221110167 pname = "happy-meta";
110222− version = "0.2.0.9";
110223− sha256 = "1w3bmwnsg9714kyqxzfrbw0az4i2dqprn2hms3kbdq5984yhi9bg";
110224− revision = "1";
110225− editedCabalFile = "1mq8gdq11bqgii498as0078pf8s1mnawh4rvys6hjnd77iaf9nfk";
110168+ version = "0.2.0.10";
110169+ sha256 = "1w6shcydpca5g9dgnki0w2xqr9mf17xa18s8hxxm3z3dd0sp1db9";
110226110170 libraryHaskellDepends = [
110227− array base containers haskell-src-meta mtl template-haskell
110171+ array base containers fail haskell-src-meta mtl template-haskell
110228110172 ];
110229110173 libraryToolDepends = [ happy ];
110230110174 description = "Quasi-quoter for Happy parsers";
@@ -112172,7 +112116,7 @@ self: {
112172112116 license = stdenv.lib.licenses.mit;
112173112117 }) {};
112174112118
112175− "haskell-lsp_0_19_0_0" = callPackage
112119+ "haskell-lsp_0_20_0_1" = callPackage
112176112120 ({ mkDerivation, aeson, async, attoparsec, base, bytestring
112177112121 , containers, data-default, directory, filepath, hashable
112178112122 , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
@@ -112181,8 +112125,8 @@ self: {
112181112125 }:
112182112126 mkDerivation {
112183112127 pname = "haskell-lsp";
112184− version = "0.19.0.0";
112185− sha256 = "0cjmjrcd3rg8jc6rfk73jirmvay07jps9gdjd97clxz90w3mm24i";
112128+ version = "0.20.0.1";
112129+ sha256 = "1yy9j61hlar4y8p58q8a0i3c6qmv5h9f53kk48jsvfa59c3dz92b";
112186112130 isLibrary = true;
112187112131 isExecutable = true;
112188112132 libraryHaskellDepends = [
@@ -112194,7 +112138,7 @@ self: {
112194112138 testHaskellDepends = [
112195112139 aeson base bytestring containers data-default directory filepath
112196112140 hashable hspec lens network-uri QuickCheck quickcheck-instances
112197− rope-utf16-splay sorted-list stm text
112141+ rope-utf16-splay sorted-list stm text unordered-containers
112198112142 ];
112199112143 testToolDepends = [ hspec-discover ];
112200112144 description = "Haskell library for the Microsoft Language Server Protocol";
@@ -112241,15 +112185,15 @@ self: {
112241112185 license = stdenv.lib.licenses.mit;
112242112186 }) {};
112243112187
112244− "haskell-lsp-types_0_19_0_0" = callPackage
112188+ "haskell-lsp-types_0_20_0_0" = callPackage
112245112189 ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
112246112190 , filepath, hashable, lens, network-uri, scientific, text
112247112191 , unordered-containers
112248112192 }:
112249112193 mkDerivation {
112250112194 pname = "haskell-lsp-types";
112251− version = "0.19.0.0";
112252− sha256 = "089rxcdz02hq68ihc26r7dwsn8hl7f7096vcb0dyd2jda0ganhm9";
112195+ version = "0.20.0.0";
112196+ sha256 = "09p0d4vibrm06kj8i1yq9zhnkxl87yg5085l1sy9m20z8j988waq";
112253112197 libraryHaskellDepends = [
112254112198 aeson base bytestring data-default deepseq filepath hashable lens
112255112199 network-uri scientific text unordered-containers
@@ -115584,8 +115528,8 @@ self: {
115584115528 }:
115585115529 mkDerivation {
115586115530 pname = "hasql-th";
115587− version = "0.4.0.3";
115588− sha256 = "0j850460d2sz6zwvawyv9913b03iqf58b737y6imgd6k7ddq82hn";
115531+ version = "0.4.0.4";
115532+ sha256 = "1kd12vw98wml58sp1dqfq58z0vjjqdssb6q7f6ngs7q6ig27kxfb";
115589115533 libraryHaskellDepends = [
115590115534 base bytestring case-insensitive containers contravariant
115591115535 fast-builder foldl hashable hasql headed-megaparsec megaparsec
@@ -116436,6 +116380,8 @@ self: {
116436116380 pname = "hblas";
116437116381 version = "0.4.0.1";
116438116382 sha256 = "1jclawfvykdsd5b5wmqyz6fb0kx6yr626w4g86w9q1127k8l102k";
116383+ revision = "1";
116384+ editedCabalFile = "0085hyl5hcnxjf83vis34qklv6xajsk5z0mzrirgp03nzyf55l7r";
116439116385 libraryHaskellDepends = [ base primitive storable-complex vector ];
116440116386 librarySystemDepends = [ blas liblapack ];
116441116387 testHaskellDepends = [ base hspec primitive vector ];
@@ -117652,8 +117598,8 @@ self: {
117652117598 pname = "hedgehog";
117653117599 version = "1.0.2";
117654117600 sha256 = "1058d5fcv3hhvlx34a8xkg8r75p93l2yhacdbga8d4radiayy34f";
117655− revision = "1";
117656− editedCabalFile = "0rcga61rs098y4h44d5144qa7ismibvb44vw97ykazmz5yfg1n9l";
117601+ revision = "2";
117602+ editedCabalFile = "1qh7yaijp04li1i10cd5j6bc58fcagynxxmvs32wc8m1fvgzi05w";
117657117603 libraryHaskellDepends = [
117658117604 ansi-terminal async base bytestring concurrent-output containers
117659117605 directory erf exceptions fail lifted-async mmorph monad-control mtl
@@ -117891,6 +117837,16 @@ self: {
117891117837 broken = true;
117892117838 }) {};
117893117839
117840+ "hedis-envy" = callPackage
117841+ ({ mkDerivation, base, envy, hedis, scientific, time }:
117842+ mkDerivation {
117843+ pname = "hedis-envy";
117844+ version = "0.1.0.1";
117845+ sha256 = "165a7pw1i1i9gxljmx03zavza5qjyir09bwk067cfr5an9razvq6";
117846+ libraryHaskellDepends = [ base envy hedis scientific time ];
117847+ license = stdenv.lib.licenses.bsd3;
117848+ }) {};
117849+
117894117850 "hedis-monadic" = callPackage
117895117851 ({ mkDerivation, base, hedis, monad-control, mtl, transformers
117896117852 , transformers-base, transformers-compat
@@ -118612,8 +118568,8 @@ self: {
118612118568 }:
118613118569 mkDerivation {
118614118570 pname = "heredocs";
118615− version = "0.1.5";
118616− sha256 = "1bmih3jwmx8dv128rb9w1682fp3w0f6i7hhyyakswy7a04q34ryi";
118571+ version = "0.1.6";
118572+ sha256 = "12qsa6vcdc255dx7dc4nfmgy3aam7w6qy92x4811mxx4mxrsr81r";
118617118573 libraryHaskellDepends = [
118618118574 base bytestring doctest parsec template-haskell text
118619118575 ];
@@ -120291,27 +120247,28 @@ self: {
120291120247 }) {};
120292120248
120293120249 "hie-bios" = callPackage
120294− ({ mkDerivation, base, base16-bytestring, bytestring, conduit
120295− , conduit-extra, containers, cryptohash-sha1, deepseq, directory
120296− , extra, file-embed, filepath, ghc, hslogger, process, tasty
120297− , tasty-hunit, temporary, text, time, transformers, unix-compat
120298− , unordered-containers, vector, yaml
120250+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
120251+ , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
120252+ , directory, extra, file-embed, filepath, ghc, hslogger, process
120253+ , tasty, tasty-hunit, temporary, text, time, transformers
120254+ , unix-compat, unordered-containers, vector, yaml
120299120255 }:
120300120256 mkDerivation {
120301120257 pname = "hie-bios";
120302− version = "0.3.2";
120303− sha256 = "1609rvjgh1laqxl4c1bh0j3bq5yysbbaflx6hn8npr0ckq2ckvir";
120258+ version = "0.4.0";
120259+ sha256 = "1pa8wjj6sml39371f355z46304jzzwpcr62q0qzrpqq8w9017241";
120304120260 isLibrary = true;
120305120261 isExecutable = true;
120306120262 libraryHaskellDepends = [
120307− base base16-bytestring bytestring conduit conduit-extra containers
120308− cryptohash-sha1 deepseq directory extra file-embed filepath ghc
120309− hslogger process temporary text time transformers unix-compat
120310− unordered-containers vector yaml
120263+ aeson base base16-bytestring bytestring conduit conduit-extra
120264+ containers cryptohash-sha1 deepseq directory extra file-embed
120265+ filepath ghc hslogger process temporary text time transformers
120266+ unix-compat unordered-containers vector yaml
120311120267 ];
120312120268 executableHaskellDepends = [ base directory filepath ghc ];
120313120269 testHaskellDepends = [
120314− base directory filepath ghc tasty tasty-hunit
120270+ base directory extra filepath ghc tasty tasty-hunit text
120271+ unordered-containers yaml
120315120272 ];
120316120273 description = "Set up a GHC API session";
120317120274 license = stdenv.lib.licenses.bsd3;
@@ -121815,18 +121772,6 @@ self: {
121815121772 license = "(BSD-2-Clause OR Apache-2.0)";
121816121773 }) {};
121817121774
121818− "hkd-default" = callPackage
121819− ({ mkDerivation, aeson, base }:
121820− mkDerivation {
121821− pname = "hkd-default";
121822− version = "1.1.0.0";
121823− sha256 = "1ff8sfd68a06s7kfc85ww6w5wm7m0f70vd2bi0lbkj0r14rsn7vg";
121824− libraryHaskellDepends = [ base ];
121825− testHaskellDepends = [ aeson base ];
121826− description = "Apply default value for optional field of HKD";
121827− license = stdenv.lib.licenses.bsd3;
121828− }) {};
121829−
121830121775 "hkd-delta" = callPackage
121831121776 ({ mkDerivation, base }:
121832121777 mkDerivation {
@@ -122089,8 +122034,8 @@ self: {
122089122034 }:
122090122035 mkDerivation {
122091122036 pname = "hledger-flow";
122092− version = "0.12.4.0";
122093− sha256 = "1j5hhh06xrdzdpzvvk8gg2mzhsmyk9xvxbpvjy0sg3mmpa27vr6f";
122037+ version = "0.13.0.0";
122038+ sha256 = "0lgjb35mpjnyqdc4lr5g2q88nhjbh4znkw9xmlc7vlf1bpa27a8a";
122094122039 isLibrary = true;
122095122040 isExecutable = true;
122096122041 libraryHaskellDepends = [
@@ -122410,8 +122355,8 @@ self: {
122410122355 }:
122411122356 mkDerivation {
122412122357 pname = "hlint";
122413− version = "2.2.9";
122414− sha256 = "1six65y2x89q4a1kz5vm3pcjpwpp423h8nzp6kjka6cm5hn5ahdp";
122358+ version = "2.2.10";
122359+ sha256 = "1zna80g34zzxz0cazg0w3cqx2cmlvzd82ajyhypwp9anbc10l7h4";
122415122360 isLibrary = true;
122416122361 isExecutable = true;
122417122362 enableSeparateDataOutput = true;
@@ -123543,15 +123488,15 @@ self: {
123543123488 license = stdenv.lib.licenses.bsd3;
123544123489 }) {};
123545123490
123546− "hoauth2_1_10_2" = callPackage
123491+ "hoauth2_1_11_0" = callPackage
123547123492 ({ mkDerivation, aeson, base, binary, bytestring, exceptions
123548123493 , http-conduit, http-types, microlens, text, unordered-containers
123549123494 , uri-bytestring, uri-bytestring-aeson
123550123495 }:
123551123496 mkDerivation {
123552123497 pname = "hoauth2";
123553− version = "1.10.2";
123554− sha256 = "04kdz01pg32p1ci9rqnkkbk2ch6bgyqq9v7cbfpdxqp0hyfhv2jl";
123498+ version = "1.11.0";
123499+ sha256 = "0pf558n93gqksfgsjlvwcly2lq86adkcbqjqsq4p73kwwzs6dka8";
123555123500 isLibrary = true;
123556123501 isExecutable = true;
123557123502 libraryHaskellDepends = [
@@ -125576,6 +125521,27 @@ self: {
125576125521 hydraPlatforms = stdenv.lib.platforms.none;
125577125522 }) {};
125578125523
125524+ "hpc-codecov" = callPackage
125525+ ({ mkDerivation, array, base, bytestring, directory, filepath, hpc
125526+ , tar, tasty, tasty-hunit
125527+ }:
125528+ mkDerivation {
125529+ pname = "hpc-codecov";
125530+ version = "0.1.0.0";
125531+ sha256 = "1kr245qsdq60lvg1y9krpd19z9svwi2w9843b39hbv9fxzs7zcia";
125532+ isLibrary = true;
125533+ isExecutable = true;
125534+ libraryHaskellDepends = [
125535+ array base bytestring directory filepath hpc
125536+ ];
125537+ executableHaskellDepends = [ base ];
125538+ testHaskellDepends = [
125539+ base directory filepath tar tasty tasty-hunit
125540+ ];
125541+ description = "Generate codecov report from hpc data";
125542+ license = stdenv.lib.licenses.bsd3;
125543+ }) {};
125544+
125579125545 "hpc-coveralls" = callPackage
125580125546 ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
125581125547 , containers, curl, directory, directory-tree, hpc, HUnit, process
@@ -125801,8 +125767,8 @@ self: {
125801125767 }:
125802125768 mkDerivation {
125803125769 pname = "hpqtypes";
125804− version = "1.8.0.0";
125805− sha256 = "07n4w2ylmx1swdqvd1hbrh2bch6qx54vxdzw0px6n0b01nadn2gr";
125770+ version = "1.8.0.1";
125771+ sha256 = "1zn6qzpxvpdiim12lma7viq96j3jadvlcw188iknjqyn15kri9my";
125806125772 setupHaskellDepends = [ base Cabal directory filepath ];
125807125773 libraryHaskellDepends = [
125808125774 aeson async base bytestring containers exceptions lifted-base
@@ -125830,8 +125796,8 @@ self: {
125830125796 }:
125831125797 mkDerivation {
125832125798 pname = "hpqtypes-extras";
125833− version = "1.10.1.0";
125834− sha256 = "13ja18jk0w3c9jzys72fddpgx74cr4p5bap6l0jckb61wbj1m6zl";
125799+ version = "1.10.2.0";
125800+ sha256 = "16x7innivjrnsamn6lrjg1a2v0wy1w6r3ariw3ncrwfpcfdmr45n";
125835125801 libraryHaskellDepends = [
125836125802 base base16-bytestring bytestring containers cryptohash exceptions
125837125803 fields-json hpqtypes lifted-base log-base monad-control mtl safe
@@ -127172,6 +127138,8 @@ self: {
127172127138 benchmarkHaskellDepends = [ base criterion ];
127173127139 description = "Create ATS types from Haskell types";
127174127140 license = stdenv.lib.licenses.bsd3;
127141+ hydraPlatforms = stdenv.lib.platforms.none;
127142+ broken = true;
127175127143 }) {};
127176127144
127177127145 "hs2bf" = callPackage
@@ -133707,7 +133675,7 @@ self: {
133707133675 broken = true;
133708133676 }) {};
133709133677
133710− "hw-balancedparens_0_3_0_3" = callPackage
133678+ "hw-balancedparens_0_3_0_4" = callPackage
133711133679 ({ mkDerivation, base, criterion, deepseq, doctest
133712133680 , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits
133713133681 , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim
@@ -133715,8 +133683,8 @@ self: {
133715133683 }:
133716133684 mkDerivation {
133717133685 pname = "hw-balancedparens";
133718− version = "0.3.0.3";
133719− sha256 = "07jng6plapizb0kazqfd4x7y5yazhggwvagkwc273a92ynw57bsi";
133686+ version = "0.3.0.4";
133687+ sha256 = "1f25czr55c8fsb1l2ljfr93x2fp888g78ngf45xampnr6m3468j3";
133720133688 libraryHaskellDepends = [
133721133689 base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
133722133690 hw-rankselect-base vector
@@ -134036,8 +134004,8 @@ self: {
134036134004 }:
134037134005 mkDerivation {
134038134006 pname = "hw-excess";
134039− version = "0.2.2.2";
134040− sha256 = "1iwml6il5vanx06vbn2apf1vcmimg7mw2ddqq1xy40ma7brirxsz";
134007+ version = "0.2.2.3";
134008+ sha256 = "1rlw53nbhjdvjqb1f0kacnmiiwhx04az6p4mf0iv5fwxcjh94q2r";
134041134009 libraryHaskellDepends = [
134042134010 base hw-bits hw-prim hw-rankselect-base safe vector
134043134011 ];
@@ -134660,17 +134628,18 @@ self: {
134660134628 broken = true;
134661134629 }) {};
134662134630
134663− "hw-rankselect_0_13_3_1" = callPackage
134631+ "hw-rankselect_0_13_3_2" = callPackage
134664134632 ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
134665− , directory, generic-lens, hedgehog, hspec, hspec-discover
134666− , hw-balancedparens, hw-bits, hw-fingertree, hw-hedgehog
134667− , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens, mmap, mtl
134668− , optparse-applicative, QuickCheck, resourcet, transformers, vector
134633+ , directory, doctest, doctest-discover, generic-lens, hedgehog
134634+ , hspec, hspec-discover, hw-balancedparens, hw-bits, hw-fingertree
134635+ , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
134636+ , mmap, mtl, optparse-applicative, QuickCheck, resourcet
134637+ , transformers, vector
134669134638 }:
134670134639 mkDerivation {
134671134640 pname = "hw-rankselect";
134672− version = "0.13.3.1";
134673− sha256 = "05bhc8i6k59zv90r00c6vy4vx99dpc4dh85dinwklh8yqnfwf5ks";
134641+ version = "0.13.3.2";
134642+ sha256 = "1p4b5nm8mgxlc7p5gcwh6dy85xgydpbw999zv27755dbfcv9nk4v";
134674134643 isLibrary = true;
134675134644 isExecutable = true;
134676134645 libraryHaskellDepends = [
@@ -134682,10 +134651,11 @@ self: {
134682134651 mmap mtl optparse-applicative vector
134683134652 ];
134684134653 testHaskellDepends = [
134685− base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
134686− hw-prim hw-rankselect-base mmap QuickCheck transformers vector
134654+ base directory doctest doctest-discover hedgehog hspec hw-bits
134655+ hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap
134656+ QuickCheck transformers vector
134687134657 ];
134688− testToolDepends = [ hspec-discover ];
134658+ testToolDepends = [ doctest-discover hspec-discover ];
134689134659 benchmarkHaskellDepends = [
134690134660 base bytestring conduit criterion directory hw-bits hw-prim
134691134661 hw-rankselect-base mmap resourcet vector
@@ -143983,25 +143953,6 @@ self: {
143983143953 }) {};
143984143954
143985143955 "json-feed" = callPackage
143986− ({ mkDerivation, aeson, base, bytestring, filepath, hspec
143987− , mime-types, network-uri, tagsoup, text, time
143988− }:
143989− mkDerivation {
143990− pname = "json-feed";
143991− version = "1.0.7";
143992− sha256 = "0rjszis4l0sb15v2gjiwnq6avl4bkqp186v449ms4qwbbqz11sc7";
143993− libraryHaskellDepends = [
143994− aeson base bytestring mime-types network-uri tagsoup text time
143995− ];
143996− testHaskellDepends = [
143997− aeson base bytestring filepath hspec mime-types network-uri tagsoup
143998− text time
143999− ];
144000− description = "JSON Feed";
144001− license = stdenv.lib.licenses.mit;
144002− }) {};
144003−
144004− "json-feed_1_0_8" = callPackage
144005143956 ({ mkDerivation, aeson, base, bytestring, filepath, hspec
144006143957 , mime-types, network-uri, tagsoup, text, time
144007143958 }:
@@ -144018,7 +143969,6 @@ self: {
144018143969 ];
144019143970 description = "JSON Feed";
144020143971 license = stdenv.lib.licenses.mit;
144021− hydraPlatforms = stdenv.lib.platforms.none;
144022143972 }) {};
144023143973
144024143974 "json-fu" = callPackage
@@ -145402,32 +145352,6 @@ self: {
145402145352 }) {};
145403145353
145404145354 "kanji" = callPackage
145405− ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
145406− , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
145407− , optparse-applicative, tasty, tasty-hunit, text, transformers
145408− }:
145409− mkDerivation {
145410− pname = "kanji";
145411− version = "3.4.0.2";
145412− sha256 = "017j8nwmwfbkxyaxjfp75js578kv6g5k7szsc46kidbw4l68dwmy";
145413− isLibrary = true;
145414− isExecutable = true;
145415− libraryHaskellDepends = [
145416− aeson base containers deepseq hashable text
145417− ];
145418− executableHaskellDepends = [
145419− aeson aeson-pretty base containers microlens microlens-aeson
145420− optparse-applicative text transformers
145421− ];
145422− testHaskellDepends = [
145423− aeson base containers HUnit-approx tasty tasty-hunit text
145424− ];
145425− benchmarkHaskellDepends = [ aeson base containers criterion text ];
145426− description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
145427− license = stdenv.lib.licenses.bsd3;
145428− }) {};
145429−
145430− "kanji_3_4_1" = callPackage
145431145355 ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
145432145356 , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
145433145357 , optparse-applicative, tasty, tasty-hunit, text, transformers
@@ -145451,7 +145375,6 @@ self: {
145451145375 benchmarkHaskellDepends = [ aeson base containers criterion text ];
145452145376 description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
145453145377 license = stdenv.lib.licenses.bsd3;
145454− hydraPlatforms = stdenv.lib.platforms.none;
145455145378 }) {};
145456145379
145457145380 "kansas-comet" = callPackage
@@ -146630,26 +146553,6 @@ self: {
146630146553 }) {};
146631146554
146632146555 "keys" = callPackage
146633− ({ mkDerivation, array, base, comonad, containers, free, hashable
146634− , semigroupoids, semigroups, tagged, transformers
146635− , transformers-compat, unordered-containers
146636− }:
146637− mkDerivation {
146638− pname = "keys";
146639− version = "3.12.2";
146640− sha256 = "1mw4c0dd21hmzhidf84p6fxrin7k05l2iz8iar3m7k5vbxihlldj";
146641− revision = "1";
146642− editedCabalFile = "1cx5bwd32mpqdgllrkld254a8ydks196m3j9dvm3razg8mxnz2x6";
146643− libraryHaskellDepends = [
146644− array base comonad containers free hashable semigroupoids
146645− semigroups tagged transformers transformers-compat
146646− unordered-containers
146647− ];
146648− description = "Keyed functors and containers";
146649− license = stdenv.lib.licenses.bsd3;
146650− }) {};
146651−
146652− "keys_3_12_3" = callPackage
146653146556 ({ mkDerivation, array, base, comonad, containers, free, hashable
146654146557 , semigroupoids, semigroups, tagged, transformers
146655146558 , transformers-compat, unordered-containers
@@ -146665,7 +146568,6 @@ self: {
146665146568 ];
146666146569 description = "Keyed functors and containers";
146667146570 license = stdenv.lib.licenses.bsd3;
146668− hydraPlatforms = stdenv.lib.platforms.none;
146669146571 }) {};
146670146572
146671146573 "keysafe" = callPackage
@@ -147492,6 +147394,22 @@ self: {
147492147394 broken = true;
147493147395 }) {};
147494147396
147397+ "kubernetes-webhook-haskell" = callPackage
147398+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
147399+ , text, unordered-containers
147400+ }:
147401+ mkDerivation {
147402+ pname = "kubernetes-webhook-haskell";
147403+ version = "0.2.0.0";
147404+ sha256 = "0yxavjq6xxia81yfw7skgdmirbq0wmlvbsklppq6a6y1m6drbyww";
147405+ libraryHaskellDepends = [
147406+ aeson base base64-bytestring binary bytestring text
147407+ unordered-containers
147408+ ];
147409+ description = "Create Kubernetes Admission Webhooks in Haskell";
147410+ license = stdenv.lib.licenses.mit;
147411+ }) {};
147412+
147495147413 "kuifje" = callPackage
147496147414 ({ mkDerivation, base, boxes, containers, lens }:
147497147415 mkDerivation {
@@ -147746,18 +147664,6 @@ self: {
147746147664 }) {};
147747147665
147748147666 "lackey" = callPackage
147749− ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
147750− mkDerivation {
147751− pname = "lackey";
147752− version = "1.0.10";
147753− sha256 = "13nvrsw29l25ysln0di0bd5lrwnwwp0mkwvymdgf2kc2jg7x46dj";
147754− libraryHaskellDepends = [ base servant servant-foreign text ];
147755− testHaskellDepends = [ base hspec servant servant-foreign text ];
147756− description = "Generate Ruby clients from Servant APIs";
147757− license = stdenv.lib.licenses.mit;
147758− }) {};
147759−
147760− "lackey_1_0_11" = callPackage
147761147667 ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
147762147668 mkDerivation {
147763147669 pname = "lackey";
@@ -147767,7 +147673,6 @@ self: {
147767147673 testHaskellDepends = [ base hspec servant servant-foreign text ];
147768147674 description = "Generate Ruby clients from Servant APIs";
147769147675 license = stdenv.lib.licenses.mit;
147770− hydraPlatforms = stdenv.lib.platforms.none;
147771147676 }) {};
147772147677
147773147678 "lacroix" = callPackage
@@ -148729,16 +148634,16 @@ self: {
148729148634 ({ mkDerivation, alex, ansi-wl-pprint, array, base
148730148635 , composition-prelude, containers, criterion, deepseq, happy, hspec
148731148636 , hspec-dirstream, microlens, recursion, system-filepath
148732− , transformers
148637+ , these-skinny, transformers
148733148638 }:
148734148639 mkDerivation {
148735148640 pname = "language-ats";
148736− version = "1.7.7.0";
148737− sha256 = "17p0wv3zbs8jj9jdcc6cg0g5snfyj418mx4b5299wddr5s99jmfi";
148641+ version = "1.7.7.1";
148642+ sha256 = "13d1hna3kgvyfihjn3639j8i1drpw65j3ksb5zh3dqi999ia6zs2";
148738148643 enableSeparateDataOutput = true;
148739148644 libraryHaskellDepends = [
148740148645 ansi-wl-pprint array base composition-prelude containers deepseq
148741− microlens recursion transformers
148646+ microlens recursion these-skinny transformers
148742148647 ];
148743148648 libraryToolDepends = [ alex happy ];
148744148649 testHaskellDepends = [
@@ -148747,6 +148652,24 @@ self: {
148747148652 benchmarkHaskellDepends = [ base criterion ];
148748148653 description = "Parser and pretty-printer for ATS";
148749148654 license = stdenv.lib.licenses.bsd3;
148655+ hydraPlatforms = stdenv.lib.platforms.none;
148656+ broken = true;
148657+ }) {};
148658+
148659+ "language-avro" = callPackage
148660+ ({ mkDerivation, avro, base, filepath, hspec, megaparsec, text
148661+ , vector
148662+ }:
148663+ mkDerivation {
148664+ pname = "language-avro";
148665+ version = "0.1.0.0";
148666+ sha256 = "1nns0qlzrcmlfivv2p4qdhni6ngx3r0926z6kmybmqi3jk7wibhw";
148667+ libraryHaskellDepends = [
148668+ avro base filepath megaparsec text vector
148669+ ];
148670+ testHaskellDepends = [ avro base hspec megaparsec text vector ];
148671+ description = "Language definition and parser for AVRO files";
148672+ license = stdenv.lib.licenses.asl20;
148750148673 }) {};
148751148674
148752148675 "language-bash" = callPackage
@@ -149627,57 +149550,14 @@ self: {
149627149550 ({ mkDerivation, base, megaparsec, text }:
149628149551 mkDerivation {
149629149552 pname = "language-protobuf";
149630− version = "1.0";
149631− sha256 = "1qg9c862srf7klcan53sa92ylnfx6xz8b1jqgw6rmpznfsw4h2c8";
149553+ version = "1.0.1";
149554+ sha256 = "1wxihyf320xsqi114dbl2cwylkc261d5wgd7migb1lh23gxnhhz2";
149632149555 libraryHaskellDepends = [ base megaparsec text ];
149633149556 description = "Language definition and parser for Protocol Buffers";
149634149557 license = stdenv.lib.licenses.asl20;
149635149558 }) {};
149636149559
149637149560 "language-puppet" = callPackage
149638− ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
149639− , base16-bytestring, bytestring, case-insensitive, containers
149640− , cryptonite, directory, filecache, filepath, formatting, Glob
149641− , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
149642− , http-client, lens, lens-aeson, megaparsec, memory, mtl
149643− , operational, optparse-applicative, parsec, parser-combinators
149644− , pcre-utils, protolude, random, regex-pcre-builtin, scientific
149645− , servant, servant-client, split, stm, strict-base-types, temporary
149646− , text, time, transformers, unix, unordered-containers, vector
149647− , yaml
149648− }:
149649− mkDerivation {
149650− pname = "language-puppet";
149651− version = "1.4.6.1";
149652− sha256 = "0w1ffflnzlcwfc4zhn1zlrdhapdniy67wy0z2pa6qgkvxv52rlxd";
149653− isLibrary = true;
149654− isExecutable = true;
149655− enableSeparateDataOutput = true;
149656− libraryHaskellDepends = [
149657− aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
149658− case-insensitive containers cryptonite directory filecache filepath
149659− formatting hashable hruby hslogger http-api-data http-client lens
149660− lens-aeson megaparsec memory mtl operational parsec
149661− parser-combinators pcre-utils protolude random regex-pcre-builtin
149662− scientific servant servant-client split stm strict-base-types text
149663− time transformers unix unordered-containers vector yaml
149664− ];
149665− executableHaskellDepends = [
149666− aeson ansi-wl-pprint async base bytestring containers Glob hslogger
149667− http-client lens mtl optparse-applicative regex-pcre-builtin
149668− strict-base-types text transformers unordered-containers vector
149669− yaml
149670− ];
149671− testHaskellDepends = [
149672− base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
149673− pcre-utils scientific strict-base-types temporary text transformers
149674− unordered-containers vector
149675− ];
149676− description = "Tools to parse and evaluate the Puppet DSL";
149677− license = stdenv.lib.licenses.bsd3;
149678− }) {};
149679−
149680− "language-puppet_1_4_6_2" = callPackage
149681149561 ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
149682149562 , base16-bytestring, bytestring, case-insensitive, containers
149683149563 , cryptonite, directory, filecache, filepath, formatting, Glob
@@ -149718,7 +149598,6 @@ self: {
149718149598 ];
149719149599 description = "Tools to parse and evaluate the Puppet DSL";
149720149600 license = stdenv.lib.licenses.bsd3;
149721− hydraPlatforms = stdenv.lib.platforms.none;
149722149601 }) {};
149723149602
149724149603 "language-python" = callPackage
@@ -149985,6 +149864,17 @@ self: {
149985149864 broken = true;
149986149865 }) {};
149987149866
149867+ "laop" = callPackage
149868+ ({ mkDerivation, base, deepseq }:
149869+ mkDerivation {
149870+ pname = "laop";
149871+ version = "0.1.0.3";
149872+ sha256 = "0fhn7gl2mfm14bmqvay8wrzqcszgnh94byxr065hsxy2zq6kmyc6";
149873+ libraryHaskellDepends = [ base deepseq ];
149874+ testHaskellDepends = [ base deepseq ];
149875+ license = stdenv.lib.licenses.bsd3;
149876+ }) {};
149877+
149988149878 "lapack" = callPackage
149989149879 ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms
149990149880 , comfort-array, data-ref, deepseq, fixed-length
@@ -151334,29 +151224,29 @@ self: {
151334151224 license = stdenv.lib.licenses.bsd2;
151335151225 }) {};
151336151226
151337− "lens_4_18_1" = callPackage
151338− ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
151339− , Cabal, cabal-doctest, call-stack, comonad, containers
151227+ "lens_4_19" = callPackage
151228+ ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
151229+ , bytestring, Cabal, cabal-doctest, call-stack, comonad, containers
151340151230 , contravariant, criterion, deepseq, directory, distributive
151341151231 , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
151342151232 , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
151343151233 , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
151344151234 , tagged, template-haskell, test-framework, test-framework-hunit
151345151235 , test-framework-quickcheck2, test-framework-th, text
151346− , th-abstraction, transformers, transformers-compat, type-equality
151236+ , th-abstraction, transformers, transformers-compat
151347151237 , unordered-containers, vector
151348151238 }:
151349151239 mkDerivation {
151350151240 pname = "lens";
151351− version = "4.18.1";
151352− sha256 = "1lmxjaj32v06l12gy00rpjp2lk1cblh3k7kwklk655ss2vas61ri";
151241+ version = "4.19";
151242+ sha256 = "1696835nvzfgvkwrhka2lmjbq08dhkqpcp9iqj5ws7bws7ja3xaf";
151353151243 setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
151354151244 libraryHaskellDepends = [
151355151245 array base base-orphans bifunctors bytestring call-stack comonad
151356151246 containers contravariant distributive exceptions filepath free
151357151247 ghc-prim hashable kan-extensions mtl parallel profunctors
151358151248 reflection semigroupoids tagged template-haskell text
151359− th-abstraction transformers transformers-compat type-equality
151249+ th-abstraction transformers transformers-compat
151360151250 unordered-containers vector
151361151251 ];
151362151252 testHaskellDepends = [
@@ -151367,7 +151257,7 @@ self: {
151367151257 unordered-containers vector
151368151258 ];
151369151259 benchmarkHaskellDepends = [
151370− base bytestring comonad containers criterion deepseq
151260+ base base-compat bytestring comonad containers criterion deepseq
151371151261 generic-deriving transformers unordered-containers vector
151372151262 ];
151373151263 description = "Lenses, Folds and Traversals";
@@ -151488,6 +151378,17 @@ self: {
151488151378 broken = true;
151489151379 }) {};
151490151380
151381+ "lens-csv" = callPackage
151382+ ({ mkDerivation, base, bytestring, cassava, lens }:
151383+ mkDerivation {
151384+ pname = "lens-csv";
151385+ version = "0.1.0.0";
151386+ sha256 = "1sfglf9g6ac14f85bjabbmvjijrd76asm8kzbrlvkzvv7bhiw8sk";
151387+ libraryHaskellDepends = [ base bytestring cassava lens ];
151388+ testHaskellDepends = [ base bytestring cassava lens ];
151389+ license = stdenv.lib.licenses.bsd3;
151390+ }) {};
151391+
151491151392 "lens-datetime" = callPackage
151492151393 ({ mkDerivation, base, lens, time }:
151493151394 mkDerivation {
@@ -152693,28 +152594,6 @@ self: {
152693152594 }) {};
152694152595
152695152596 "libmpd" = callPackage
152696− ({ mkDerivation, attoparsec, base, bytestring, containers
152697− , data-default-class, filepath, hspec, mtl, network, old-locale
152698− , QuickCheck, safe-exceptions, text, time, unix, utf8-string
152699− }:
152700− mkDerivation {
152701− pname = "libmpd";
152702− version = "0.9.0.10";
152703− sha256 = "0vy287mn1vk8kvij5i3hc0p02l886cpsq5dds7kl6g520si3abkb";
152704− libraryHaskellDepends = [
152705− attoparsec base bytestring containers data-default-class filepath
152706− mtl network old-locale safe-exceptions text time utf8-string
152707− ];
152708− testHaskellDepends = [
152709− attoparsec base bytestring containers data-default-class filepath
152710− hspec mtl network old-locale QuickCheck safe-exceptions text time
152711− unix utf8-string
152712− ];
152713− description = "An MPD client library";
152714− license = stdenv.lib.licenses.mit;
152715− }) {};
152716−
152717− "libmpd_0_9_1_0" = callPackage
152718152597 ({ mkDerivation, attoparsec, base, bytestring, containers
152719152598 , data-default-class, filepath, hspec, mtl, network, old-locale
152720152599 , QuickCheck, safe-exceptions, text, time, unix, utf8-string
@@ -152734,7 +152613,6 @@ self: {
152734152613 ];
152735152614 description = "An MPD client library";
152736152615 license = stdenv.lib.licenses.mit;
152737− hydraPlatforms = stdenv.lib.platforms.none;
152738152616 }) {};
152739152617
152740152618 "libnix" = callPackage
@@ -153226,8 +153104,8 @@ self: {
153226153104 ({ mkDerivation, base, bytestring, conduit, resourcet }:
153227153105 mkDerivation {
153228153106 pname = "libyaml";
153229− version = "0.1.1.1";
153230− sha256 = "0qjq0w8gqzzg3lf53mg9avkdd6z609kaacyyzjz0rbjjks4gl1db";
153107+ version = "0.1.2";
153108+ sha256 = "1dcpbsjg6n305l07isxmavgp01lbv1qggy16acjyxjlz35pxchlg";
153231153109 libraryHaskellDepends = [ base bytestring conduit resourcet ];
153232153110 description = "Low-level, streaming YAML interface";
153233153111 license = stdenv.lib.licenses.bsd3;
@@ -153558,25 +153436,31 @@ self: {
153558153436
153559153437 "lightstep-haskell" = callPackage
153560153438 ({ mkDerivation, async, base, bytestring, chronos, containers
153561− , http-types, http2-client, http2-client-grpc
153439+ , deepseq, hashable, http-types, http2-client, http2-client-grpc
153562153440 , http2-grpc-proto-lens, lens, mtl, proto-lens
153563153441 , proto-lens-protobuf-types, proto-lens-runtime, random
153564− , safe-exceptions, stm, text, transformers, unordered-containers
153565− , wai
153442+ , safe-exceptions, stm, tasty, tasty-discover, tasty-hunit
153443+ , tasty-quickcheck, text, transformers, unordered-containers, wai
153566153444 }:
153567153445 mkDerivation {
153568153446 pname = "lightstep-haskell";
153569− version = "0.5.2";
153570− sha256 = "0j4dlvw4hhbawwfaxfqmh2bmhqha7902rainvbwi1xw2v73pqwdg";
153447+ version = "0.6.1";
153448+ sha256 = "0c3z44wnx67k7n7gw8zs35g79al76fbjk6z20fpvjhmk49gsaspk";
153571153449 isLibrary = true;
153572153450 isExecutable = true;
153573153451 libraryHaskellDepends = [
153574− async base bytestring chronos containers http-types http2-client
153575− http2-client-grpc http2-grpc-proto-lens lens mtl proto-lens
153576− proto-lens-protobuf-types proto-lens-runtime random safe-exceptions
153577− stm text transformers unordered-containers wai
153452+ async base bytestring chronos containers hashable http-types
153453+ http2-client http2-client-grpc http2-grpc-proto-lens lens mtl
153454+ proto-lens proto-lens-protobuf-types proto-lens-runtime random
153455+ safe-exceptions stm text transformers unordered-containers wai
153578153456 ];
153579153457 executableHaskellDepends = [ async base text ];
153458+ testHaskellDepends = [
153459+ base deepseq lens proto-lens proto-lens-protobuf-types
153460+ proto-lens-runtime tasty tasty-discover tasty-hunit
153461+ tasty-quickcheck
153462+ ];
153463+ testToolDepends = [ tasty-discover ];
153580153464 description = "LightStep OpenTracing client library";
153581153465 license = stdenv.lib.licenses.asl20;
153582153466 hydraPlatforms = stdenv.lib.platforms.none;
@@ -153763,35 +153647,33 @@ self: {
153763153647
153764153648 "line-bot-sdk" = callPackage
153765153649 ({ mkDerivation, aeson, aeson-qq, base, base64-bytestring
153766− , bytestring, cryptohash-sha256, errors, exceptions, free, hspec
153650+ , bytestring, cryptohash-sha256, deepseq, free, hspec
153767153651 , hspec-expectations, hspec-wai, http-api-data, http-client
153768− , http-client-tls, http-types, monad-control, mtl, scientific
153769− , servant, servant-client, servant-client-core, servant-server
153770− , streaming, string-conversions, text, time, transformers
153771− , transformers-base, wai, wai-extra, warp
153652+ , http-client-tls, http-media, http-types, mtl, scientific, servant
153653+ , servant-client, servant-client-core, servant-server
153654+ , string-conversions, text, time, transformers, wai, wai-extra
153655+ , warp
153772153656 }:
153773153657 mkDerivation {
153774153658 pname = "line-bot-sdk";
153775− version = "0.5.0.2";
153776− sha256 = "0b33z5h22mbzxa812phpi73nmilzyvdslh355802wv625br3ljq5";
153659+ version = "0.5.2";
153660+ sha256 = "1vrfq9v8lv5nwdmy7n99p7dnm10b35ng5n24ncjq54i0ci2ldi75";
153777153661 isLibrary = true;
153778153662 isExecutable = true;
153779153663 libraryHaskellDepends = [
153780− aeson base base64-bytestring bytestring cryptohash-sha256 errors
153781− exceptions http-api-data http-client http-client-tls http-types
153782− monad-control mtl scientific servant servant-client
153783− servant-client-core servant-server streaming string-conversions
153784− text time transformers transformers-base wai wai-extra
153664+ aeson base base64-bytestring bytestring cryptohash-sha256 deepseq
153665+ http-api-data http-client http-client-tls http-media http-types mtl
153666+ scientific servant servant-client servant-client-core
153667+ servant-server string-conversions text time transformers wai
153785153668 ];
153786153669 executableHaskellDepends = [
153787− base servant servant-client servant-server time transformers wai
153788− wai-extra warp
153670+ base servant servant-server transformers wai wai-extra warp
153789153671 ];
153790153672 testHaskellDepends = [
153791153673 aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256
153792− free hspec hspec-expectations hspec-wai http-client http-types
153793− servant servant-client servant-client-core servant-server text time
153794− transformers wai warp
153674+ deepseq free hspec hspec-expectations hspec-wai http-client
153675+ http-types servant servant-client servant-client-core
153676+ servant-server text time transformers wai warp
153795153677 ];
153796153678 description = "Haskell SDK for LINE Messaging API";
153797153679 license = stdenv.lib.licenses.bsd3;
@@ -153881,6 +153763,35 @@ self: {
153881153763 license = stdenv.lib.licenses.bsd3;
153882153764 }) {};
153883153765
153766+ "linear_1_21" = callPackage
153767+ ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
153768+ , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq
153769+ , distributive, doctest, ghc-prim, hashable, HUnit, lens, random
153770+ , reflection, semigroupoids, semigroups, simple-reflect, tagged
153771+ , template-haskell, test-framework, test-framework-hunit
153772+ , transformers, transformers-compat, unordered-containers, vector
153773+ , void
153774+ }:
153775+ mkDerivation {
153776+ pname = "linear";
153777+ version = "1.21";
153778+ sha256 = "1i00j740fpxrbdy1kjzwjxqixk975rd0dh6jxk0da622spabym5a";
153779+ setupHaskellDepends = [ base Cabal cabal-doctest ];
153780+ libraryHaskellDepends = [
153781+ adjunctions base base-orphans binary bytes cereal containers
153782+ deepseq distributive ghc-prim hashable lens random reflection
153783+ semigroupoids semigroups tagged template-haskell transformers
153784+ transformers-compat unordered-containers vector void
153785+ ];
153786+ testHaskellDepends = [
153787+ base binary bytestring deepseq doctest HUnit lens reflection
153788+ simple-reflect test-framework test-framework-hunit vector
153789+ ];
153790+ description = "Linear Algebra";
153791+ license = stdenv.lib.licenses.bsd3;
153792+ hydraPlatforms = stdenv.lib.platforms.none;
153793+ }) {};
153794+
153884153795 "linear-accelerate" = callPackage
153885153796 ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
153886153797 , distributive, doctest, lens, linear
@@ -156429,8 +156340,8 @@ self: {
156429156340 }:
156430156341 mkDerivation {
156431156342 pname = "log-elasticsearch";
156432− version = "0.10.1.0";
156433− sha256 = "10a7p0z9bqjfmc04xvqsflwqrhhnxk72kbhk62sh8l1is0i94vcs";
156343+ version = "0.10.2.0";
156344+ sha256 = "0kcixyklnak34v8vmmpw8vpm1mvf3wll6xpcdvfg1c75wc9n1hqy";
156434156345 libraryHaskellDepends = [
156435156346 aeson aeson-pretty base base64-bytestring bloodhound bytestring
156436156347 deepseq http-client http-client-tls log-base semigroups text
@@ -156542,29 +156453,30 @@ self: {
156542156453 }) {};
156543156454
156544156455 "log4hs" = callPackage
156545− ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers
156546− , criterion, data-default, directory, filepath, generic-lens, hspec
156547− , hspec-core, lens, mtl, process, QuickCheck, template-haskell
156456+ ({ mkDerivation, aeson, aeson-default, aeson-qq, base, bytestring
156457+ , containers, criterion, directory, filepath, generic-lens, hspec
156458+ , hspec-core, microlens, mtl, process, QuickCheck, template-haskell
156548156459 , text, time, vformat, vformat-aeson, vformat-time, yaml
156549156460 }:
156550156461 mkDerivation {
156551156462 pname = "log4hs";
156552− version = "0.8.0.0";
156553− sha256 = "15a3xz9bg29ci4yfxmn7dhnblz48cf7ijl27fvqgr8j4b3m8z4hn";
156463+ version = "0.9.0.0";
156464+ sha256 = "0hr6qm721jlpz6f45rb1d6wh4y5gk0n94a0l9wflwz6vnr77147x";
156554156465 libraryHaskellDepends = [
156555− aeson base bytestring containers data-default directory filepath
156556− generic-lens lens mtl template-haskell text time vformat
156466+ aeson aeson-default base bytestring containers directory filepath
156467+ generic-lens microlens mtl template-haskell text time vformat
156557156468 vformat-aeson vformat-time yaml
156558156469 ];
156559156470 testHaskellDepends = [
156560− aeson aeson-qq base bytestring containers data-default directory
156561− filepath generic-lens hspec hspec-core lens mtl process QuickCheck
156562− template-haskell text time vformat vformat-aeson vformat-time yaml
156471+ aeson aeson-default aeson-qq base bytestring containers directory
156472+ filepath generic-lens hspec hspec-core microlens mtl process
156473+ QuickCheck template-haskell text time vformat vformat-aeson
156474+ vformat-time yaml
156563156475 ];
156564156476 benchmarkHaskellDepends = [
156565− aeson aeson-qq base bytestring containers criterion data-default
156566− directory filepath generic-lens lens mtl template-haskell text time
156567− vformat vformat-aeson vformat-time yaml
156477+ aeson aeson-default aeson-qq base bytestring containers criterion
156478+ directory filepath generic-lens microlens mtl template-haskell text
156479+ time vformat vformat-aeson vformat-time yaml
156568156480 ];
156569156481 description = "A python logging style log library";
156570156482 license = stdenv.lib.licenses.bsd3;
@@ -156658,29 +156570,6 @@ self: {
156658156570 }) {};
156659156571
156660156572 "logging-effect" = callPackage
156661− ({ mkDerivation, async, base, bytestring, criterion, exceptions
156662− , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
156663− , prettyprinter, semigroups, stm, stm-delay, text, time
156664− , transformers, transformers-base, unliftio-core
156665− }:
156666− mkDerivation {
156667− pname = "logging-effect";
156668− version = "1.3.8";
156669− sha256 = "0ksavyvcz0c9fadik9yksm4zskzh313srf3713migwrdza5ci5q3";
156670− libraryHaskellDepends = [
156671− async base exceptions free monad-control mtl prettyprinter
156672− semigroups stm stm-delay text time transformers transformers-base
156673− unliftio-core
156674− ];
156675− benchmarkHaskellDepends = [
156676− base bytestring criterion fast-logger lifted-async monad-logger
156677− prettyprinter text time
156678− ];
156679− description = "A mtl-style monad transformer for general purpose & compositional logging";
156680− license = stdenv.lib.licenses.bsd3;
156681− }) {};
156682−
156683− "logging-effect_1_3_9" = callPackage
156684156573 ({ mkDerivation, async, base, bytestring, criterion, exceptions
156685156574 , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
156686156575 , prettyprinter, semigroups, stm, stm-delay, text, time
@@ -156701,7 +156590,6 @@ self: {
156701156590 ];
156702156591 description = "A mtl-style monad transformer for general purpose & compositional logging";
156703156592 license = stdenv.lib.licenses.bsd3;
156704− hydraPlatforms = stdenv.lib.platforms.none;
156705156593 }) {};
156706156594
156707156595 "logging-effect-extra" = callPackage
@@ -157656,7 +157544,7 @@ self: {
157656157544 license = stdenv.lib.licenses.bsd3;
157657157545 }) {};
157658157546
157659− "lsp-test_0_10_0_0" = callPackage
157547+ "lsp-test_0_10_1_0" = callPackage
157660157548 ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
157661157549 , bytestring, conduit, conduit-parse, containers, data-default
157662157550 , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
@@ -157665,8 +157553,8 @@ self: {
157665157553 }:
157666157554 mkDerivation {
157667157555 pname = "lsp-test";
157668− version = "0.10.0.0";
157669− sha256 = "0fs4zq5xz42jp2x42p8nbswahfb5g0mmdwbrc8i65nx81q6fpxjg";
157556+ version = "0.10.1.0";
157557+ sha256 = "1f1ab7gn5bgdlhlayrrrhk6d8iyf971pia6hb23jjyqz9j0vl7ac";
157670157558 libraryHaskellDepends = [
157671157559 aeson aeson-pretty ansi-terminal async base bytestring conduit
157672157560 conduit-parse containers data-default Diff directory filepath
@@ -158318,6 +158206,8 @@ self: {
158318158206 ];
158319158207 description = "Bindings to LZ4";
158320158208 license = stdenv.lib.licenses.bsd3;
158209+ hydraPlatforms = stdenv.lib.platforms.none;
158210+ broken = true;
158321158211 }) {};
158322158212
158323158213 "lz4-conduit" = callPackage
@@ -158358,15 +158248,17 @@ self: {
158358158248
158359158249 "lzlib" = callPackage
158360158250 ({ mkDerivation, base, bytestring, c2hs, criterion, directory
158361− , filepath, hspec, temporary
158251+ , filepath, hspec, pathological-bytestrings, temporary
158362158252 }:
158363158253 mkDerivation {
158364158254 pname = "lzlib";
158365− version = "0.3.3.0";
158366− sha256 = "140m7rivdrak5vcg473gp3ns54xy47k2xyv5z86z2s0ncf204ak6";
158255+ version = "1.0.1.0";
158256+ sha256 = "0zajkhck36p4fgy40rsd2zsd3ja7i9fkizwix38xpwdi1ygrfjxf";
158367158257 libraryHaskellDepends = [ base bytestring ];
158368158258 libraryToolDepends = [ c2hs ];
158369− testHaskellDepends = [ base bytestring directory hspec ];
158259+ testHaskellDepends = [
158260+ base bytestring directory hspec pathological-bytestrings
158261+ ];
158370158262 benchmarkHaskellDepends = [
158371158263 base bytestring criterion filepath temporary
158372158264 ];
@@ -159133,8 +159025,8 @@ self: {
159133159025 }:
159134159026 mkDerivation {
159135159027 pname = "mailbox-count";
159136− version = "0.0.2";
159137− sha256 = "1zd3vd0sj4pq8nhjn768rpfyn9a06a9c3j2fnhxsb9d800ilpvvf";
159028+ version = "0.0.5";
159029+ sha256 = "0g1kbb4pmh1vs8ddswpcmqb9fhfkhlffwp9y7r4dq5wcsdihwm8c";
159138159030 isLibrary = false;
159139159031 isExecutable = true;
159140159032 executableHaskellDepends = [
@@ -159147,7 +159039,7 @@ self: {
159147159039 tasty-hunit
159148159040 ];
159149159041 description = "Count mailboxes in a SQL database";
159150− license = stdenv.lib.licenses.gpl3;
159042+ license = stdenv.lib.licenses.agpl3;
159151159043 hydraPlatforms = stdenv.lib.platforms.none;
159152159044 broken = true;
159153159045 }) {};
@@ -160054,14 +159946,14 @@ self: {
160054159946 }) {};
160055159947
160056159948 "mapalgebra" = callPackage
160057− ({ mkDerivation, base, bytestring, containers, criterion, deepseq
160058− , hmatrix, HUnit-approx, massiv, massiv-io, QuickCheck, tasty
160059− , tasty-hunit, tasty-quickcheck, vector
159949+ ({ mkDerivation, base, bytestring, containers, deepseq, hmatrix
159950+ , HUnit-approx, massiv, massiv-io, QuickCheck, tasty, tasty-hunit
159951+ , tasty-quickcheck, vector
160060159952 }:
160061159953 mkDerivation {
160062159954 pname = "mapalgebra";
160063− version = "0.2.0";
160064− sha256 = "1bz4dg7wh66zpghsdb7d7hdqj5413005m3mcfb73gl7xncf21mk5";
159955+ version = "0.2.1";
159956+ sha256 = "0ymcbq3mb46qx61zl0yfvbk65lx1cqhshnpwsf8cnwysv3b38vhl";
160065159957 libraryHaskellDepends = [
160066159958 base bytestring containers deepseq hmatrix massiv massiv-io vector
160067159959 ];
@@ -160069,9 +159961,6 @@ self: {
160069159961 base containers hmatrix HUnit-approx massiv QuickCheck tasty
160070159962 tasty-hunit tasty-quickcheck vector
160071159963 ];
160072− benchmarkHaskellDepends = [
160073− base criterion hmatrix massiv massiv-io vector
160074− ];
160075159964 description = "Efficient, polymorphic Map Algebra";
160076159965 license = stdenv.lib.licenses.bsd3;
160077159966 hydraPlatforms = stdenv.lib.platforms.none;
@@ -160651,6 +160540,31 @@ self: {
160651160540 broken = true;
160652160541 }) {};
160653160542
160543+ "massiv-io_0_2_0_0" = callPackage
160544+ ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
160545+ , data-default-class, deepseq, doctest, exceptions, filepath, hspec
160546+ , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
160547+ , template-haskell, unliftio, vector
160548+ }:
160549+ mkDerivation {
160550+ pname = "massiv-io";
160551+ version = "0.2.0.0";
160552+ sha256 = "1gypn2srqsnzmx1jd28632w34n7z4x5wadi4m7srxdhwk14vqg2m";
160553+ setupHaskellDepends = [ base Cabal cabal-doctest ];
160554+ libraryHaskellDepends = [
160555+ base bytestring Color data-default-class deepseq exceptions
160556+ filepath JuicyPixels massiv netpbm unliftio vector
160557+ ];
160558+ testHaskellDepends = [
160559+ base bytestring doctest hspec JuicyPixels massiv massiv-test
160560+ QuickCheck random template-haskell
160561+ ];
160562+ description = "Import/export of Image files into massiv Arrays";
160563+ license = stdenv.lib.licenses.bsd3;
160564+ hydraPlatforms = stdenv.lib.platforms.none;
160565+ broken = true;
160566+ }) {};
160567+
160654160568 "massiv-scheduler" = callPackage
160655160569 ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
160656160570 , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell
@@ -167350,7 +167264,7 @@ self: {
167350167264 license = stdenv.lib.licenses.asl20;
167351167265 }) {};
167352167266
167353− "mongoDB_2_6_0_0" = callPackage
167267+ "mongoDB_2_6_0_1" = callPackage
167354167268 ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
167355167269 , binary, bson, bytestring, conduit, conduit-extra, containers
167356167270 , criterion, cryptohash, data-default-class, dns, fail, hashtables
@@ -167361,8 +167275,8 @@ self: {
167361167275 }:
167362167276 mkDerivation {
167363167277 pname = "mongoDB";
167364− version = "2.6.0.0";
167365− sha256 = "14vf47ss02hf50fd3db48jiqhw51q6fpg7ps03kx45ab1cc527kn";
167278+ version = "2.6.0.1";
167279+ sha256 = "1kradm8baaqwp4zniy9ga3a3vwqc2gcz21z0559ffja7y4d757my";
167366167280 libraryHaskellDepends = [
167367167281 array base base16-bytestring base64-bytestring binary bson
167368167282 bytestring conduit conduit-extra containers cryptohash
@@ -170507,18 +170421,18 @@ self: {
170507170421
170508170422 "musicScroll" = callPackage
170509170423 ({ mkDerivation, async, base, bytestring, containers, dbus, gi-gtk
170510− , gi-gtk-hs, gtk3, req, stm, tagsoup, text
170424+ , gi-gtk-hs, gtk3, mtl, req, stm, tagsoup, text, transformers
170511170425 }:
170512170426 mkDerivation {
170513170427 pname = "musicScroll";
170514− version = "0.1.1.0";
170515− sha256 = "0f1i3ys1pfylb5igqwkap0k7v47a2c5vfnhc2flxw9h6aim8yh6h";
170428+ version = "0.1.2.0";
170429+ sha256 = "0n0s9vkhfwykghniillih5qgdz4cg1rn4vn86hinxaqfgzv6m96w";
170516170430 isLibrary = true;
170517170431 isExecutable = true;
170518170432 enableSeparateDataOutput = true;
170519170433 libraryHaskellDepends = [
170520− async base bytestring containers dbus gi-gtk gi-gtk-hs req stm
170521− tagsoup text
170434+ async base bytestring containers dbus gi-gtk gi-gtk-hs mtl req stm
170435+ tagsoup text transformers
170522170436 ];
170523170437 executableHaskellDepends = [ base ];
170524170438 executablePkgconfigDepends = [ gtk3 ];
@@ -172376,19 +172290,40 @@ self: {
172376172290 }) {};
172377172291
172378172292 "neat-interpolation" = callPackage
172379− ({ mkDerivation, base, base-prelude, HTF, megaparsec
172380− , template-haskell, text
172293+ ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
172294+ , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
172295+ , text
172381172296 }:
172382172297 mkDerivation {
172383172298 pname = "neat-interpolation";
172384− version = "0.3.2.5";
172385− sha256 = "09nb0bypjpfxcm71012c2xxfrq5drvd1nhdmnmhk8wc0r8254g8c";
172386− libraryHaskellDepends = [
172387− base base-prelude megaparsec template-haskell text
172299+ version = "0.3.2.6";
172300+ sha256 = "10k5x47i84nycl54p61l8v1bpvi7mw663vnj8nn1qjpn03anz8z2";
172301+ libraryHaskellDepends = [ base megaparsec template-haskell text ];
172302+ testHaskellDepends = [
172303+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
172304+ tasty-quickcheck
172305+ ];
172306+ description = "A quasiquoter for neat and simple multiline text interpolation";
172307+ license = stdenv.lib.licenses.mit;
172308+ }) {};
172309+
172310+ "neat-interpolation_0_5_1" = callPackage
172311+ ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
172312+ , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
172313+ , text
172314+ }:
172315+ mkDerivation {
172316+ pname = "neat-interpolation";
172317+ version = "0.5.1";
172318+ sha256 = "0hfyd74f83mxakahgj6q3wy2r1yg1zbsw1750k7zmwaqn3f8gzjz";
172319+ libraryHaskellDepends = [ base megaparsec template-haskell text ];
172320+ testHaskellDepends = [
172321+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
172322+ tasty-quickcheck
172388172323 ];
172389− testHaskellDepends = [ base-prelude HTF ];
172390172324 description = "A quasiquoter for neat and simple multiline text interpolation";
172391172325 license = stdenv.lib.licenses.mit;
172326+ hydraPlatforms = stdenv.lib.platforms.none;
172392172327 }) {};
172393172328
172394172329 "needle" = callPackage
@@ -173648,6 +173583,19 @@ self: {
173648173583 license = stdenv.lib.licenses.bsd3;
173649173584 }) {};
173650173585
173586+ "network-byte-order_0_1_4_0" = callPackage
173587+ ({ mkDerivation, base, bytestring, doctest }:
173588+ mkDerivation {
173589+ pname = "network-byte-order";
173590+ version = "0.1.4.0";
173591+ sha256 = "1wm59kdvxcjhsl1y1ajmj8w8nq6qdvin6933n374za39lhkb13f9";
173592+ libraryHaskellDepends = [ base bytestring ];
173593+ testHaskellDepends = [ base bytestring doctest ];
173594+ description = "Network byte order utilities";
173595+ license = stdenv.lib.licenses.bsd3;
173596+ hydraPlatforms = stdenv.lib.platforms.none;
173597+ }) {};
173598+
173651173599 "network-bytestring" = callPackage
173652173600 ({ mkDerivation, base, bytestring, network, unix }:
173653173601 mkDerivation {
@@ -174433,33 +174381,14 @@ self: {
174433174381 }) {};
174434174382
174435174383 "network-uri" = callPackage
174436− ({ mkDerivation, base, deepseq, HUnit, parsec, test-framework
174437− , test-framework-hunit, test-framework-quickcheck2
174438− }:
174439− mkDerivation {
174440− pname = "network-uri";
174441− version = "2.6.1.0";
174442− sha256 = "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2";
174443− revision = "1";
174444− editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32";
174445− libraryHaskellDepends = [ base deepseq parsec ];
174446− testHaskellDepends = [
174447− base HUnit test-framework test-framework-hunit
174448− test-framework-quickcheck2
174449− ];
174450− description = "URI manipulation";
174451− license = stdenv.lib.licenses.bsd3;
174452− }) {};
174453−
174454− "network-uri_2_7_0_0" = callPackage
174455174384 ({ mkDerivation, base, criterion, deepseq, HUnit, parsec
174456174385 , template-haskell, test-framework, test-framework-hunit
174457174386 , test-framework-quickcheck2
174458174387 }:
174459174388 mkDerivation {
174460174389 pname = "network-uri";
174461− version = "2.7.0.0";
174462− sha256 = "0sgqw1bi6dv28a3cw2kjxiy1sfjjfwdk5ikmnk1v828inlk7zwgz";
174390+ version = "2.6.2.0";
174391+ sha256 = "0fmjc4p6pnzjxyg32pp7xh4wdbpqzp0rya80mccixyracvs1q3nw";
174463174392 libraryHaskellDepends = [ base deepseq parsec template-haskell ];
174464174393 testHaskellDepends = [
174465174394 base criterion deepseq HUnit test-framework test-framework-hunit
@@ -174467,7 +174396,6 @@ self: {
174467174396 ];
174468174397 description = "URI manipulation";
174469174398 license = stdenv.lib.licenses.bsd3;
174470− hydraPlatforms = stdenv.lib.platforms.none;
174471174399 }) {};
174472174400
174473174401 "network-uri-flag" = callPackage
@@ -175270,8 +175198,8 @@ self: {
175270175198 }:
175271175199 mkDerivation {
175272175200 pname = "niv";
175273− version = "0.2.12";
175274− sha256 = "0lbkc49ddkxb6x3miimcd2c4ajwf7d9z0hay54n0gmz7d92ha8q0";
175201+ version = "0.2.13";
175202+ sha256 = "11znn37j15gzwg6nh6z4k5ijxyyc7gbirnrwlhh4b8868d9axjfy";
175275175203 isLibrary = true;
175276175204 isExecutable = true;
175277175205 enableSeparateDataOutput = true;
@@ -175282,6 +175210,12 @@ self: {
175282175210 unliftio unordered-containers
175283175211 ];
175284175212 executableHaskellDepends = [
175213+ aeson aeson-pretty ansi-terminal base bytestring directory
175214+ file-embed filepath hashable http-conduit mtl optparse-applicative
175215+ process profunctors pureMD5 string-qq text unliftio
175216+ unordered-containers
175217+ ];
175218+ testHaskellDepends = [
175285175219 aeson aeson-pretty ansi-terminal base bytestring directory
175286175220 file-embed filepath hashable http-conduit mtl optparse-applicative
175287175221 process profunctors pureMD5 string-qq tasty text unliftio
@@ -175357,8 +175291,8 @@ self: {
175357175291 }:
175358175292 mkDerivation {
175359175293 pname = "nix-diff";
175360− version = "1.0.7";
175361− sha256 = "0zf09wffmzkk6rbk5nx4qhygpb6m492mz422w9a71dzv1icxkbfs";
175294+ version = "1.0.8";
175295+ sha256 = "0073802yrd5f1zfhnbsll9cqcycihw9bac1psfwvcwvihsh3j413";
175362175296 isLibrary = false;
175363175297 isExecutable = true;
175364175298 executableHaskellDepends = [
@@ -177069,6 +177003,18 @@ self: {
177069177003 license = stdenv.lib.licenses.bsd3;
177070177004 }) {};
177071177005
177006+ "numhask_0_4_0" = callPackage
177007+ ({ mkDerivation, base }:
177008+ mkDerivation {
177009+ pname = "numhask";
177010+ version = "0.4.0";
177011+ sha256 = "1wwhpsrbnaa0nmb9x31wnk66dbvajd54mflvbnifff2dkaha89x1";
177012+ libraryHaskellDepends = [ base ];
177013+ description = "numeric classes";
177014+ license = stdenv.lib.licenses.bsd3;
177015+ hydraPlatforms = stdenv.lib.platforms.none;
177016+ }) {};
177017+
177072177018 "numhask-array" = callPackage
177073177019 ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest
177074177020 , hedgehog, hmatrix, numhask, numhask-hedgehog, numhask-prelude
@@ -177076,8 +177022,8 @@ self: {
177076177022 }:
177077177023 mkDerivation {
177078177024 pname = "numhask-array";
177079− version = "0.5.0.0";
177080− sha256 = "0gx2p7b7xb1x5nfp5szdvsbylqsci9bmmz5jmy86c4z13srxmkkq";
177025+ version = "0.5.1";
177026+ sha256 = "1nrk6j4kw0l09b8f7k3sx47ri6i1vy5qygl9zbhhdz8z75s0fzn8";
177081177027 libraryHaskellDepends = [
177082177028 adjunctions base deepseq distributive hmatrix numhask
177083177029 numhask-prelude protolude vector
@@ -177097,8 +177043,8 @@ self: {
177097177043 }:
177098177044 mkDerivation {
177099177045 pname = "numhask-hedgehog";
177100− version = "0.3.1";
177101− sha256 = "1glg0lapr0fm06z5s8k4xsi99yx3khay4ynvic3kb1xf0iqay818";
177046+ version = "0.3.2";
177047+ sha256 = "1cfvkq5v88d8zhkj8bgn18hmlg52nsprvrmyan9ndxppyzljphan";
177102177048 libraryHaskellDepends = [
177103177049 base hedgehog numhask numhask-prelude numhask-space
177104177050 ];
@@ -177131,8 +177077,8 @@ self: {
177131177077 ({ mkDerivation, base, doctest, numhask, protolude }:
177132177078 mkDerivation {
177133177079 pname = "numhask-prelude";
177134− version = "0.3.2";
177135− sha256 = "1884pm13wyhqwwl9n2k9wv7r7q86x4c682m78291sh6yinrymazk";
177080+ version = "0.3.3";
177081+ sha256 = "0r9qf3yrm0lf1jhiyhvgsfc8zyfsllc8xmjwdqx2vsn9vy15p7aw";
177136177082 libraryHaskellDepends = [ base numhask protolude ];
177137177083 testHaskellDepends = [ doctest ];
177138177084 description = "A numeric prelude";
@@ -177299,6 +177245,8 @@ self: {
177299177245 pname = "nvim-hs";
177300177246 version = "2.1.0.2";
177301177247 sha256 = "0amlvrh213n9cfqax5gcy7zq3fd8q9hcskhjkbayvzsyf5hhr1rn";
177248+ revision = "1";
177249+ editedCabalFile = "1v52rmk7hbdn40964r50jjz3lanfc5q8xrdqpv1wmwviw3j4rip8";
177302177250 libraryHaskellDepends = [
177303177251 base bytestring cereal cereal-conduit conduit containers
177304177252 data-default deepseq foreign-store hslogger megaparsec messagepack
@@ -179312,19 +179260,21 @@ self: {
179312179260 }) {};
179313179261
179314179262 "opentelemetry" = callPackage
179315− ({ mkDerivation, async, base, clock, exceptions, hashable, random
179316− , tasty, tasty-discover, tasty-quickcheck, text
179317− , unordered-containers
179263+ ({ mkDerivation, async, attoparsec, base, bytestring, clock
179264+ , exceptions, hashable, random, tasty, tasty-discover, tasty-hunit
179265+ , tasty-quickcheck, text, unordered-containers
179318179266 }:
179319179267 mkDerivation {
179320179268 pname = "opentelemetry";
179321− version = "0.0.0.0";
179322− sha256 = "14k1lskdan3p7pddch9h0vr56ksyb4vnkm79rn4nlv4m9ycbxs7l";
179269+ version = "0.0.0.2";
179270+ sha256 = "15x7swbr18xks8a9xf1hjwibgqxsjigcyrahbnk72p1n1gxkarjr";
179323179271 libraryHaskellDepends = [
179324− base clock exceptions hashable random text unordered-containers
179272+ attoparsec base bytestring clock exceptions hashable random text
179273+ unordered-containers
179325179274 ];
179326179275 testHaskellDepends = [
179327− async base tasty tasty-discover tasty-quickcheck
179276+ async base bytestring tasty tasty-discover tasty-hunit
179277+ tasty-quickcheck
179328179278 ];
179329179279 testToolDepends = [ tasty-discover ];
179330179280 license = stdenv.lib.licenses.asl20;
@@ -181750,21 +181700,6 @@ self: {
181750181700 }) {};
181751181701
181752181702 "pandoc-csv2table" = callPackage
181753− ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
181754− mkDerivation {
181755− pname = "pandoc-csv2table";
181756− version = "1.0.7";
181757− sha256 = "0b6ycr50n24cjlli7jk3dh1shfsl9wqykvmdgabk1s8n2w1ps8sa";
181758− isLibrary = true;
181759− isExecutable = true;
181760− enableSeparateDataOutput = true;
181761− libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
181762− executableHaskellDepends = [ base csv pandoc pandoc-types ];
181763− description = "Convert CSV to Pandoc Table Markdown";
181764− license = stdenv.lib.licenses.mit;
181765− }) {};
181766−
181767− "pandoc-csv2table_1_0_8" = callPackage
181768181703 ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
181769181704 mkDerivation {
181770181705 pname = "pandoc-csv2table";
@@ -181777,7 +181712,6 @@ self: {
181777181712 executableHaskellDepends = [ base csv pandoc pandoc-types ];
181778181713 description = "Convert CSV to Pandoc Table Markdown";
181779181714 license = stdenv.lib.licenses.mit;
181780− hydraPlatforms = stdenv.lib.platforms.none;
181781181715 }) {};
181782181716
181783181717 "pandoc-emphasize-code" = callPackage
@@ -184269,8 +184203,8 @@ self: {
184269184203 }:
184270184204 mkDerivation {
184271184205 pname = "patch";
184272− version = "0.0.2.0";
184273− sha256 = "0c9wf996k8py90ld6353hynb96fdird7lm4kx3djaild6iiyiaal";
184206+ version = "0.0.3.1";
184207+ sha256 = "1dkms6ngr01d4gvyjbl6z30b6qz4cnxnh0y7advrc9fib0237gnl";
184274184208 libraryHaskellDepends = [
184275184209 base constraints-extras containers dependent-map dependent-sum lens
184276184210 monoidal-containers semialign semigroupoids these transformers
@@ -185866,8 +185800,6 @@ self: {
185866185800 testHaskellDepends = [ base doctest ];
185867185801 description = "Perhaps, a monad";
185868185802 license = stdenv.lib.licenses.bsd2;
185869− hydraPlatforms = stdenv.lib.platforms.none;
185870− broken = true;
185871185803 }) {};
185872185804
185873185805 "period" = callPackage
@@ -186117,7 +186049,7 @@ self: {
186117186049 maintainers = with stdenv.lib.maintainers; [ psibi ];
186118186050 }) {};
186119186051
186120− "persistent_2_10_5" = callPackage
186052+ "persistent_2_10_5_1" = callPackage
186121186053 ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
186122186054 , blaze-html, bytestring, conduit, containers, fast-logger, hspec
186123186055 , http-api-data, monad-logger, mtl, path-pieces, resource-pool
@@ -186127,8 +186059,8 @@ self: {
186127186059 }:
186128186060 mkDerivation {
186129186061 pname = "persistent";
186130− version = "2.10.5";
186131− sha256 = "1xrfl7yrjppgbyw5msiayn54k3my4wh77pgmlv3kmp5vybhbfjzj";
186062+ version = "2.10.5.1";
186063+ sha256 = "0q95ik7agbld7dhzbr79nqh0v5vg8hk9sl61306y7kknyyy4inbw";
186132186064 libraryHaskellDepends = [
186133186065 aeson attoparsec base base64-bytestring blaze-html bytestring
186134186066 conduit containers fast-logger http-api-data monad-logger mtl
@@ -186385,7 +186317,7 @@ self: {
186385186317 license = stdenv.lib.licenses.mit;
186386186318 }) {};
186387186319
186388− "persistent-mysql_2_10_2_2" = callPackage
186320+ "persistent-mysql_2_10_2_3" = callPackage
186389186321 ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
186390186322 , containers, fast-logger, hspec, HUnit, monad-logger, mysql
186391186323 , mysql-simple, persistent, persistent-qq, persistent-template
@@ -186394,8 +186326,8 @@ self: {
186394186326 }:
186395186327 mkDerivation {
186396186328 pname = "persistent-mysql";
186397− version = "2.10.2.2";
186398− sha256 = "1b1x673nzqdv3i2rwn4fp4ky9a49dc6vfif1xjajzwf75mffabfb";
186329+ version = "2.10.2.3";
186330+ sha256 = "0ymh1gmcslwd8fp2wq71fswjgbmjdxl2mx4xf30j71h0744r2jbf";
186399186331 libraryHaskellDepends = [
186400186332 aeson base blaze-builder bytestring conduit containers monad-logger
186401186333 mysql mysql-simple persistent resource-pool resourcet text
@@ -186492,27 +186424,6 @@ self: {
186492186424 }) {};
186493186425
186494186426 "persistent-pagination" = callPackage
186495− ({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec
186496− , hspec-discover, microlens, mtl, persistent, persistent-sqlite
186497− , persistent-template, QuickCheck, time
186498− }:
186499− mkDerivation {
186500− pname = "persistent-pagination";
186501− version = "0.1.1.0";
186502− sha256 = "1g2mn2gv9dygx4rrpxi81421dyyy9pdnzrdpqcb5sygcjsqi17ha";
186503− libraryHaskellDepends = [
186504− base conduit esqueleto foldl microlens mtl persistent
186505− ];
186506− testHaskellDepends = [
186507− base conduit containers esqueleto hspec hspec-discover mtl
186508− persistent persistent-sqlite persistent-template QuickCheck time
186509− ];
186510− testToolDepends = [ hspec-discover ];
186511− description = "Efficient and correct pagination for persistent or esqueleto queries";
186512− license = stdenv.lib.licenses.bsd3;
186513− }) {};
186514−
186515− "persistent-pagination_0_1_1_1" = callPackage
186516186427 ({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec
186517186428 , hspec-discover, microlens, mtl, persistent, persistent-sqlite
186518186429 , persistent-template, QuickCheck, time
@@ -186531,7 +186442,6 @@ self: {
186531186442 testToolDepends = [ hspec-discover ];
186532186443 description = "Efficient and correct pagination for persistent or esqueleto queries";
186533186444 license = stdenv.lib.licenses.bsd3;
186534− hydraPlatforms = stdenv.lib.platforms.none;
186535186445 }) {};
186536186446
186537186447 "persistent-parser" = callPackage
@@ -186865,7 +186775,7 @@ self: {
186865186775 maintainers = with stdenv.lib.maintainers; [ psibi ];
186866186776 }) {};
186867186777
186868− "persistent-template_2_8_2_1" = callPackage
186778+ "persistent-template_2_8_2_2" = callPackage
186869186779 ({ mkDerivation, aeson, base, bytestring, containers, criterion
186870186780 , deepseq, deepseq-generics, file-embed, hspec, http-api-data
186871186781 , monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -186874,8 +186784,8 @@ self: {
186874186784 }:
186875186785 mkDerivation {
186876186786 pname = "persistent-template";
186877− version = "2.8.2.1";
186878− sha256 = "1w39n6164l99k1p8fk5c9aawbps6p3cmi4xgn123qmcmc1cw0nrj";
186787+ version = "2.8.2.2";
186788+ sha256 = "1ka5s373q50q4nqn1w5jqgcvh21m89gmq7i0jcdhidkz5ynvx51k";
186879186789 libraryHaskellDepends = [
186880186790 aeson base bytestring containers http-api-data monad-control
186881186791 monad-logger path-pieces persistent template-haskell text
@@ -188818,8 +188728,8 @@ self: {
188818188728 pname = "pipes-extras";
188819188729 version = "1.0.15";
188820188730 sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82";
188821− revision = "1";
188822− editedCabalFile = "0xrd5zwkr1c7lswzi91gxl3ndra8y9g2b4j00sszyy3w187a2zwi";
188731+ revision = "2";
188732+ editedCabalFile = "1aprq51r83v5qja9vy01s8d17bnncnvp1mw6h6maxgzh2xppim8b";
188823188733 libraryHaskellDepends = [ base foldl lens pipes transformers ];
188824188734 testHaskellDepends = [
188825188735 base HUnit pipes test-framework test-framework-hunit transformers
@@ -191343,10 +191253,8 @@ self: {
191343191253 ({ mkDerivation, base, containers }:
191344191254 mkDerivation {
191345191255 pname = "polyvariadic";
191346− version = "0.3.0.3";
191347− sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
191348− revision = "5";
191349− editedCabalFile = "1pzqc1hppzlj03wr2hrlm7liq9kcf650mpsrm4chr6msq491na9c";
191256+ version = "0.3.0.4";
191257+ sha256 = "17895458cfciv5lkcd26b5a96d9mwklish8xjhn14bd2himyczx0";
191350191258 libraryHaskellDepends = [ base containers ];
191351191259 testHaskellDepends = [ base ];
191352191260 description = "Creation and application of polyvariadic functions";
@@ -194283,6 +194191,8 @@ self: {
194283194191 pname = "pretty-sop";
194284194192 version = "0.2.0.3";
194285194193 sha256 = "10vybwbkqgr3fi13c5qwwhrwns9sdj7zvlkz6vag966pk238gnxy";
194194+ revision = "1";
194195+ editedCabalFile = "04gr1aaqaq347rv5vqh93qcnbc53y55hrds73js5329z2j1gbmng";
194286194196 libraryHaskellDepends = [ base generics-sop pretty-show ];
194287194197 testHaskellDepends = [ base generics-sop pretty-show ];
194288194198 testToolDepends = [ markdown-unlit ];
@@ -194482,8 +194392,8 @@ self: {
194482194392 ({ mkDerivation, base, graphviz, prettyprinter, text }:
194483194393 mkDerivation {
194484194394 pname = "prettyprinter-graphviz";
194485− version = "0.1.0.1";
194486− sha256 = "1h6jr4vh60j54ajsylh41y0iskz5yjgh2879v25z1mw7vfi40kww";
194395+ version = "0.1.1.0";
194396+ sha256 = "1x69lgxkby1bvsl91j4a94f1ylsl1imll3lqqpjig7yrxn9wi9xq";
194487194397 libraryHaskellDepends = [ base graphviz prettyprinter text ];
194488194398 description = "a prettyprinter backend for graphviz";
194489194399 license = stdenv.lib.licenses.bsd3;
@@ -194664,6 +194574,8 @@ self: {
194664194574 pname = "primitive";
194665194575 version = "0.7.0.0";
194666194576 sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq";
194577+ revision = "1";
194578+ editedCabalFile = "1g10dsdadv8sy9mhhwx4jknzshvxc4qx6z9lmgqy7060prlbqnn4";
194667194579 libraryHaskellDepends = [ base ghc-prim transformers ];
194668194580 testHaskellDepends = [
194669194581 base base-orphans ghc-prim QuickCheck semigroups tagged tasty
@@ -197165,6 +197077,24 @@ self: {
197165197077 broken = true;
197166197078 }) {};
197167197079
197080+ "provenience" = callPackage
197081+ ({ mkDerivation, aeson, base, blaze-markup, containers
197082+ , data-default, fgl, mtl, pandoc, text, time
197083+ }:
197084+ mkDerivation {
197085+ pname = "provenience";
197086+ version = "0.1.0.1";
197087+ sha256 = "0z2lsyx59wk663y4p0xwl5sjrl1h3aqlqwig2xhvv9a1cf2bzzd3";
197088+ isLibrary = true;
197089+ isExecutable = true;
197090+ libraryHaskellDepends = [
197091+ aeson base blaze-markup containers data-default fgl mtl pandoc text
197092+ time
197093+ ];
197094+ description = "Computations that automatically track data dependencies";
197095+ license = stdenv.lib.licenses.gpl3;
197096+ }) {};
197097+
197168197098 "proxied" = callPackage
197169197099 ({ mkDerivation, base }:
197170197100 mkDerivation {
@@ -200034,6 +199964,18 @@ self: {
200034199964 broken = true;
200035199965 }) {};
200036199966
199967+ "quiet" = callPackage
199968+ ({ mkDerivation, base }:
199969+ mkDerivation {
199970+ pname = "quiet";
199971+ version = "0.2";
199972+ sha256 = "0k2y6aa5c7d0sils11m0r1nk1fmck7iq10wr35v77r6wg5rzd2qi";
199973+ libraryHaskellDepends = [ base ];
199974+ testHaskellDepends = [ base ];
199975+ description = "Generic deriving of Read/Show with no record labels";
199976+ license = stdenv.lib.licenses.bsd3;
199977+ }) {};
199978+
200037199979 "quipper" = callPackage
200038199980 ({ mkDerivation, base, quipper-language, quipper-libraries
200039199981 , quipper-tools
@@ -202066,15 +202008,15 @@ self: {
202066202008 "raven-haskell" = callPackage
202067202009 ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl
202068202010 , network, random, resourcet, text, time, unordered-containers
202069− , uuid
202011+ , uuid-types
202070202012 }:
202071202013 mkDerivation {
202072202014 pname = "raven-haskell";
202073− version = "0.1.3.0";
202074− sha256 = "0jd0xxrliqc85mifkqzblc3fi6xjgkwkqxijqjx42r5jc0m1qs7f";
202015+ version = "0.1.4.0";
202016+ sha256 = "136vszzvfmhpxzavl7smnbyn45w026j005cdknapxhb6v495b7qz";
202075202017 libraryHaskellDepends = [
202076202018 aeson base bytestring http-conduit mtl network random resourcet
202077− text time unordered-containers uuid
202019+ text time unordered-containers uuid-types
202078202020 ];
202079202021 testHaskellDepends = [
202080202022 aeson base bytestring hspec time unordered-containers
@@ -206948,12 +206890,12 @@ self: {
206948206890 license = stdenv.lib.licenses.bsd2;
206949206891 }) {};
206950206892
206951− "replace-megaparsec_1_2_0_0" = callPackage
206893+ "replace-megaparsec_1_2_1_0" = callPackage
206952206894 ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
206953206895 mkDerivation {
206954206896 pname = "replace-megaparsec";
206955− version = "1.2.0.0";
206956− sha256 = "0s9iqx4skv4dgj126b1g8903hi2g967pka695jmhi35sdwjsqc7l";
206897+ version = "1.2.1.0";
206898+ sha256 = "1k00a6xqdk8fgcja0v0flydk3afrpdrn4cf1csin7waqkl2kwvrb";
206957206899 libraryHaskellDepends = [ base bytestring megaparsec text ];
206958206900 testHaskellDepends = [ base bytestring Cabal megaparsec text ];
206959206901 description = "Find, replace, and edit text patterns with Megaparsec parsers";
@@ -208741,12 +208683,10 @@ self: {
208741208683 ({ mkDerivation, base, Only, postgresql-simple, text, time }:
208742208684 mkDerivation {
208743208685 pname = "ribbit";
208744− version = "0.4.1.0";
208745− sha256 = "1pgyh7ar03k62mpn09g8qm13m1j07wq257hpva3f9sx9n5qd8z2a";
208746− revision = "1";
208747− editedCabalFile = "11ky88hgkys3bzsqr3sl9j685h6l97r2zccpz1ylinsrvinwnq8s";
208686+ version = "1.0.0.1";
208687+ sha256 = "0zixx1xmqc8893rczhdzcplmdcx5dx1c4ykf7rg7w8h5yvni1r0y";
208748208688 libraryHaskellDepends = [ base Only postgresql-simple text time ];
208749− description = "Type-level Relational DB language";
208689+ description = "Type-level Relational DB combinators";
208750208690 license = stdenv.lib.licenses.mit;
208751208691 }) {};
208752208692
@@ -209581,18 +209521,18 @@ self: {
209581209521 }) {};
209582209522
209583209523 "rock" = callPackage
209584− ({ mkDerivation, base, dependent-map, dependent-sum
209524+ ({ mkDerivation, base, containers, dependent-map, dependent-sum
209585209525 , deriving-compat, mtl, protolude, transformers
209586209526 }:
209587209527 mkDerivation {
209588209528 pname = "rock";
209589− version = "0.1.0.1";
209590− sha256 = "1a70c55k10algfbc77maaa8p2l16xkml6kddza52ab0vv8dn98d3";
209529+ version = "0.2.0.0";
209530+ sha256 = "0h4z2ss4g9zshxpfallmbqw121jk1dv7q5s3ww39rhglw3j4dj9k";
209591209531 isLibrary = true;
209592209532 isExecutable = true;
209593209533 libraryHaskellDepends = [
209594− base dependent-map dependent-sum deriving-compat mtl protolude
209595− transformers
209534+ base containers dependent-map dependent-sum deriving-compat mtl
209535+ protolude transformers
209596209536 ];
209597209537 description = "A build system for incremental, parallel, and demand-driven computations";
209598209538 license = stdenv.lib.licenses.bsd3;
@@ -211227,17 +211167,19 @@ self: {
211227211167 }) {};
211228211168
211229211169 "safe-decimal" = callPackage
211230− ({ mkDerivation, base, deepseq, exceptions, hspec, hspec-discover
211231− , QuickCheck, scientific
211170+ ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
211171+ , exceptions, hspec, hspec-discover, QuickCheck, scientific
211172+ , template-haskell
211232211173 }:
211233211174 mkDerivation {
211234211175 pname = "safe-decimal";
211235− version = "0.1.0.0";
211236− sha256 = "10y618swfxvz38fm95i6jbki5ax6w6xxhrdizqlrbwnqdjlsj681";
211237− revision = "1";
211238− editedCabalFile = "0449df25rah097rsbrbkb8sb4n80yms06isg0g8mp7v8ah4ssrs3";
211176+ version = "0.2.0.0";
211177+ sha256 = "03id56ib8m7gja2g5a8d6b26cz3h3zf3f3gq2ss7paxvwvn6wfib";
211178+ setupHaskellDepends = [ base Cabal cabal-doctest ];
211239211179 libraryHaskellDepends = [ base deepseq exceptions scientific ];
211240− testHaskellDepends = [ base deepseq hspec QuickCheck scientific ];
211180+ testHaskellDepends = [
211181+ base deepseq doctest hspec QuickCheck scientific template-haskell
211182+ ];
211241211183 testToolDepends = [ hspec-discover ];
211242211184 description = "Safe and very efficient arithmetic operations on fixed decimal point numbers";
211243211185 license = stdenv.lib.licenses.bsd3;
@@ -213105,6 +213047,37 @@ self: {
213105213047 pname = "scheduler";
213106213048 version = "1.4.2.1";
213107213049 sha256 = "074m037ksjl7kgpgfldimaadhc4f6mmv40y6cq54m9shhg7rxw1c";
213050+ revision = "1";
213051+ editedCabalFile = "0gz7mkd0nj2bxcjnn50jgyiaks5dbvpm6wy8ygp2c61nnddbv4xx";
213052+ setupHaskellDepends = [ base Cabal cabal-doctest ];
213053+ libraryHaskellDepends = [
213054+ atomic-primops base deepseq exceptions primitive unliftio-core
213055+ ];
213056+ testHaskellDepends = [
213057+ base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
213058+ template-haskell unliftio vector
213059+ ];
213060+ benchmarkHaskellDepends = [
213061+ async base criterion deepseq monad-par parallel streamly unliftio
213062+ ];
213063+ description = "Work stealing scheduler";
213064+ license = stdenv.lib.licenses.bsd3;
213065+ hydraPlatforms = stdenv.lib.platforms.none;
213066+ broken = true;
213067+ }) {};
213068+
213069+ "scheduler_1_4_2_2" = callPackage
213070+ ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
213071+ , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec
213072+ , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly
213073+ , template-haskell, unliftio, unliftio-core, vector
213074+ }:
213075+ mkDerivation {
213076+ pname = "scheduler";
213077+ version = "1.4.2.2";
213078+ sha256 = "0mzwm7lr089hbv08c58l3ahiid8w1cysvjl9q6vb46x3wpa3fwia";
213079+ revision = "1";
213080+ editedCabalFile = "0a6xcidya383ygzmz76di3dj1c8xm6ra5zb8fp517lk50s3ly3kl";
213108213081 setupHaskellDepends = [ base Cabal cabal-doctest ];
213109213082 libraryHaskellDepends = [
213110213083 atomic-primops base deepseq exceptions primitive unliftio-core
@@ -214207,8 +214180,8 @@ self: {
214207214180 }:
214208214181 mkDerivation {
214209214182 pname = "sdl2";
214210− version = "2.5.0.0";
214211− sha256 = "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8";
214183+ version = "2.5.1.0";
214184+ sha256 = "087df61fsmfsdc7pdn6sgsp5lf20nampa41illszii5jfr13s7gw";
214212214185 isLibrary = true;
214213214186 isExecutable = true;
214214214187 enableSeparateDataOutput = true;
@@ -214738,21 +214711,19 @@ self: {
214738214711
214739214712 "secret-sharing" = callPackage
214740214713 ({ mkDerivation, base, binary, bytestring, dice-entropy-conduit
214741− , finite-field, polynomial, QuickCheck, test-framework
214714+ , finite-field, QuickCheck, test-framework
214742214715 , test-framework-quickcheck2, vector
214743214716 }:
214744214717 mkDerivation {
214745214718 pname = "secret-sharing";
214746− version = "1.0.0.3";
214747− sha256 = "0q315gmfnhpzgi4r0p3li8vvrdl2a0xgh0gxdin6s3nkh6hjpbv2";
214748− revision = "1";
214749− editedCabalFile = "1q8r31bjvjm1j11pp9xqxwh53gi2skm6lqxcja5v8gzs7hl1kkb1";
214719+ version = "1.0.1.0";
214720+ sha256 = "16j4xz4kkcicqfl9r8831il310ns02kxwj7mga8pvssfnhzv9zpv";
214750214721 libraryHaskellDepends = [
214751− base binary bytestring dice-entropy-conduit finite-field polynomial
214752− vector
214722+ base binary bytestring dice-entropy-conduit finite-field vector
214753214723 ];
214754214724 testHaskellDepends = [
214755− base QuickCheck test-framework test-framework-quickcheck2
214725+ base bytestring QuickCheck test-framework
214726+ test-framework-quickcheck2
214756214727 ];
214757214728 description = "Information-theoretic secure secret sharing";
214758214729 license = stdenv.lib.licenses.lgpl21;
@@ -216339,8 +216310,8 @@ self: {
216339216310 pname = "servant-auth-client";
216340216311 version = "0.4.0.0";
216341216312 sha256 = "1kh4kq3cc9fn49vmh304zyzn7idb4k1j0803yp7a6qc733panf9g";
216342− revision = "2";
216343− editedCabalFile = "0c67m1ckksnmwkya78nn9hy65xb7c4023fy7d3pp6zyq8izrp1v8";
216313+ revision = "3";
216314+ editedCabalFile = "1f6x5dja9czj78zn9n4jrfpk6hzhbif3in48f6w24i45jpmysx98";
216344216315 libraryHaskellDepends = [
216345216316 base bytestring containers servant servant-auth servant-client-core
216346216317 ];
@@ -216475,6 +216446,35 @@ self: {
216475216446 license = stdenv.lib.licenses.bsd3;
216476216447 }) {};
216477216448
216449+ "servant-auth-server_0_4_5_1" = callPackage
216450+ ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
216451+ , bytestring, case-insensitive, cookie, data-default-class, entropy
216452+ , hspec, hspec-discover, http-client, http-types, jose, lens
216453+ , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck
216454+ , servant, servant-auth, servant-server, tagged, text, time
216455+ , transformers, unordered-containers, wai, warp, wreq
216456+ }:
216457+ mkDerivation {
216458+ pname = "servant-auth-server";
216459+ version = "0.4.5.1";
216460+ sha256 = "10kcxdh9ba37jra6brrg11rzmx16jmwsk0yib92l0s3mkqp9was6";
216461+ libraryHaskellDepends = [
216462+ aeson base base64-bytestring blaze-builder bytestring
216463+ case-insensitive cookie data-default-class entropy http-types jose
216464+ lens memory monad-time mtl servant servant-auth servant-server
216465+ tagged text time unordered-containers wai
216466+ ];
216467+ testHaskellDepends = [
216468+ aeson base bytestring case-insensitive hspec http-client http-types
216469+ jose lens lens-aeson mtl QuickCheck servant servant-auth
216470+ servant-server time transformers wai warp wreq
216471+ ];
216472+ testToolDepends = [ hspec-discover markdown-unlit ];
216473+ description = "servant-server/servant-auth compatibility";
216474+ license = stdenv.lib.licenses.bsd3;
216475+ hydraPlatforms = stdenv.lib.platforms.none;
216476+ }) {};
216477+
216478216478 "servant-auth-swagger" = callPackage
216479216479 ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
216480216480 , servant, servant-auth, servant-swagger, swagger2, text
@@ -218812,6 +218812,8 @@ self: {
218812218812 pname = "servant-waargonaut";
218813218813 version = "0.7.0.0";
218814218814 sha256 = "0fn7ph0805n297nzi3ig9wfx27kz6bmn4r914ibx44927xifms59";
218815+ revision = "1";
218816+ editedCabalFile = "1xavy6k93ncvcnb4rp1p33gxaqbhjil6mz9qk8li1ibhyi29yjxh";
218815218817 libraryHaskellDepends = [
218816218818 base bytestring http-media lens servant text waargonaut
218817218819 wl-pprint-annotated
@@ -220044,8 +220046,8 @@ self: {
220044220046 }:
220045220047 mkDerivation {
220046220048 pname = "shake";
220047− version = "0.18.4";
220048− sha256 = "0vpgs6f365p1s09h30g2a6qy4y0rxi3pyxcg14kiag9k504af9i0";
220049+ version = "0.18.5";
220050+ sha256 = "03r4rapkcyy04wf7ljikjbsjc29fpydbv5zbrrkiy1dqadzvasjp";
220049220051 isLibrary = true;
220050220052 isExecutable = true;
220051220053 enableSeparateDataOutput = true;
@@ -220085,6 +220087,8 @@ self: {
220085220087 ];
220086220088 description = "Utilities for building ATS projects with shake";
220087220089 license = stdenv.lib.licenses.bsd3;
220090+ hydraPlatforms = stdenv.lib.platforms.none;
220091+ broken = true;
220088220092 }) {};
220089220093
220090220094 "shake-c" = callPackage
@@ -220339,31 +220343,6 @@ self: {
220339220343 }) {};
220340220344
220341220345 "shakespeare" = callPackage
220342− ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
220343− , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
220344− , process, scientific, template-haskell, text, time, transformers
220345− , unordered-containers, vector
220346− }:
220347− mkDerivation {
220348− pname = "shakespeare";
220349− version = "2.0.23";
220350− sha256 = "0i1k6ahpvc45z05lycxs0f70ngm8xrazp6ayyxv1bzw8q8d4bkz3";
220351− libraryHaskellDepends = [
220352− aeson base blaze-html blaze-markup bytestring containers directory
220353− exceptions ghc-prim parsec process scientific template-haskell text
220354− time transformers unordered-containers vector
220355− ];
220356− testHaskellDepends = [
220357− aeson base blaze-html blaze-markup bytestring containers directory
220358− exceptions ghc-prim hspec HUnit parsec process template-haskell
220359− text time transformers
220360− ];
220361− description = "A toolkit for making compile-time interpolated templates";
220362− license = stdenv.lib.licenses.mit;
220363− maintainers = with stdenv.lib.maintainers; [ psibi ];
220364− }) {};
220365−
220366− "shakespeare_2_0_24" = callPackage
220367220346 ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
220368220347 , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
220369220348 , process, scientific, template-haskell, text, time, transformers
@@ -220385,7 +220364,6 @@ self: {
220385220364 ];
220386220365 description = "A toolkit for making compile-time interpolated templates";
220387220366 license = stdenv.lib.licenses.mit;
220388− hydraPlatforms = stdenv.lib.platforms.none;
220389220367 maintainers = with stdenv.lib.maintainers; [ psibi ];
220390220368 }) {};
220391220369
@@ -221479,6 +221457,24 @@ self: {
221479221457 license = stdenv.lib.licenses.bsd3;
221480221458 }) {};
221481221459
221460+ "shwifty" = callPackage
221461+ ({ mkDerivation, base, bytestring, case-insensitive, containers
221462+ , mtl, primitive, template-haskell, text, th-abstraction, time
221463+ , unordered-containers, uuid-types, vector
221464+ }:
221465+ mkDerivation {
221466+ pname = "shwifty";
221467+ version = "0.0.1.0";
221468+ sha256 = "1xipwh2cw4n608spxg011hnmima3badz6l8biry7q1nygc6mnc9a";
221469+ libraryHaskellDepends = [
221470+ base bytestring case-insensitive containers mtl primitive
221471+ template-haskell text th-abstraction time unordered-containers
221472+ uuid-types vector
221473+ ];
221474+ description = "Generate swift types from haskell types";
221475+ license = stdenv.lib.licenses.mit;
221476+ }) {};
221477+
221482221478 "si-clock" = callPackage
221483221479 ({ mkDerivation, base, bytestring, hsI2C, time, transformers }:
221484221480 mkDerivation {
@@ -221905,6 +221901,18 @@ self: {
221905221901 license = stdenv.lib.licenses.bsd3;
221906221902 }) {};
221907221903
221904+ "simple-cmd-args_0_1_5" = callPackage
221905+ ({ mkDerivation, base, optparse-applicative }:
221906+ mkDerivation {
221907+ pname = "simple-cmd-args";
221908+ version = "0.1.5";
221909+ sha256 = "097b8qv0755p0iq6bcw6ndvvvv017x9hgf6l2zvb3sgqdg9wlj88";
221910+ libraryHaskellDepends = [ base optparse-applicative ];
221911+ description = "Simple command args parsing and execution";
221912+ license = stdenv.lib.licenses.bsd3;
221913+ hydraPlatforms = stdenv.lib.platforms.none;
221914+ }) {};
221915+
221908221916 "simple-conduit" = callPackage
221909221917 ({ mkDerivation, base, bifunctors, bytestring, CC-delcont
221910221918 , chunked-data, conduit, conduit-combinators, conduit-extra
@@ -222998,6 +223006,25 @@ self: {
222998223006 hydraPlatforms = stdenv.lib.platforms.none;
222999223007 }) {};
223000223008
223009+ "singletons-presburger" = callPackage
223010+ ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection
223011+ , singletons
223012+ }:
223013+ mkDerivation {
223014+ pname = "singletons-presburger";
223015+ version = "0.3.0.0";
223016+ sha256 = "06djkc6y5clv0q903i04gaq0vri3nkk307znb418y0rfdh6czzwx";
223017+ isLibrary = true;
223018+ isExecutable = true;
223019+ libraryHaskellDepends = [
223020+ base ghc ghc-typelits-presburger reflection singletons
223021+ ];
223022+ description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
223023+ license = stdenv.lib.licenses.bsd3;
223024+ hydraPlatforms = stdenv.lib.platforms.none;
223025+ broken = true;
223026+ }) {};
223027+
223001223028 "singnal" = callPackage
223002223029 ({ mkDerivation, base }:
223003223030 mkDerivation {
@@ -223241,8 +223268,8 @@ self: {
223241223268 }:
223242223269 mkDerivation {
223243223270 pname = "sized";
223244− version = "0.3.0.0";
223245− sha256 = "1w00s0wgbr1n2x2ariixixy07bhxiyp5728givdrz0xg63gnw1s7";
223271+ version = "0.3.0.1";
223272+ sha256 = "1f31sfimji95bip88y9vn8mdlgbrikh0xc4w6vy2ydh1902rdiks";
223246223273 libraryHaskellDepends = [
223247223274 base constraints containers deepseq equational-reasoning
223248223275 ghc-typelits-presburger hashable lens ListLike mono-traversable
@@ -224589,8 +224616,8 @@ self: {
224589224616 ({ mkDerivation, aeson, base, linear, text, vector }:
224590224617 mkDerivation {
224591224618 pname = "smoothie";
224592− version = "0.4.2.9";
224593− sha256 = "0kra42nh86dfp66ngr4bmb8d530nh7b9pra1vlykc0sx9b1zpjnk";
224619+ version = "0.4.2.10";
224620+ sha256 = "059r2igvqidganwn0d907f6zv9h7ggwa6hgaaxh2car3kyi7425l";
224594224621 enableSeparateDataOutput = true;
224595224622 libraryHaskellDepends = [ aeson base linear text vector ];
224596224623 description = "Smooth curves via several interpolation modes";
@@ -227587,8 +227614,8 @@ self: {
227587227614 }:
227588227615 mkDerivation {
227589227616 pname = "sparse-tensor";
227590− version = "0.2.1.2";
227591− sha256 = "0rkq0la7l12x9ck96ra8inlz81fcj5z8sxa90sgd082jhrq7jq94";
227617+ version = "0.2.1.3";
227618+ sha256 = "1fcckwp9k3ky669ai62x26pgz0irir4ngk0m6g1659fsn3f2gdc8";
227592227619 setupHaskellDepends = [ base Cabal ];
227593227620 libraryHaskellDepends = [
227594227621 ad base bytestring cereal containers deepseq ghc-typelits-knownnat
@@ -231763,8 +231790,8 @@ self: {
231763231790 ({ mkDerivation, base, semigroups, transformers, utility-ht }:
231764231791 mkDerivation {
231765231792 pname = "storable-record";
231766− version = "0.0.4";
231767− sha256 = "0hjs1km0fc9ch0i1rbycxia5w3939hk4p4md73ikgg4aipqb5zyf";
231793+ version = "0.0.4.1";
231794+ sha256 = "1waj81810ywbrzizifsrjd0n3803scl8sr248z9nlrc94fz8vg58";
231768231795 isLibrary = true;
231769231796 isExecutable = true;
231770231797 libraryHaskellDepends = [
@@ -231852,57 +231879,6 @@ self: {
231852231879 }) {};
231853231880
231854231881 "store" = callPackage
231855− ({ mkDerivation, array, async, base, base-orphans
231856− , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
231857− , clock, containers, contravariant, criterion, cryptohash, deepseq
231858− , directory, filepath, free, ghc-prim, hashable, hspec
231859− , hspec-smallcheck, integer-gmp, lifted-base, monad-control
231860− , mono-traversable, network, primitive, resourcet, safe, semigroups
231861− , smallcheck, store-core, syb, template-haskell, text, th-lift
231862− , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
231863− , transformers, unordered-containers, vector
231864− , vector-binary-instances, void, weigh
231865− }:
231866− mkDerivation {
231867− pname = "store";
231868− version = "0.5.1.2";
231869− sha256 = "1abwlcj0z17hj5h94cbg1sgqfdsdgjhgfgd2aaspsn4zdfk5bjc5";
231870− libraryHaskellDepends = [
231871− array async base base-orphans base64-bytestring bifunctors
231872− bytestring containers contravariant cryptohash deepseq directory
231873− filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
231874− lifted-base monad-control mono-traversable network primitive
231875− resourcet safe semigroups smallcheck store-core syb
231876− template-haskell text th-lift th-lift-instances th-orphans
231877− th-reify-many th-utilities time transformers unordered-containers
231878− vector void
231879− ];
231880− testHaskellDepends = [
231881− array async base base-orphans base64-bytestring bifunctors
231882− bytestring clock containers contravariant cryptohash deepseq
231883− directory filepath free ghc-prim hashable hspec hspec-smallcheck
231884− integer-gmp lifted-base monad-control mono-traversable network
231885− primitive resourcet safe semigroups smallcheck store-core syb
231886− template-haskell text th-lift th-lift-instances th-orphans
231887− th-reify-many th-utilities time transformers unordered-containers
231888− vector void
231889− ];
231890− benchmarkHaskellDepends = [
231891− array async base base-orphans base64-bytestring bifunctors
231892− bytestring cereal cereal-vector containers contravariant criterion
231893− cryptohash deepseq directory filepath free ghc-prim hashable hspec
231894− hspec-smallcheck integer-gmp lifted-base monad-control
231895− mono-traversable network primitive resourcet safe semigroups
231896− smallcheck store-core syb template-haskell text th-lift
231897− th-lift-instances th-orphans th-reify-many th-utilities time
231898− transformers unordered-containers vector vector-binary-instances
231899− void weigh
231900− ];
231901− description = "Fast binary serialization";
231902− license = stdenv.lib.licenses.mit;
231903− }) {};
231904−
231905− "store_0_7_1" = callPackage
231906231882 ({ mkDerivation, array, async, base, base-orphans
231907231883 , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
231908231884 , clock, containers, contravariant, criterion, cryptohash, deepseq
@@ -231951,7 +231927,6 @@ self: {
231951231927 ];
231952231928 description = "Fast binary serialization";
231953231929 license = stdenv.lib.licenses.mit;
231954− hydraPlatforms = stdenv.lib.platforms.none;
231955231930 }) {};
231956231931
231957231932 "store-core" = callPackage
@@ -232049,15 +232024,15 @@ self: {
232049232024 license = stdenv.lib.licenses.mit;
232050232025 }) {};
232051232026
232052− "stratosphere_0_48_0" = callPackage
232027+ "stratosphere_0_49_0" = callPackage
232053232028 ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
232054232029 , hashable, hspec, hspec-discover, lens, template-haskell, text
232055232030 , unordered-containers
232056232031 }:
232057232032 mkDerivation {
232058232033 pname = "stratosphere";
232059− version = "0.48.0";
232060− sha256 = "1g6z2yfafa9h1nr3kzg4mblgl7n8dmyja8zyq888m99lh4h8qdf2";
232034+ version = "0.49.0";
232035+ sha256 = "18qw7m0h9nlg0vicg3rr7dghmpdfnrpd0ayqyi60c1ifzk4ys4sf";
232061232036 isLibrary = true;
232062232037 isExecutable = true;
232063232038 libraryHaskellDepends = [
@@ -233816,29 +233791,6 @@ self: {
233816233791 }) {};
233817233792
233818233793 "structs" = callPackage
233819− ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
233820− , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
233821− , tasty, tasty-hunit, tasty-quickcheck, template-haskell
233822− }:
233823− mkDerivation {
233824− pname = "structs";
233825− version = "0.1.2";
233826− sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4";
233827− revision = "2";
233828− editedCabalFile = "0ma2s0by622kaq7p57g859pxha02bqrd7n86cczfb2gzcm7kqma7";
233829− setupHaskellDepends = [ base Cabal cabal-doctest ];
233830− libraryHaskellDepends = [
233831− base deepseq ghc-prim primitive template-haskell
233832− ];
233833− testHaskellDepends = [
233834− base directory doctest filepath parallel primitive QuickCheck tasty
233835− tasty-hunit tasty-quickcheck
233836− ];
233837− description = "Strict GC'd imperative object-oriented programming with cheap pointers";
233838− license = stdenv.lib.licenses.bsd3;
233839− }) {};
233840−
233841− "structs_0_1_3" = callPackage
233842233794 ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
233843233795 , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
233844233796 , tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -233857,7 +233809,6 @@ self: {
233857233809 ];
233858233810 description = "Strict GC'd imperative object-oriented programming with cheap pointers";
233859233811 license = stdenv.lib.licenses.bsd3;
233860− hydraPlatforms = stdenv.lib.platforms.none;
233861233812 }) {};
233862233813
233863233814 "structural-induction" = callPackage
@@ -238374,8 +238325,8 @@ self: {
238374238325 }:
238375238326 mkDerivation {
238376238327 pname = "taskell";
238377− version = "1.9.1.0";
238378− sha256 = "07hkkx71xb6k89ylis58lcv69ab1avggb4347ppzv2wxp6qljn5l";
238328+ version = "1.9.2.0";
238329+ sha256 = "1nm150ffvwmxid9jzg2r0yj995s39lsfd85rhpsbpbhprpx6wf4s";
238379238330 isLibrary = true;
238380238331 isExecutable = true;
238381238332 libraryHaskellDepends = [
@@ -238696,6 +238647,17 @@ self: {
238696238647 license = stdenv.lib.licenses.bsd3;
238697238648 }) {};
238698238649
238650+ "tasty-hunit-compat" = callPackage
238651+ ({ mkDerivation, base, HUnit, tasty, tasty-hunit }:
238652+ mkDerivation {
238653+ pname = "tasty-hunit-compat";
238654+ version = "0.1.0";
238655+ sha256 = "0894pi60ncyfcgvnpm39mcklbqbabgln19qvf9mjcphcnxvpxlvx";
238656+ libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
238657+ description = "Tasty integration with the existing HUnit package";
238658+ license = stdenv.lib.licenses.mpl20;
238659+ }) {};
238660+
238699238661 "tasty-integrate" = callPackage
238700238662 ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
238701238663 , deepseq, directory, either, haskell-src-exts
@@ -238815,24 +238777,6 @@ self: {
238815238777 }) {};
238816238778
238817238779 "tasty-lua" = callPackage
238818− ({ mkDerivation, base, bytestring, directory, file-embed, filepath
238819− , hslua, tasty, tasty-hunit, text
238820− }:
238821− mkDerivation {
238822− pname = "tasty-lua";
238823− version = "0.2.0.1";
238824− sha256 = "0xlj36rrhkx312h7smx6ay20rhlhxvw2ma2ckdnzv1pvmdn6p5qx";
238825− libraryHaskellDepends = [
238826− base bytestring file-embed hslua tasty text
238827− ];
238828− testHaskellDepends = [
238829− base directory filepath hslua tasty tasty-hunit
238830− ];
238831− description = "Write tests in Lua, integrate into tasty";
238832− license = stdenv.lib.licenses.mit;
238833− }) {};
238834−
238835− "tasty-lua_0_2_2" = callPackage
238836238780 ({ mkDerivation, base, bytestring, directory, file-embed, filepath
238837238781 , hslua, tasty, tasty-hunit, text
238838238782 }:
@@ -238848,7 +238792,6 @@ self: {
238848238792 ];
238849238793 description = "Write tests in Lua, integrate into tasty";
238850238794 license = stdenv.lib.licenses.mit;
238851− hydraPlatforms = stdenv.lib.platforms.none;
238852238795 }) {};
238853238796
238854238797 "tasty-program" = callPackage
@@ -238866,24 +238809,6 @@ self: {
238866238809 }) {};
238867238810
238868238811 "tasty-quickcheck" = callPackage
238869− ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
238870− , random, tagged, tasty, tasty-hunit
238871− }:
238872− mkDerivation {
238873− pname = "tasty-quickcheck";
238874− version = "0.10.1";
238875− sha256 = "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh";
238876− revision = "1";
238877− editedCabalFile = "1ms8ph2vp8x1icqiw468zlpsj4pii7xjm6g3k6ikkcy7cx3vnv4s";
238878− libraryHaskellDepends = [
238879− base optparse-applicative QuickCheck random tagged tasty
238880− ];
238881− testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
238882− description = "QuickCheck support for the Tasty test framework";
238883− license = stdenv.lib.licenses.mit;
238884− }) {};
238885−
238886− "tasty-quickcheck_0_10_1_1" = callPackage
238887238812 ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
238888238813 , random, tagged, tasty, tasty-hunit
238889238814 }:
@@ -238897,7 +238822,6 @@ self: {
238897238822 testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
238898238823 description = "QuickCheck support for the Tasty test framework";
238899238824 license = stdenv.lib.licenses.mit;
238900− hydraPlatforms = stdenv.lib.platforms.none;
238901238825 }) {};
238902238826
238903238827 "tasty-quickcheck-laws" = callPackage
@@ -242446,6 +242370,21 @@ self: {
242446242370 license = stdenv.lib.licenses.isc;
242447242371 }) {};
242448242372
242373+ "th-abstraction_0_3_2_0" = callPackage
242374+ ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
242375+ mkDerivation {
242376+ pname = "th-abstraction";
242377+ version = "0.3.2.0";
242378+ sha256 = "0ygbky8sk0nk4jyfjf6rj1ghv83rflcfcbsmnn7rnjzks0xg7zin";
242379+ libraryHaskellDepends = [
242380+ base containers ghc-prim template-haskell
242381+ ];
242382+ testHaskellDepends = [ base containers template-haskell ];
242383+ description = "Nicer interface for reified information about data types";
242384+ license = stdenv.lib.licenses.isc;
242385+ hydraPlatforms = stdenv.lib.platforms.none;
242386+ }) {};
242387+
242449242388 "th-alpha" = callPackage
242450242389 ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
242451242390 , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -243273,8 +243212,8 @@ self: {
243273243212 pname = "these-skinny";
243274243213 version = "0.7.4";
243275243214 sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr";
243276− revision = "1";
243277− editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c";
243215+ revision = "2";
243216+ editedCabalFile = "0q1izcz4kxrnl7sh0sxamxxq02mkxww88vr6v04pwj8alyhkd4z2";
243278243217 libraryHaskellDepends = [ base deepseq ];
243279243218 description = "A fork of the 'these' package without the dependency bloat";
243280243219 license = stdenv.lib.licenses.bsd3;
@@ -243947,8 +243886,8 @@ self: {
243947243886 }:
243948243887 mkDerivation {
243949243888 pname = "tidal";
243950− version = "1.4.7";
243951− sha256 = "01v6p4by2scn9wxyv14hal7pd7hkr7psr3kaj8xsnc924xpxmwak";
243889+ version = "1.4.8";
243890+ sha256 = "163ndsx6spicipsy52iqsrm97z6pfr4mm93d2dz7ffckbzsklmdb";
243952243891 enableSeparateDataOutput = true;
243953243892 libraryHaskellDepends = [
243954243893 base bifunctors bytestring clock colour containers deepseq hosc
@@ -250566,8 +250505,10 @@ self: {
250566250505 }:
250567250506 mkDerivation {
250568250507 pname = "type-natural";
250569− version = "0.8.2.0";
250570− sha256 = "1n5mavlnqjvyn1dr9iq16lyv0zhxbqab1rw7rl2i345kb1qpzini";
250508+ version = "0.8.3.1";
250509+ sha256 = "0nq54098jyrx6zz8vn0pw3kg9b6bwpxhnhxk3f5m18rpjjjjw4xs";
250510+ revision = "1";
250511+ editedCabalFile = "1nhv7wh3cgy5hhkgs3bgg3659qf3lpy8rm89ikbb0p69bbxdpmfa";
250571250512 libraryHaskellDepends = [
250572250513 base constraints equational-reasoning ghc-typelits-natnormalise
250573250514 ghc-typelits-presburger singletons template-haskell
@@ -254799,8 +254740,8 @@ self: {
254799254740 ({ mkDerivation, base, transformers }:
254800254741 mkDerivation {
254801254742 pname = "util";
254802− version = "0.1.17.0";
254803− sha256 = "1wyjxrnzianif6msk7qvib92lksy66hx4rkdb7sda0a4h704960c";
254743+ version = "0.1.17.1";
254744+ sha256 = "1qhx4r27sny25sykacf5xi5br4msq4335ghp5zc3fq0lii3866s7";
254804254745 libraryHaskellDepends = [ base transformers ];
254805254746 description = "Utilities";
254806254747 license = stdenv.lib.licenses.bsd3;
@@ -255129,6 +255070,29 @@ self: {
255129255070 broken = true;
255130255071 }) {};
255131255072
255073+ "uuid-bytes" = callPackage
255074+ ({ mkDerivation, base, byteslice, bytesmith, HUnit
255075+ , natural-arithmetic, primitive, small-bytearray-builder, tasty
255076+ , tasty-hunit, wide-word
255077+ }:
255078+ mkDerivation {
255079+ pname = "uuid-bytes";
255080+ version = "0.1.0.1";
255081+ sha256 = "0gzw6dn84xg0ndkhsnqpr1qn858cr0627hkdq0rijv932b0z4yvs";
255082+ libraryHaskellDepends = [
255083+ base byteslice bytesmith natural-arithmetic primitive
255084+ small-bytearray-builder wide-word
255085+ ];
255086+ testHaskellDepends = [
255087+ base byteslice HUnit natural-arithmetic primitive tasty tasty-hunit
255088+ wide-word
255089+ ];
255090+ description = "UUID parsing using byteverse packages";
255091+ license = stdenv.lib.licenses.mit;
255092+ hydraPlatforms = stdenv.lib.platforms.none;
255093+ broken = true;
255094+ }) {};
255095+
255132255096 "uuid-crypto" = callPackage
255133255097 ({ mkDerivation, base, binary, bytestring, cryptoids
255134255098 , cryptoids-class, cryptoids-types, exceptions, uuid
@@ -256344,20 +256308,17 @@ self: {
256344256308
256345256309 "vector" = callPackage
256346256310 ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
256347− , primitive, QuickCheck, random, template-haskell, test-framework
256348− , test-framework-hunit, test-framework-quickcheck2, transformers
256311+ , primitive, QuickCheck, random, semigroups, tasty, tasty-hunit
256312+ , tasty-quickcheck, template-haskell, transformers
256349256313 }:
256350256314 mkDerivation {
256351256315 pname = "vector";
256352− version = "0.12.0.3";
256353− sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq";
256354− revision = "2";
256355− editedCabalFile = "1kjs6jnbxziv1q0md2jiqic0r19ry8xlg7wdr8b52rz7yjyb08hl";
256316+ version = "0.12.1.2";
256317+ sha256 = "1g8i806ph9l789pv2k665bbxlmsbwfwzml1mi9xv683g7xl2fviv";
256356256318 libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
256357256319 testHaskellDepends = [
256358− base base-orphans HUnit primitive QuickCheck random
256359− template-haskell test-framework test-framework-hunit
256360− test-framework-quickcheck2 transformers
256320+ base base-orphans HUnit primitive QuickCheck random semigroups
256321+ tasty tasty-hunit tasty-quickcheck template-haskell transformers
256361256322 ];
256362256323 description = "Efficient Arrays";
256363256324 license = stdenv.lib.licenses.bsd3;
@@ -257115,24 +257076,6 @@ self: {
257115257076 }) {};
257116257077
257117257078 "versions" = callPackage
257118− ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
257119− , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
257120− , tasty-quickcheck, text
257121− }:
257122− mkDerivation {
257123− pname = "versions";
257124− version = "3.5.2";
257125− sha256 = "0a2ymd7wmpakcrm1fz9xwmjqlka7jmd8kb6385frd36nbi9bx78h";
257126− libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
257127− testHaskellDepends = [
257128− base base-prelude checkers megaparsec microlens QuickCheck tasty
257129− tasty-hunit tasty-quickcheck text
257130− ];
257131− description = "Types and parsers for software version numbers";
257132− license = stdenv.lib.licenses.bsd3;
257133− }) {};
257134−
257135− "versions_3_5_3" = callPackage
257136257079 ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
257137257080 , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
257138257081 , tasty-quickcheck, text
@@ -257148,7 +257091,6 @@ self: {
257148257091 ];
257149257092 description = "Types and parsers for software version numbers";
257150257093 license = stdenv.lib.licenses.bsd3;
257151− hydraPlatforms = stdenv.lib.platforms.none;
257152257094 }) {};
257153257095
257154257096 "vflow-types" = callPackage
@@ -257181,6 +257123,8 @@ self: {
257181257123 pname = "vformat";
257182257124 version = "0.14.1.0";
257183257125 sha256 = "0wg419mqdqsi6msgy4k7jgqdqba96pmv58dpyd6ar6hq7b90na69";
257126+ revision = "1";
257127+ editedCabalFile = "074y0nkygj8klkpm3rpdp7z2yj9np9y6rzhc7i62j0mykd27h8hq";
257184257128 libraryHaskellDepends = [
257185257129 base containers exceptions template-haskell
257186257130 ];
@@ -257199,6 +257143,8 @@ self: {
257199257143 pname = "vformat-aeson";
257200257144 version = "0.1.0.1";
257201257145 sha256 = "1cj3zp5n1j86jds906r9yrhanl8xq08gk97x6i64d651pry4h11v";
257146+ revision = "1";
257147+ editedCabalFile = "1p85qlv9w11mqybcf81xix0lhbgc2bzy9gw83ywci5kmd1s7a2a5";
257202257148 libraryHaskellDepends = [
257203257149 aeson base bytestring scientific text unordered-containers vector
257204257150 vformat
@@ -257217,6 +257163,8 @@ self: {
257217257163 pname = "vformat-time";
257218257164 version = "0.1.0.0";
257219257165 sha256 = "0s3b9ryyzmvy1fpxdnxdgrpi5faz67r8immm30pv6njy741k1l36";
257166+ revision = "1";
257167+ editedCabalFile = "0i11kkr8xwrffqz6jb68xfgvsbdkfxzxmw9k1bjc42x9hidgxv47";
257220257168 libraryHaskellDepends = [ base time vformat ];
257221257169 testHaskellDepends = [ base time vformat ];
257222257170 description = "Extend vformat to time datatypes";
@@ -259041,6 +258989,8 @@ self: {
259041258989 pname = "wai-middleware-auth";
259042258990 version = "0.1.2.1";
259043258991 sha256 = "0x3x3vc2l7glvfv6xcmqq0bw4mm8w2l577zx6qhx4399b03j56a1";
258992+ revision = "1";
258993+ editedCabalFile = "06pd7qk160m17nn3v61hmcnkfwm5qy6bjr1yhx4s2vsqyqvxgbaw";
259044258994 isLibrary = true;
259045258995 isExecutable = true;
259046258996 libraryHaskellDepends = [
@@ -259071,6 +259021,8 @@ self: {
259071259021 pname = "wai-middleware-auth";
259072259022 version = "0.2.1.0";
259073259023 sha256 = "16gm0r4jlmzx5qd4s03whqlc8siy139fwrb6q26a053c85n5lw0f";
259024+ revision = "1";
259025+ editedCabalFile = "14aicx9vvp5p77hxmx0zqmqmz4qgv7adr7rsvxy76k0rszz8s8d6";
259074259026 isLibrary = true;
259075259027 isExecutable = true;
259076259028 libraryHaskellDepends = [
@@ -262642,8 +262594,8 @@ self: {
262642262594 }:
262643262595 mkDerivation {
262644262596 pname = "withdependencies";
262645− version = "0.2.5";
262646− sha256 = "13xdcn9fp1nc5378vmjbjwpw4n19bnnfrgr729yh5s366f2cfiv1";
262597+ version = "0.3.0";
262598+ sha256 = "1hjld3ndafnaxwx1c6s88dc3bimbc5vwfdf6lcsq22apzh1gmdm6";
262647262599 libraryHaskellDepends = [
262648262600 base conduit containers mtl profunctors
262649262601 ];
@@ -262882,17 +262834,6 @@ self: {
262882262834 }) {};
262883262835
262884262836 "wl-pprint-text" = callPackage
262885− ({ mkDerivation, base, base-compat, text }:
262886− mkDerivation {
262887− pname = "wl-pprint-text";
262888− version = "1.2.0.0";
262889− sha256 = "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0";
262890− libraryHaskellDepends = [ base base-compat text ];
262891− description = "A Wadler/Leijen Pretty Printer for Text values";
262892− license = stdenv.lib.licenses.bsd3;
262893− }) {};
262894−
262895− "wl-pprint-text_1_2_0_1" = callPackage
262896262837 ({ mkDerivation, base, base-compat, text }:
262897262838 mkDerivation {
262898262839 pname = "wl-pprint-text";
@@ -262901,7 +262842,6 @@ self: {
262901262842 libraryHaskellDepends = [ base base-compat text ];
262902262843 description = "A Wadler/Leijen Pretty Printer for Text values";
262903262844 license = stdenv.lib.licenses.bsd3;
262904− hydraPlatforms = stdenv.lib.platforms.none;
262905262845 }) {};
262906262846
262907262847 "wlc-hs" = callPackage
@@ -267276,8 +267216,8 @@ self: {
267276267216 }:
267277267217 mkDerivation {
267278267218 pname = "yaml-light-lens";
267279− version = "0.3.3.5";
267280− sha256 = "11q6g00qycpr29n1yxpsgpailzk216pr3cfjy7pyrlvfpl4wx24f";
267219+ version = "0.3.3.6";
267220+ sha256 = "034dj7k0719lkhwgrz91wk2dfpxg4kvyj9ax7cpz9q6qa8jn0zp7";
267281267221 libraryHaskellDepends = [
267282267222 base bytestring bytestring-lexing containers lens yaml-light
267283267223 ];
@@ -267993,29 +267933,6 @@ self: {
267993267933 }) {};
267994267934
267995267935 "yesod" = callPackage
267996− ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
267997− , conduit, data-default-class, directory, fast-logger, monad-logger
267998− , resourcet, semigroups, shakespeare, streaming-commons
267999− , template-haskell, text, transformers, unix, unordered-containers
268000− , wai, wai-extra, wai-logger, warp, yaml, yesod-core, yesod-form
268001− , yesod-persistent
268002− }:
268003− mkDerivation {
268004− pname = "yesod";
268005− version = "1.6.0";
268006− sha256 = "0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a";
268007− libraryHaskellDepends = [
268008− aeson base blaze-html blaze-markup bytestring conduit
268009− data-default-class directory fast-logger monad-logger resourcet
268010− semigroups shakespeare streaming-commons template-haskell text
268011− transformers unix unordered-containers wai wai-extra wai-logger
268012− warp yaml yesod-core yesod-form yesod-persistent
268013− ];
268014− description = "Creation of type-safe, RESTful web applications";
268015− license = stdenv.lib.licenses.mit;
268016− }) {};
268017−
268018− "yesod_1_6_0_1" = callPackage
268019267936 ({ mkDerivation, aeson, base, bytestring, conduit
268020267937 , data-default-class, directory, fast-logger, monad-logger
268021267938 , semigroups, shakespeare, streaming-commons, template-haskell
@@ -268034,7 +267951,6 @@ self: {
268034267951 ];
268035267952 description = "Creation of type-safe, RESTful web applications";
268036267953 license = stdenv.lib.licenses.mit;
268037− hydraPlatforms = stdenv.lib.platforms.none;
268038267954 }) {};
268039267955
268040267956 "yesod-alerts" = callPackage
@@ -268116,34 +268032,6 @@ self: {
268116268032 }) {};
268117268033
268118268034 "yesod-auth" = callPackage
268119− ({ mkDerivation, aeson, authenticate, base, base16-bytestring
268120− , base64-bytestring, binary, blaze-builder, blaze-html
268121− , blaze-markup, bytestring, conduit, conduit-extra, containers
268122− , cryptonite, data-default, email-validate, file-embed, http-client
268123− , http-client-tls, http-conduit, http-types, memory, network-uri
268124− , nonce, persistent, random, safe, shakespeare, template-haskell
268125− , text, time, transformers, unliftio, unliftio-core
268126− , unordered-containers, wai, yesod-core, yesod-form
268127− , yesod-persistent
268128− }:
268129− mkDerivation {
268130− pname = "yesod-auth";
268131− version = "1.6.8";
268132− sha256 = "0d2nrzrqymbbp5hfwp7c6k6gr0vn6ladq0dl7wgwrybfx8nqgf65";
268133− libraryHaskellDepends = [
268134− aeson authenticate base base16-bytestring base64-bytestring binary
268135− blaze-builder blaze-html blaze-markup bytestring conduit
268136− conduit-extra containers cryptonite data-default email-validate
268137− file-embed http-client http-client-tls http-conduit http-types
268138− memory network-uri nonce persistent random safe shakespeare
268139− template-haskell text time transformers unliftio unliftio-core
268140− unordered-containers wai yesod-core yesod-form yesod-persistent
268141− ];
268142− description = "Authentication for Yesod";
268143− license = stdenv.lib.licenses.mit;
268144− }) {};
268145−
268146− "yesod-auth_1_6_8_1" = callPackage
268147268035 ({ mkDerivation, aeson, authenticate, base, base16-bytestring
268148268036 , base64-bytestring, binary, blaze-builder, blaze-html
268149268037 , blaze-markup, bytestring, conduit, conduit-extra, containers
@@ -268169,7 +268057,6 @@ self: {
268169268057 ];
268170268058 description = "Authentication for Yesod";
268171268059 license = stdenv.lib.licenses.mit;
268172− hydraPlatforms = stdenv.lib.platforms.none;
268173268060 }) {};
268174268061
268175268062 "yesod-auth-account" = callPackage
@@ -268718,43 +268605,6 @@ self: {
268718268605 }) {};
268719268606
268720268607 "yesod-core" = callPackage
268721− ({ mkDerivation, aeson, async, auto-update, base, blaze-html
268722− , blaze-markup, bytestring, case-insensitive, cereal, clientsession
268723− , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
268724− , gauge, hspec, hspec-expectations, http-types, HUnit, memory
268725− , monad-logger, mtl, network, parsec, path-pieces, primitive
268726− , random, resourcet, shakespeare, streaming-commons
268727− , template-haskell, text, time, transformers, unix-compat, unliftio
268728− , unordered-containers, vector, wai, wai-extra, wai-logger, warp
268729− , word8
268730− }:
268731− mkDerivation {
268732− pname = "yesod-core";
268733− version = "1.6.17";
268734− sha256 = "1i31xx9ili9r9il0mqpb04pgnq67rfsfr61pw9xmc163akgdfi4l";
268735− libraryHaskellDepends = [
268736− aeson auto-update base blaze-html blaze-markup bytestring
268737− case-insensitive cereal clientsession conduit conduit-extra
268738− containers cookie deepseq fast-logger http-types memory
268739− monad-logger mtl parsec path-pieces primitive random resourcet
268740− shakespeare template-haskell text time transformers unix-compat
268741− unliftio unordered-containers vector wai wai-extra wai-logger warp
268742− word8
268743− ];
268744− testHaskellDepends = [
268745− async base bytestring clientsession conduit conduit-extra
268746− containers cookie hspec hspec-expectations http-types HUnit network
268747− path-pieces random resourcet shakespeare streaming-commons
268748− template-haskell text transformers unliftio wai wai-extra warp
268749− ];
268750− benchmarkHaskellDepends = [
268751− base blaze-html bytestring gauge shakespeare text
268752− ];
268753− description = "Creation of type-safe, RESTful web applications";
268754− license = stdenv.lib.licenses.mit;
268755− }) {};
268756−
268757− "yesod-core_1_6_17_2" = callPackage
268758268608 ({ mkDerivation, aeson, async, auto-update, base, blaze-html
268759268609 , blaze-markup, bytestring, case-insensitive, cereal, clientsession
268760268610 , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -268789,7 +268639,6 @@ self: {
268789268639 ];
268790268640 description = "Creation of type-safe, RESTful web applications";
268791268641 license = stdenv.lib.licenses.mit;
268792− hydraPlatforms = stdenv.lib.platforms.none;
268793268642 }) {};
268794268643
268795268644 "yesod-crud" = callPackage
pkgs/development/interpreters/joker/default.nix+4−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "joker";
5− version = "0.14.0";
5+ version = "0.14.1";
66
77 src = fetchFromGitHub {
88 rev = "v${version}";
99 owner = "candid82";
1010 repo = "joker";
11− sha256 = "1b38alajxs89a9x3f3ldk1nlynp6j90qhl1m2c6561rsm41sqfz0";
11+ sha256 = "0da07fswj7x87njd9bi3gf8rzfyaq3zfcszgyb37w7q0ng4gg25n";
1212 };
1313
1414 modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
@@ -17,6 +17,8 @@ buildGoModule rec {
1717 go generate ./...
1818 '';
1919
20+ subPackages = [ "." ];
21+
2022 meta = with stdenv.lib; {
2123 homepage = https://github.com/candid82/joker;
2224 description = "A small Clojure interpreter and linter written in Go";
pkgs/development/libraries/cimg/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "cimg";
5− version = "2.8.0";
5+ version = "2.8.3";
66
77 src = fetchurl {
88 url = "http://cimg.eu/files/CImg_${version}.zip";
9− sha256 = "1nm9zpx9k3pb1p726ihw13y0d3y3xqafml7mhnx6wrkg9sfgs17n";
9+ sha256 = "0k7cra95v46i1q3rvklrxxhz3z10yql1ysvfrapcas0m4z6f94ld";
1010 };
1111
1212 nativeBuildInputs = [ unzip ];
pkgs/development/libraries/dnnl/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "dnnl";
5− version = "1.1.2";
5+ version = "1.2";
66
77 src = fetchFromGitHub {
88 owner = "intel";
99 repo = "mkl-dnn";
1010 rev = "v${version}";
11− sha256 = "150cdyfiw4izvzmbmdqidwadppb1qjmzhpaqjczm397ygi1m92l1";
11+ sha256 = "17xpdwqjfb2bq586gnk3hq94r06jd8pk6qfs703qqd7155fkbil9";
1212 };
1313
1414 # Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631
pkgs/development/libraries/libuchardet/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3";
1212 };
1313
14− buildInputs = [ cmake ];
14+ nativeBuildInputs = [ cmake ];
1515
1616 cmakeFlags = [
1717 "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
pkgs/development/libraries/science/math/m4ri/default.nix+2−2
@@ -4,14 +4,14 @@
44}:
55
66stdenv.mkDerivation rec {
7− version = "20200115";
7+ version = "20200125";
88 pname = "m4ri";
99
1010 src = fetchFromBitbucket {
1111 owner = "malb";
1212 repo = "m4ri";
1313 rev = "release-${version}";
14− sha256 = "1c17casrw6dvwj067kfcgyjjajfisz56s30wjv7fwaw55mqrny19";
14+ sha256 = "1dxgbv6zdyki3h61qlv7003wzhy6x14zmcaz9x19md1i7ng07w1k";
1515 };
1616
1717 doCheck = true;
pkgs/development/misc/h3/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "h3";
8− version = "3.6.2";
8+ version = "3.6.3";
99
1010 src = fetchFromGitHub {
1111 owner = "uber";
1212 repo = "h3";
1313 rev = "v${version}";
14− sha256 = "0mlv3jk0j340l0bhr3brxm3hbdcfmyp86h7d85537c81cl64y7kg";
14+ sha256 = "1zgq496m2pk2c1l0r1di0p39nxwza00kxzqa971qd4xgbrvd4w55";
1515 };
1616
1717 nativeBuildInputs = [ cmake ];
pkgs/development/mobile/cocoapods/Gemfile-beta.lock+7−7
@@ -12,10 +12,10 @@ GEM
1212 json (>= 1.5.1)
1313 atomos (0.1.3)
1414 claide (1.0.3)
15− cocoapods (1.9.0.beta.2)
15+ cocoapods (1.9.0.beta.3)
1616 activesupport (>= 4.0.2, < 5)
1717 claide (>= 1.0.2, < 2.0)
18− cocoapods-core (= 1.9.0.beta.2)
18+ cocoapods-core (= 1.9.0.beta.3)
1919 cocoapods-deintegrate (>= 1.0.3, < 2.0)
2020 cocoapods-downloader (>= 1.2.2, < 2.0)
2121 cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
3131 nap (~> 1.0)
3232 ruby-macho (~> 1.4)
3333 xcodeproj (>= 1.14.0, < 2.0)
34− cocoapods-core (1.9.0.beta.2)
34+ cocoapods-core (1.9.0.beta.3)
3535 activesupport (>= 4.0.2, < 6)
3636 algoliasearch (~> 1.0)
3737 concurrent-ruby (~> 1.1)
@@ -54,7 +54,7 @@ GEM
5454 escape (0.0.4)
5555 ethon (0.12.0)
5656 ffi (>= 1.3.0)
57− ffi (1.11.3)
57+ ffi (1.12.2)
5858 fourflusher (2.3.1)
5959 fuzzy_match (2.0.4)
6060 gh_inspector (1.1.3)
@@ -62,7 +62,7 @@ GEM
6262 i18n (0.9.5)
6363 concurrent-ruby (~> 1.0)
6464 json (2.3.0)
65− minitest (5.13.0)
65+ minitest (5.14.0)
6666 molinillo (0.6.6)
6767 nanaimo (0.2.6)
6868 nap (1.1.0)
@@ -71,9 +71,9 @@ GEM
7171 thread_safe (0.3.6)
7272 typhoeus (1.3.1)
7373 ethon (>= 0.9.0)
74− tzinfo (1.2.5)
74+ tzinfo (1.2.6)
7575 thread_safe (~> 0.1)
76− xcodeproj (1.14.0)
76+ xcodeproj (1.15.0)
7777 CFPropertyList (>= 2.3.3, < 4.0)
7878 atomos (~> 0.1.3)
7979 claide (>= 1.0.2, < 2.0)
pkgs/development/mobile/cocoapods/gemset-beta.nix+12−12
@@ -57,10 +57,10 @@
5757 platforms = [];
5858 source = {
5959 remotes = ["https://rubygems.org"];
60− sha256 = "0lx1h0i1rly9rnzl3szr0mws9b1l6ik1k84rcfwmhppfacc8bp15";
60+ sha256 = "0dd2a4m7axnqk2rj8piwprqrg91dp8gmyj2rala4viawfq0mj5mf";
6161 type = "gem";
6262 };
63− version = "1.9.0.beta.2";
63+ version = "1.9.0.beta.3";
6464 };
6565 cocoapods-core = {
6666 dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
@@ -68,10 +68,10 @@
6868 platforms = [];
6969 source = {
7070 remotes = ["https://rubygems.org"];
71− sha256 = "0h364ayikbicm6fy1faznwlnqnahqf330dnqjcb0vszqhxw0xq59";
71+ sha256 = "0pf54634zi03vbi2m7n1g6kj0k2azgk2pahh9p2mqx814wka99nr";
7272 type = "gem";
7373 };
74− version = "1.9.0.beta.2";
74+ version = "1.9.0.beta.3";
7575 };
7676 cocoapods-deintegrate = {
7777 groups = ["default"];
@@ -191,10 +191,10 @@
191191 platforms = [];
192192 source = {
193193 remotes = ["https://rubygems.org"];
194− sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd";
194+ sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
195195 type = "gem";
196196 };
197− version = "1.11.3";
197+ version = "1.12.2";
198198 };
199199 fourflusher = {
200200 groups = ["default"];
@@ -262,10 +262,10 @@
262262 platforms = [];
263263 source = {
264264 remotes = ["https://rubygems.org"];
265− sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
265+ sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
266266 type = "gem";
267267 };
268− version = "5.13.0";
268+ version = "5.14.0";
269269 };
270270 molinillo = {
271271 groups = ["default"];
@@ -344,10 +344,10 @@
344344 platforms = [];
345345 source = {
346346 remotes = ["https://rubygems.org"];
347− sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
347+ sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
348348 type = "gem";
349349 };
350− version = "1.2.5";
350+ version = "1.2.6";
351351 };
352352 xcodeproj = {
353353 dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
@@ -355,9 +355,9 @@
355355 platforms = [];
356356 source = {
357357 remotes = ["https://rubygems.org"];
358− sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb";
358+ sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z";
359359 type = "gem";
360360 };
361− version = "1.14.0";
361+ version = "1.15.0";
362362 };
363363}
pkgs/development/python-modules/fx2/default.nix+3−3
@@ -9,13 +9,13 @@
99
1010buildPythonPackage {
1111 pname = "fx2";
12− version = "unstable-2019-09-23";
12+ version = "unstable-2020-01-25";
1313
1414 src = fetchFromGitHub {
1515 owner = "whitequark";
1616 repo = "libfx2";
17− rev = "3adb4fc842f174b0686ed122c0309d68356edc11";
18− sha256 = "0b3zp50mschsxi2v3192dmnpw32gwblyl8aswlz9a0vx1qg3ibzn";
17+ rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e";
18+ sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg";
1919 };
2020
2121 nativeBuildInputs = [ sdcc ];
pkgs/development/python-modules/glasgow/default.nix+7−5
@@ -18,15 +18,15 @@
1818
1919buildPythonPackage rec {
2020 pname = "glasgow";
21− version = "unstable-2019-10-16";
21+ version = "unstable-2020-02-08";
2222 # python software/setup.py --version
23− realVersion = "0.1.dev1286+g${lib.substring 0 7 src.rev}";
23+ realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";
2424
2525 src = fetchFromGitHub {
2626 owner = "GlasgowEmbedded";
2727 repo = "glasgow";
28− rev = "4f968dbe6cf4e9d8e2d0a5163d82e996c24d5e30";
29− sha256 = "1b50n12dc0b3jmim5ywg7daq62k5j4wkgmwzk88ric5ri3b8dl2r";
28+ rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498";
29+ sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m";
3030 };
3131
3232 nativeBuildInputs = [ setuptools_scm sdcc ];
@@ -44,6 +44,8 @@ buildPythonPackage rec {
4444
4545 checkInputs = [ yosys icestorm nextpnr ];
4646
47+ enableParallelBuilding = true;
48+
4749 preBuild = ''
4850 make -C firmware LIBFX2=${fx2}/share/libfx2
4951 cp firmware/glasgow.ihex software/glasgow
@@ -55,7 +57,7 @@ buildPythonPackage rec {
5557 doInstallCheck = false;
5658
5759 checkPhase = ''
58− python -m unittest discover
60+ python -W ignore::DeprecationWarning test.py
5961 '';
6062
6163 makeWrapperArgs = [
pkgs/development/python-modules/nmigen-boards/default.nix+7−7
@@ -8,15 +8,15 @@
88
99buildPythonPackage rec {
1010 pname = "nmigen-boards";
11− version = "unstable-2019-10-13";
11+ version = "unstable-2020-02-06";
1212 # python setup.py --version
13− realVersion = "0.1.dev79+g${lib.substring 0 7 src.rev}";
13+ realVersion = "0.1.dev92+g${lib.substring 0 7 src.rev}";
1414
1515 src = fetchFromGitHub {
16− owner = "m-labs";
16+ owner = "nmigen";
1717 repo = "nmigen-boards";
18− rev = "835c175d7cf9d143aea2c7dbc0c870ede655cfc2";
19− sha256 = "1mbxgfv6k9i3668lr1b3hrvial2vznvgn4ckjzc36hhizp47ypzw";
18+ rev = "f37fe0295035db5f1bf82ed086b2eb349ab3a530";
19+ sha256 = "16112ahil100anfwggj64nyrj3pf7mngwrjyqyhf2ggxx9ir24cc";
2020 };
2121
2222 nativeBuildInputs = [ setuptools_scm ];
@@ -28,8 +28,8 @@ buildPythonPackage rec {
2828
2929 meta = with lib; {
3030 description = "Board and connector definitions for nMigen";
31− homepage = https://github.com/m-labs/nmigen-boards;
32− license = licenses.bsd0;
31+ homepage = https://github.com/nmigen/nmigen-boards;
32+ license = licenses.bsd2;
3333 maintainers = with maintainers; [ emily ];
3434 };
3535}
pkgs/development/python-modules/nmigen-soc/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, nmigen
5+, setuptools
6+, setuptools_scm
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "nmigen-soc";
11+ version = "unstable-2020-02-08";
12+ # python setup.py --version
13+ realVersion = "0.1.dev24+g${lib.substring 0 7 src.rev}";
14+
15+ src = fetchFromGitHub {
16+ owner = "nmigen";
17+ repo = "nmigen-soc";
18+ rev = "f1b009c7e075bca461d10ec963a7eaa3bf4dfc14";
19+ sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad";
20+ };
21+
22+ nativeBuildInputs = [ setuptools_scm ];
23+ propagatedBuildInputs = [ setuptools nmigen ];
24+
25+ preBuild = ''
26+ export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
27+ '';
28+
29+ meta = with lib; {
30+ description = "System on Chip toolkit for nMigen";
31+ homepage = https://github.com/nmigen/nmigen-soc;
32+ license = licenses.bsd2;
33+ maintainers = with maintainers; [ emily ];
34+ };
35+}
pkgs/development/python-modules/nmigen/default.nix+8−9
@@ -5,7 +5,6 @@
55, setuptools
66, setuptools_scm
77, pyvcd
8−, bitarray
98, jinja2
109
1110# for tests
@@ -16,22 +15,22 @@
1615
1716buildPythonPackage rec {
1817 pname = "nmigen";
19− version = "unstable-2019-10-17";
18+ version = "unstable-2019-02-08";
2019 # python setup.py --version
21− realVersion = "0.1.rc2.dev5+g${lib.substring 0 7 src.rev}";
20+ realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}";
2221
2322 src = fetchFromGitHub {
24− owner = "m-labs";
23+ owner = "nmigen";
2524 repo = "nmigen";
26− rev = "9fba5ccb513cfbd53f884b1efca699352d2471b9";
27− sha256 = "02bjry4sqjsrhl0s42zl1zl06gk5na9i6br6vmz7fvxic29vl83v";
25+ rev = "66f4510c4465be5d0763d7835770553434e4ee91";
26+ sha256 = "19y39c4ywckm4yzrpjzcdl9pqy9d1sf1zsb4zpzajpmnfqccc3b0";
2827 };
2928
3029 disabled = pythonOlder "3.6";
3130
3231 nativeBuildInputs = [ setuptools_scm ];
3332
34− propagatedBuildInputs = [ setuptools pyvcd bitarray jinja2 ];
33+ propagatedBuildInputs = [ setuptools pyvcd jinja2 ];
3534
3635 checkInputs = [ yosys symbiyosys yices ];
3736
@@ -41,8 +40,8 @@ buildPythonPackage rec {
4140
4241 meta = with lib; {
4342 description = "A refreshed Python toolbox for building complex digital hardware";
44− homepage = https://github.com/m-labs/nmigen;
45− license = licenses.bsd0;
43+ homepage = https://github.com/nmigen/nmigen;
44+ license = licenses.bsd2;
4645 maintainers = with maintainers; [ emily ];
4746 };
4847}
pkgs/development/python-modules/pyvcd/default.nix+6−4
@@ -3,15 +3,16 @@
33, fetchPypi
44, setuptools_scm
55, six
6−, pytest }:
6+, pytest
7+}:
78
89buildPythonPackage rec {
9− version = "0.1.6";
10+ version = "0.1.7";
1011 pname = "pyvcd";
1112
1213 src = fetchPypi {
1314 inherit pname version;
14− sha256 = "285fcd96c3ee482e7b222bdd01d5dd19c2f5a0ad9b8e950baa98d386a2758c8f";
15+ sha256 = "1ixpdl0qiads81h8s9h9r9z0cyc9dlmvi01nfjggxixvbb17305y";
1516 };
1617
1718 buildInputs = [ setuptools_scm ];
@@ -26,7 +27,8 @@ buildPythonPackage rec {
2627 meta = with lib; {
2728 description = "Python package for writing Value Change Dump (VCD) files";
2829 homepage = https://github.com/SanDisk-Open-Source/pyvcd;
30+ changelog = "https://github.com/SanDisk-Open-Source/pyvcd/blob/${version}/CHANGELOG.rst";
2931 license = licenses.mit;
30− maintainers = [ maintainers.sb0 ];
32+ maintainers = [ maintainers.sb0 maintainers.emily ];
3133 };
3234}
pkgs/development/python-modules/sipsimple/default.nix+3
@@ -25,7 +25,10 @@ buildPythonPackage rec {
2525 };
2626
2727 preConfigure = ''
28+ # TODO: Executable bits are set by upstream with the next release
29+ # see AGProjects/python-sipsimple/commit/a36d66cf758afb43c59f7ac48b193c4148eb1848
2830 chmod +x ./deps/pjsip/configure ./deps/pjsip/aconfigure
31+
2932 export LD=$CC
3033 '';
3134
pkgs/development/tools/analysis/checkstyle/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, makeWrapper, jre }:
22
33stdenv.mkDerivation rec {
4− version = "8.28";
4+ version = "8.29";
55 pname = "checkstyle";
66
77 src = fetchurl {
88 url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
9− sha256 = "014jsj6pbpf3y4c1vx606f82c7pic6q4lcsbl7wwqn67dr0g0v1m";
9+ sha256 = "1rbipf4031inv34ci0rczz7dipi3b12cpn45h949i095gdh37pgh";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/development/tools/analysis/codeql/default.nix+2−2
@@ -12,7 +12,7 @@
1212
1313stdenv.mkDerivation rec {
1414 pname = "codeql";
15− version = "2.0.0";
15+ version = "2.0.2";
1616
1717 dontConfigure = true;
1818 dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 src = fetchzip {
2222 url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
23− sha256 = "1v6wzjdhfws77fr5r15s03f1ipzc1gh7sl8gvw1fb4pplpa2d08s";
23+ sha256 = "11siv8qmj4arl6qxks7bqnhx5669r3kxqcxq37ai7sf9f7v78k1i";
2424 };
2525
2626 nativeBuildInputs = [
pkgs/development/tools/analysis/randoop/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, unzip }:
22
33stdenv.mkDerivation rec {
4− version = "3.1.5";
4+ version = "4.2.1";
55 pname = "randoop";
66
77 src = fetchurl {
88 url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
9− sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx";
9+ sha256 = "0sq6zyagb8qrj629rq7amzi0dnm6q00mll6gd5yx1nqdnjbfb4qd";
1010 };
1111
1212 buildInputs = [ unzip ];
pkgs/development/tools/build-managers/sbt/default.nix+2−2
@@ -2,14 +2,14 @@
22
33stdenv.mkDerivation rec {
44 pname = "sbt";
5− version = "1.3.7";
5+ version = "1.3.8";
66
77 src = fetchurl {
88 urls = [
99 "https://piccolo.link/sbt-${version}.tgz"
1010 "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
1111 ];
12− sha256 = "054qfbvhkh1w66f2nvsv1mvrkjc9qddzsnfrhmaqx79gglxllgc1";
12+ sha256 = "0pcrbpsvccyxdwc7f8h87rkn0kalar0iypnh3gygw4c0fm4yvci7";
1313 };
1414
1515 patchPhase = ''
pkgs/development/tools/buildah/default.nix+4−4
@@ -1,16 +1,16 @@
11{ stdenv, buildGoPackage, fetchFromGitHub
2−, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
2+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux, libseccomp
33}:
44
55buildGoPackage rec {
66 pname = "buildah";
7− version = "1.13.2";
7+ version = "1.14.0";
88
99 src = fetchFromGitHub {
1010 owner = "containers";
1111 repo = "buildah";
1212 rev = "v${version}";
13− sha256 = "0860ynv93gbicpczfapvrd558dzbqicy9rv4ivyjhb6yyfgy4qai";
13+ sha256 = "0nbcrhfd0c14d0m9a4mkd01jxk5i503z38kv2qfz5cvfghx517qq";
1414 };
1515
1616 outputs = [ "bin" "man" "out" ];
@@ -19,7 +19,7 @@ buildGoPackage rec {
1919 excludedPackages = [ "tests" ];
2020
2121 nativeBuildInputs = [ pkgconfig ];
22− buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
22+ buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ];
2323
2424 patches = [ ./disable-go-module-mode.patch ];
2525
pkgs/development/tools/flyway/default.nix+2−2
@@ -1,13 +1,13 @@
11{ stdenv, fetchurl, jre_headless, makeWrapper }:
22 let
3− version = "6.1.3";
3+ version = "6.2.2";
44 in
55 stdenv.mkDerivation {
66 pname = "flyway";
77 inherit version;
88 src = fetchurl {
99 url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
10− sha256 = "0hd5gkfjhxb1ny8y0pqn7vs34bqk4w5k7vcygd6iz1d57q0giwp6";
10+ sha256 = "09x62dbid9gx26q8m7gz4b21kinsx1ag3961krbxks28ihmwlm6a";
1111 };
1212 nativeBuildInputs = [ makeWrapper ];
1313 dontBuild = true;
pkgs/development/tools/git-quick-stats/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchFromGitHub }:
22stdenv.mkDerivation rec {
33 pname = "git-quick-stats";
4− version = "2.0.12";
4+ version = "2.0.13";
55 src = fetchFromGitHub {
66 repo = "git-quick-stats";
77 owner = "arzzen";
88 rev = version;
9− sha256 = "1diisgz8xc2ghsfdz3vh6z4vn13vvb9gf0i6qml0a46a5fqf32zb";
9+ sha256 = "0j0a4y50wlwban40lj8y89ch4xnmm1ag8klkl8smbrn972d5d0cy";
1010 };
1111 PREFIX = builtins.placeholder "out";
1212 meta = with stdenv.lib; {
pkgs/development/tools/icestorm/default.nix+7−5
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
1313 pname = "icestorm";
1414 version = "2019.09.13";
1515
16− pythonPkg = if usePyPy then pypy3 else python3;
17− pythonInterp = pythonPkg.interpreter;
16+ passthru = rec {
17+ pythonPkg = if usePyPy then pypy3 else python3;
18+ pythonInterp = pythonPkg.interpreter;
19+ };
1820
1921 src = fetchFromGitHub {
2022 owner = "cliffordwolf";
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
2426 };
2527
2628 nativeBuildInputs = [ pkgconfig ];
27− buildInputs = [ pythonPkg libftdi1 ];
29+ buildInputs = [ passthru.pythonPkg libftdi1 ];
2830 makeFlags = [ "PREFIX=$(out)" ];
2931
3032 enableParallelBuilding = true;
@@ -39,12 +41,12 @@ stdenv.mkDerivation rec {
3941 --replace /usr/local/share "$out/share"
4042
4143 for x in icefuzz/Makefile icebox/Makefile icetime/Makefile; do
42− substituteInPlace "$x" --replace python3 "${pythonInterp}"
44+ substituteInPlace "$x" --replace python3 "${passthru.pythonInterp}"
4345 done
4446
4547 for x in $(find . -type f -iname '*.py'); do
4648 substituteInPlace "$x" \
47− --replace '/usr/bin/env python3' '${pythonInterp}'
49+ --replace '/usr/bin/env python3' '${passthru.pythonInterp}'
4850 done
4951 '';
5052
pkgs/development/tools/misc/clojure-lsp/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "clojure-lsp";
5− version = "20200117T215443";
5+ version = "20200121T234305";
66
77 src = fetchurl {
88 url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
9− sha256 = "0ccn3700lam5m5yh5hdcm6wkazyr3dhvhyc9bc08basjwk09lfkp";
9+ sha256 = "04598vxay85q2blr49xh4pb58i4rsgjbznnn2cszcqgyzh05fs4y";
1010 };
1111
1212 dontUnpack = true;
pkgs/development/tools/misc/hydra/default.nix+3−3
@@ -72,15 +72,15 @@ let
7272 };
7373in stdenv.mkDerivation rec {
7474 pname = "hydra";
75− version = "2019-11-13";
75+ version = "2020-02-06";
7676
7777 inherit stdenv;
7878
7979 src = fetchFromGitHub {
8080 owner = "NixOS";
8181 repo = pname;
82− rev = "20dd0bbe6a90d9066e635ee82e98efec23b17e51";
83− sha256 = "06chiaa7p54zxngmy2q3ps7bbiqpdv9h2rfmprh83qz36xps9rs2";
82+ rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc";
83+ sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick";
8484 };
8585
8686 buildInputs =
pkgs/development/tools/misc/tinyprog/default.nix+3−3
@@ -6,13 +6,13 @@
66with python3Packages; buildPythonApplication rec {
77 pname = "tinyprog";
88 # `python setup.py --version` from repo checkout
9− version = "1.0.24.dev99+ga77f828";
9+ version = "1.0.24.dev114+g${lib.substring 0 7 src.rev}";
1010
1111 src = fetchFromGitHub {
1212 owner = "tinyfpga";
1313 repo = "TinyFPGA-Bootloader";
14− rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7";
15− sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q";
14+ rev = "97f6353540bf7c0d27f5612f202b48f41da75299";
15+ sha256 = "0zbrvvb957z2lwbfd39ixqdsnd2w4wfjirwkqdrqm27bjz308731";
1616 };
1717
1818 sourceRoot = "source/programmer";
pkgs/development/tools/skopeo/default.nix+5−5
@@ -1,17 +1,17 @@
11{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
2−, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux
2+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux
33, go-md2man }:
44
55with stdenv.lib;
66
77let
8− version = "0.1.40";
8+ version = "0.1.41";
99
1010 src = fetchFromGitHub {
1111 rev = "v${version}";
1212 owner = "containers";
1313 repo = "skopeo";
14− sha256 = "1bagirzdzjhicn5dr691092ac3q6lhz3xngjzgqiqkxnvpz7p6cn";
14+ sha256 = "0aqw17irj2wn4a8g9hzfm5z5azqq33z6r1dbg1gyn2c8qxy1vfxs";
1515 };
1616
1717 defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
@@ -29,7 +29,7 @@ buildGoPackage {
2929 excludedPackages = "integration";
3030
3131 nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
32− buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ];
32+ buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ];
3333
3434 buildFlagsArray = ''
3535 -ldflags=
@@ -51,7 +51,7 @@ buildGoPackage {
5151
5252 meta = {
5353 description = "A command line utility for various operations on container images and image repositories";
54− homepage = https://github.com/projectatomic/skopeo;
54+ homepage = "https://github.com/containers/skopeo";
5555 maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ];
5656 license = stdenv.lib.licenses.asl20;
5757 };
pkgs/development/tools/trellis/default.nix+13−8
@@ -8,24 +8,24 @@ let
88in
99stdenv.mkDerivation rec {
1010 pname = "trellis";
11− version = "2019.10.13";
11+ version = "2020.02.04";
1212 # git describe --tags
1313 realVersion = with stdenv.lib; with builtins;
14− "1.0-95-g${substring 0 7 (elemAt srcs 0).rev}";
14+ "1.0-130-g${substring 0 7 (elemAt srcs 0).rev}";
1515
1616 srcs = [
1717 (fetchFromGitHub {
1818 owner = "SymbiFlow";
1919 repo = "prjtrellis";
20− rev = "e2e10bfdfaa29fed5d19e83dc7460be9880f5af4";
21− sha256 = "0l59nliv75rdxnajl2plilib0r0bzbr3qqzc88cdal841x1m0izs";
20+ rev = "4e4b95c8e03583d48d76d1229f9c7825e2ee5be1";
21+ sha256 = "02kg48393bjiys56r62b4ks2xvfarw9phi5bips2xsnj9c99pmg0";
2222 name = "trellis";
2323 })
2424 (fetchFromGitHub {
2525 owner = "SymbiFlow";
2626 repo = "prjtrellis-db";
27− rev = "5b5bb70bae13e6b8c971b4b2d26931f4a64b51bc";
28− sha256 = "1fi963zdny3gxdvq564037qs22i7b4y7mxc3yij2a1ww8rzrnpdj";
27+ rev = "717478b757a702bbc7e3e11a5fbecee2a64f7922";
28+ sha256 = "0q4j8qz3m2hissn2a82ck542cx62bp4f0wwzl3g22yv59i13yg83";
2929 name = "trellis-database";
3030 })
3131 ];
@@ -33,7 +33,12 @@ stdenv.mkDerivation rec {
3333
3434 buildInputs = [ boostWithPython3 ];
3535 nativeBuildInputs = [ cmake python3 ];
36− cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" ];
36+ cmakeFlags = [
37+ "-DCURRENT_GIT_VERSION=${realVersion}"
38+ # TODO: should this be in stdenv instead?
39+ "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
40+ ];
41+ enableParallelBuilding = true;
3742
3843 preConfigure = with builtins; ''
3944 rmdir database && ln -sfv ${elemAt srcs 1} ./database
@@ -50,7 +55,7 @@ stdenv.mkDerivation rec {
5055 to provide sufficient information to develop a free and
5156 open Verilog to bitstream toolchain for these devices.
5257 '';
53− homepage = https://github.com/symbiflow/prjtrellis;
58+ homepage = https://github.com/SymbiFlow/prjtrellis;
5459 license = stdenv.lib.licenses.isc;
5560 maintainers = with maintainers; [ q3k thoughtpolice emily ];
5661 platforms = stdenv.lib.platforms.all;
pkgs/development/tools/yarn/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "yarn";
5− version = "1.21.1";
5+ version = "1.22.0";
66
77 src = fetchzip {
88 url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
9− sha256 = "1yw3v62a6309f9hr189870i9jw2a15pkians1nnfjqczzh7r5pih";
9+ sha256 = "0hbsdbrqx5xhr171ik862v51xwjzbfncic92pgbnhnlmxy2y974x";
1010 };
1111
1212 buildInputs = [ nodejs ];
pkgs/development/web/nodejs/nodejs.nix+4−4
@@ -61,18 +61,18 @@ in
6161 configureFlags = let
6262 isCross = stdenv.hostPlatform != stdenv.buildPlatform;
6363 host = stdenv.hostPlatform.platform;
64− isArm = stdenv.hostPlatform.isArm;
64+ isAarch32 = stdenv.hostPlatform.isAarch32;
6565 in sharedConfigureFlags ++ [
6666 "--without-dtrace"
6767 ] ++ (optionals isCross [
6868 "--cross-compiling"
6969 "--without-intl"
7070 "--without-snapshot"
71− ]) ++ (optionals (isCross && isArm && hasAttr "fpu" host.gcc) [
71+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
7272 "--with-arm-fpu=${host.gcc.fpu}"
73− ]) ++ (optionals (isCross && isArm && hasAttr "float-abi" host.gcc) [
73+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
7474 "--with-arm-float-abi=${host.gcc.float-abi}"
75− ]) ++ (optionals (isCross && isArm) [
75+ ]) ++ (optionals (isCross && isAarch32) [
7676 "--dest-cpu=arm"
7777 ]) ++ extraConfigFlags;
7878
pkgs/games/gzdoom/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "gzdoom";
7− version = "4.3.1";
7+ version = "4.3.3";
88
99 src = fetchFromGitHub {
1010 owner = "coelckers";
1111 repo = "gzdoom";
1212 rev = "g${version}";
13− sha256 = "1fpdwgm6qx66q1kqg1x32lcm61hk3a033lhagk819kicdsib90b7";
13+ sha256 = "1c4vhnvvwy1rs8xm01kqd486h5xsiccwkf95fjx7912zr49yalks";
1414 };
1515
1616 nativeBuildInputs = [ cmake makeWrapper ];
pkgs/misc/emulators/fceux/default.nix+9−5
@@ -1,11 +1,14 @@
1−{stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}:
1+{stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}:
22
33stdenv.mkDerivation {
4− name = "fceux-2.2.3";
4+ pname = "fceux-unstable";
5+ version = "2020-01-29";
56
6− src = fetchurl {
7− url = mirror://sourceforge/fceultra/Source%20Code/2.2.3%20src/fceux-2.2.3.src.tar.gz;
8− sha256 = "0gl2i3qdmcm7v9m5kpfz98w05d8m33990jiwka043ya7lflxvrjb";
7+ src = fetchFromGitHub {
8+ owner = "TASVideos";
9+ repo = "fceux";
10+ rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337";
11+ sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992";
912 };
1013
1114 nativeBuildInputs = [ pkgconfig scons ];
@@ -30,6 +33,7 @@ stdenv.mkDerivation {
3033 meta = {
3134 description = "A Nintendo Entertainment System (NES) Emulator";
3235 license = stdenv.lib.licenses.gpl2;
36+ maintainers = [ stdenv.lib.maintainers.scubed2 ];
3337 homepage = http://www.fceux.com/;
3438 platforms = stdenv.lib.platforms.linux;
3539 };
pkgs/misc/frescobaldi/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonApplication rec {
44 name = "frescobaldi-${version}";
5− version = "3.1";
5+ version = "3.1.1";
66
77 src = fetchFromGitHub {
88 owner = "wbsoft";
99 repo = "frescobaldi";
1010 rev = "v${version}";
11− sha256 = "0sv6dc1l34rrhfbn1wqkl9zs9hiacmmbviw87d0d03987s1iirb1";
11+ sha256 = "07hjlq29npasn2bsb3qrzr1gikyvcc85avx0sxybfih329bvjk03";
1212 };
1313
1414 propagatedBuildInputs = with python3Packages; [
pkgs/os-specific/linux/kernel/common-config.nix+1−1
@@ -114,7 +114,7 @@ let
114114 CLS_U32_PERF = yes;
115115 CLS_U32_MARK = yes;
116116 BPF_JIT = whenPlatformHasEBPFJit yes;
117− BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit yes;
117+ BPF_JIT_ALWAYS_ON = no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304
118118 HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes;
119119 BPF_STREAM_PARSER = whenAtLeast "4.19" yes;
120120 XDP_SOCKETS = whenAtLeast "4.19" yes;
pkgs/os-specific/linux/mcelog/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "mcelog";
5− version = "167";
5+ version = "168";
66
77 src = fetchFromGitHub {
88 owner = "andikleen";
99 repo = "mcelog";
1010 rev = "v${version}";
11− sha256 = "0vkkqri3x11p7wz8z8rym4v637qpvw7lj6v40sx7sgh1g97ja9iy";
11+ sha256 = "0mcmmjvvc80nk20n4dknimv0jzvdkj1ajgyq33b2i4v6xq0bz1pb";
1212 };
1313
1414 postPatch = ''
pkgs/servers/http/lighttpd/default.nix+2−2
@@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null;
1515assert enableExtendedAttrs -> attr != null;
1616
1717stdenv.mkDerivation rec {
18− name = "lighttpd-1.4.54";
18+ name = "lighttpd-1.4.55";
1919
2020 src = fetchurl {
2121 url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
22− sha256 = "08c7kbdfq915dzzqcghwacrgia197hd1w66knvydi5ja4picq56g";
22+ sha256 = "09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va";
2323 };
2424
2525 postPatch = ''
pkgs/servers/mpd/default.nix+2−2
@@ -102,13 +102,13 @@ let
102102
103103 in stdenv.mkDerivation rec {
104104 pname = "mpd";
105− version = "0.21.18";
105+ version = "0.21.19";
106106
107107 src = fetchFromGitHub {
108108 owner = "MusicPlayerDaemon";
109109 repo = "MPD";
110110 rev = "v${version}";
111− sha256 = "04kzdxigg6yhf5km66hxk6y8n7gl72bxnv2bc5zy274fzqf4cy9p";
111+ sha256 = "0awfnhygasww2xbxnc3a81hv2kbw3v3mblav6wjvzz25qipv19dq";
112112 };
113113
114114 buildInputs = [ glib boost ]
pkgs/servers/search/groonga/default.nix+2−2
@@ -7,11 +7,11 @@
77stdenv.mkDerivation rec {
88
99 pname = "groonga";
10− version = "9.1.1";
10+ version = "9.1.2";
1111
1212 src = fetchurl {
1313 url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
14− sha256 = "16i5bmypawxjac6g808qgr0z3rvla6g6dr586rmwl7sbq0z2nr82";
14+ sha256 = "0zj9zribkg4x6c6175pwl4i6jpxg045bca1ywfrfcdsxkjllvk7g";
1515 };
1616
1717 buildInputs = with stdenv.lib;
pkgs/stdenv/generic/default.nix−3
@@ -137,9 +137,6 @@ let
137137 isi686 isx86_32 isx86_64
138138 is32bit is64bit
139139 isAarch32 isAarch64 isMips isBigEndian;
140− isArm = lib.warn
141− "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead"
142− hostPlatform.isAarch32;
143140
144141 # The derivation's `system` is `buildPlatform.system`.
145142 inherit (buildPlatform) system;
pkgs/tools/filesystems/fuse-overlayfs/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "fuse-overlayfs";
5− version = "0.7.5";
5+ version = "0.7.6";
66
77 src = fetchFromGitHub {
88 owner = "containers";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "1xsdn16n867c7af3j02z7nxh1i71wi0g4zspnrgz1qmpxdw4aays";
11+ sha256 = "1sgl6npbhg49aqlxmm3bnk3cmi9xpg8i5m4hickqfk1ni1z070ij";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/tools/filesystems/s3fs/default.nix+7−5
@@ -1,17 +1,19 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse, osxfuse }:
22
33stdenv.mkDerivation rec {
44 pname = "s3fs-fuse";
5− version = "1.85";
5+ version = "1.86";
66
77 src = fetchFromGitHub {
88 owner = "s3fs-fuse";
99 repo = "s3fs-fuse";
1010 rev = "v${version}";
11− sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m";
11+ sha256 = "115zqbspr17xmidhizjmsqv9c7ql2jhmxws8wh59bpz2335kn0q7";
1212 };
1313
14− buildInputs = [ curl openssl libxml2 fuse ];
14+ buildInputs = [ curl openssl libxml2 ]
15+ ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]
16+ ++ stdenv.lib.optionals stdenv.isDarwin [ osxfuse ];
1517 nativeBuildInputs = [ autoreconfHook pkgconfig ];
1618
1719 configureFlags = [
@@ -25,6 +27,6 @@ stdenv.mkDerivation rec {
2527 meta = with stdenv.lib; {
2628 description = "Mount an S3 bucket as filesystem through FUSE";
2729 license = licenses.gpl2;
28− platforms = platforms.linux;
30+ platforms = platforms.linux ++ platforms.darwin;
2931 };
3032}
pkgs/tools/misc/dateutils/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, autoreconfHook, tzdata }:
22
33stdenv.mkDerivation rec {
4− version = "0.4.6";
4+ version = "0.4.7";
55 pname = "dateutils";
66
77 src = fetchurl {
88 url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
9− sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816";
9+ sha256 = "16jr9yjk8wgzfh22hr3z6mp4jm3fkacyibds4jj5xx5yymbm8wj9";
1010 };
1111
1212 nativeBuildInputs = [ autoreconfHook ];
pkgs/tools/misc/diffoscope/default.nix+2−2
@@ -9,11 +9,11 @@
99# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
1010python3Packages.buildPythonApplication rec {
1111 pname = "diffoscope";
12− version = "135";
12+ version = "136";
1313
1414 src = fetchurl {
1515 url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
16− sha256 = "1grf28mb6lyxdqbmvws4h7inalda9z7qnjx7dc859mzkf54cn3yd";
16+ sha256 = "0an9c63xgy1bvqnpnn9mfphsq1qx8ba69yk15nqa9p78iqq2hf4h";
1717 };
1818
1919 patches = [
pkgs/tools/misc/opentsdb/default.nix+2−2
@@ -6,11 +6,11 @@ with stdenv.lib;
66
77stdenv.mkDerivation rec {
88 pname = "opentsdb";
9− version = "2.3.1";
9+ version = "2.4.0";
1010
1111 src = fetchurl {
1212 url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz";
13− sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd";
13+ sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2";
1414 };
1515
1616 buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ];
pkgs/tools/misc/tmux-xpanes/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "tmux-xpanes";
5− version = "4.1.0";
5+ version = "4.1.1";
66
77 src = fetchFromGitHub {
88 owner = "greymd";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "11yz6rh2ckd1z8q80n8giv2gcz2i22fgf3pnfxq96qrzflb0d96a";
11+ sha256 = "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi";
1212 };
1313
1414 buildInputs = [ openssl perl ];
pkgs/tools/misc/wakatime/default.nix+2−2
@@ -3,13 +3,13 @@
33with python3Packages;
44buildPythonApplication rec {
55 pname = "wakatime";
6− version = "13.0.3";
6+ version = "13.0.4";
77
88 src = fetchFromGitHub {
99 owner = "wakatime";
1010 repo = "wakatime";
1111 rev = version;
12− sha256 = "16g23nm1x1a142rmnljdclq03c5anfzyiiazxaxyka8bggzhfmmc";
12+ sha256 = "11np3cc5ha785vlmknk7vr7spgk2nw0wls0li60vfpvggbv0r4j6";
1313 };
1414
1515 # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt
pkgs/tools/networking/dnscrypt-proxy2/default.nix+1−1
@@ -18,7 +18,7 @@ buildGoPackage rec {
1818
1919 license = licenses.isc;
2020 homepage = https://dnscrypt.info/;
21− maintainers = with maintainers; [ waynr ];
21+ maintainers = with maintainers; [ atemu waynr ];
2222 platforms = with platforms; unix;
2323 };
2424}
pkgs/tools/system/fio/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "fio";
7− version = "3.17";
7+ version = "3.18";
88
99 src = fetchFromGitHub {
1010 owner = "axboe";
1111 repo = "fio";
1212 rev = "fio-${version}";
13− sha256 = "1s37w8bhg23ml1f89x0bkaifywlkgh31305vmip4xfvh3j3vjbym";
13+ sha256 = "0p2w1pyjh7vjxqxibjawi7waqb7n0lwnx21qj0z75g8zhb629l0w";
1414 };
1515
1616 buildInputs = [ python zlib ]
pkgs/tools/system/java-service-wrapper/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "java-service-wrapper";
8− version = "3.5.41";
8+ version = "3.5.42";
99
1010 src = fetchurl {
1111 url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
12− sha256 = "0wvazc4y134brn99aa4rc9jdh1h2q3l7qhhvbcs6lhf4ym47sskm";
12+ sha256 = "1gi4zc7fhqm7rb1ajpnxx0n7ngpa06ja46mb5p65h025mz567ywd";
1313 };
1414
1515 buildInputs = [ jdk ];
pkgs/tools/system/lr/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "lr";
5− version = "1.5";
5+ version = "1.5.1";
66
77 src = fetchFromGitHub {
88 owner = "chneukirchen";
99 repo = "lr";
1010 rev = "v${version}";
11− sha256 = "1dxla14ldyym01lhmacfwps1vim0fk67c2ik2w08gg534siyj770";
11+ sha256 = "1wv2acm4r5y5gg6f64v2hiwpg1f3lnr4fy1a9zssw77fmdc7ys3j";
1212 };
1313
1414 makeFlags = [ "PREFIX=$(out)" ];
pkgs/top-level/all-packages.nix+3−1
@@ -1222,6 +1222,8 @@ in
12221222
12231223 behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
12241224
1225+ bless = callPackage ../applications/editors/bless { };
1226+
12251227 blink1-tool = callPackage ../tools/misc/blink1-tool { };
12261228
12271229 bliss = callPackage ../applications/science/math/bliss { };
@@ -21040,7 +21042,7 @@ in
2104021042
2104121043 qmmp = libsForQt5.callPackage ../applications/audio/qmmp { };
2104221044
21043− qnotero = callPackage ../applications/office/qnotero { };
21045+ qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
2104421046
2104521047 qrcode = callPackage ../tools/graphics/qrcode {};
2104621048
pkgs/top-level/python-packages.nix+2
@@ -2928,6 +2928,8 @@ in {
29282928
29292929 nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
29302930
2931+ nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };
2932+
29312933 nxt-python = callPackage ../development/python-modules/nxt-python { };
29322934
29332935 odfpy = callPackage ../development/python-modules/odfpy { };