diff options
494 files changed, 10613 insertions, 5842 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 4193bb49f77a..e6d59ebde978 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -14,4 +14,5 @@ <xi:include href="functions/fhs-environments.xml" /> <xi:include href="functions/shell.xml" /> <xi:include href="functions/dockertools.xml" /> + <xi:include href="functions/prefer-remote-fetch.xml" /> </chapter> diff --git a/doc/functions/prefer-remote-fetch.xml b/doc/functions/prefer-remote-fetch.xml new file mode 100644 index 000000000000..85f08f4eae14 --- /dev/null +++ b/doc/functions/prefer-remote-fetch.xml @@ -0,0 +1,27 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/xinclude" + xml:id="sec-prefer-remote-fetch"> + <title>prefer-remote-fetch overlay</title> + + <para> + <function>prefer-remote-fetch</function> is an overlay that download sources + on remote builder. This is useful when the evaluating machine has a slow + upload while the builder can fetch faster directly from the source. + To use it, put the following snippet as a new overlay: + <programlisting> + self: super: + (super.prefer-remote-fetch self super) + </programlisting> + + A full configuration example for that sets the overlay up for your own account, + could look like this + + <programlisting> + $ mkdir ~/.config/nixpkgs/overlays/ + $ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF + self: super: super.prefer-remote-fetch self super + EOF + </programlisting> + </para> +</section> diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 564471bbbbc6..ac0d84b90f96 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1279,7 +1279,9 @@ makeFlags = [ "PREFIX=$(out)" ]; <command>make</command>. You must use this instead of <varname>makeFlags</varname> if the arguments contain spaces, e.g. <programlisting> -makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") +preBuild = '' + makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") +''; </programlisting> Note that shell arrays cannot be passed through environment variables, so you cannot set <varname>makeFlagsArray</varname> in a derivation diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35a1296db5a9..a56c8819dddd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1,21 +1,41 @@ /* List of NixOS maintainers. handle = { - name = "Real name"; + # Required + name = "Your name"; email = "address@example.org"; + + # Optional github = "GithubUsername"; + keys = [{ + longkeyid = "rsa2048/0x0123456789ABCDEF"; + fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; + }]; }; - where `name` is your real name, `email` is your maintainer email - address and `github` is your GitHub handle (as it appears in the - URL of your profile page, `https://github.com/<userhandle>`). - address - The only required fields are `name` and `email`. + where + + - `handle` is the handle you are going to use in nixpkgs expressions, + - `name` is your, preferably real, name, + - `email` is your maintainer email address, and + - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), + - `keys` is a list of your PGP/GPG key IDs and fingerprints. + + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. + + Add PGP/GPG keys only if you actually use them to sign commits and/or mail. + + To get the required PGP/GPG values for a key run + ```shell + gpg --keyid-format 0xlong --fingerprint <email> | head -n 2 + ``` + + !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. + More fields may be added in the future. Please keep the list alphabetically sorted. - See `../maintainers/scripts/check-maintainer-github-handles.sh` - for an example on how to work with this data. + See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { "1000101" = { @@ -341,6 +361,11 @@ github = "apeyroux"; name = "Alexandre Peyroux"; }; + ar1a = { + email = "aria@ar1as.space"; + github = "ar1a"; + name = "Aria Edmonds"; + }; arcadio = { email = "arc@well.ox.ac.uk"; github = "arcadio"; @@ -1402,6 +1427,10 @@ email = "justin.humm@posteo.de"; github = "erictapen"; name = "Justin Humm"; + keys = [{ + longkeyid = "rsa4096/0x438871E000AA178E"; + fingerprint = "984E 4BAD 9127 4D0E AE47 FF03 4388 71E0 00AA 178E"; + }]; }; erikryb = { email = "erik.rybakken@math.ntnu.no"; @@ -1431,6 +1460,10 @@ email = "elis@hirwing.se"; github = "etu"; name = "Elis Hirwing"; + keys = [{ + longkeyid = "rsa4096/0xD57EFA625C9A925F"; + fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; + }]; }; evck = { email = "eric@evenchick.com"; @@ -1586,6 +1619,11 @@ email = "eocallaghan@alterapraxis.com"; name = "Edward O'Callaghan"; }; + fusion809 = { + email = "brentonhorne77@gmail.com"; + github = "fusion809"; + name = "Brenton Horne"; + }; fuuzetsu = { email = "fuuzetsu@fuuzetsu.co.uk"; github = "fuuzetsu"; @@ -1919,6 +1957,11 @@ github = "infinisil"; name = "Silvan Mosberger"; }; + ingenieroariel = { + email = "ariel@nunez.co"; + github = "ingenieroariel"; + name = "Ariel Nunez"; + }; ironpinguin = { email = "michele@catalano.de"; github = "ironpinguin"; @@ -1933,6 +1976,15 @@ email = "tkatchev@gmail.com"; name = "Ivan Tkatchev"; }; + ivegotasthma = { + email = "ivegotasthma@protonmail.com"; + github = "ivegotasthma"; + name = "John Doe"; + keys = [{ + longkeyid = "rsa4096/09AC52AEA87817A4"; + fingerprint = "4008 2A5B 56A4 79B9 83CB 95FD 09AC 52AE A878 17A4"; + }]; + }; ixmatus = { email = "parnell@digitalmentat.com"; github = "ixmatus"; @@ -2838,6 +2890,11 @@ email = "joerg@thalheim.io"; github = "mic92"; name = "Jörg Thalheim"; + keys = [{ + # compare with https://keybase.io/Mic92 + longkeyid = "rsa4096/0x003F2096411B5F92"; + fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; + }]; }; michaelpj = { email = "michaelpj@gmail.com"; @@ -3245,6 +3302,11 @@ github = "nyarly"; name = "Judson Lester"; }; + nzhang-zh = { + email = "n.zhang.hp.au@gmail.com"; + github = "nzhang-zh"; + name = "Ning Zhang"; + }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; @@ -3323,6 +3385,10 @@ email = "oxij@oxij.org"; github = "oxij"; name = "Jan Malakhovski"; + keys = [{ + longkeyid = "rsa2048/0x0E6CA66E5C557AA8"; + fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; + }]; }; oyren = { email = "m.scheuren@oyra.eu"; @@ -3547,6 +3613,14 @@ email = "dev.primeos@gmail.com"; github = "primeos"; name = "Michael Weiss"; + keys = [ + { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only + fingerprint = "86A7 4A55 07D0 58D1 322E 37FD 1308 26A6 C2A3 89FD"; + } + { longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc. + fingerprint = "AF85 991C C950 49A2 4205 1933 BCA9 943D D1DF 4C04"; + } + ]; }; Profpatsch = { email = "mail@profpatsch.de"; @@ -3615,6 +3689,10 @@ email = "hi@alyssa.is"; github = "alyssais"; name = "Alyssa Ross"; + keys = [{ + longkeyid = "rsa4096/736CCDF9EF51BD97"; + fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; + }]; }; ragge = { email = "r.dahlen@gmail.com"; @@ -4130,6 +4208,10 @@ email = "sebastien.maret@icloud.com"; github = "smaret"; name = "Sébastien Maret"; + keys = [{ + longkeyid = "rsa4096/0x86E30E5A0F5FC59C"; + fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; + }]; }; smironov = { email = "grrwlf@gmail.com"; @@ -4316,6 +4398,15 @@ github = "t184256"; name = "Alexander Sosedkin"; }; + tadeokondrak = { + email = "me@tadeo.ca"; + github = "tadeokondrak"; + name = "Tadeo Kondrak"; + keys = [{ + longkeyid = "ed25519/0xFBE607FCC49516D3"; + fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; + }]; + }; tadfisher = { email = "tadfisher@gmail.com"; github = "tadfisher"; diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 31e6045fb645..59696a4432d8 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when @@ -101,8 +101,8 @@ sub uploadFile { my ($name, $dest) = @_; #print STDERR "linking $name to $dest...\n"; $bucket->add_key($name, "", { - 'x-amz-website-redirect-location' => "/" . $dest, - 'x-amz-acl' => "public-read" + 'x-amz-website-redirect-location' => "/" . $dest, + 'x-amz-acl' => "public-read" }) or die "failed to create redirect from $name to $dest\n"; $cache{$name} = 1; @@ -116,8 +116,8 @@ sub uploadFile { # Upload the file as sha512/<hash-in-base-16>. print STDERR "uploading $fn to $mainKey...\n"; $bucket->add_key_filename($mainKey, $fn, { - 'x-amz-meta-original-name' => $name, - 'x-amz-acl' => "public-read" + 'x-amz-meta-original-name' => $name, + 'x-amz-acl' => "public-read" }) or die "failed to upload $fn to $mainKey\n"; $cache{$mainKey} = 1; diff --git a/maintainers/scripts/test-eval-release.sh b/maintainers/scripts/eval-release.sh index 9ef531319e4d..e0dfaf1de74c 100755 --- a/maintainers/scripts/test-eval-release.sh +++ b/maintainers/scripts/eval-release.sh @@ -4,4 +4,8 @@ if [[ -z "$VERBOSE" ]]; then echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" fi unset HOME NIXPKGS_CONFIG # Force empty config + +# With the default heap size (380MB), nix-instantiate fails: +# Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS +export GC_INITIAL_HEAP_SIZE=${GC_INITIAL_HEAP_SIZE:-2000000000} # 2GB nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index bd6afda900c8..52cce9099183 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -31,7 +31,7 @@ let if !canEval x then [] else if isDerivation x then optional (canEval x.drvPath) x else if isList x then concatLists (map derivationsIn' x) - else if isAttrs x then concatLists (mapAttrsToList (n: v: derivationsIn' v) x) + else if isAttrs x then concatLists (mapAttrsToList (n: v: addErrorContext "while finding tarballs in '${n}':" (derivationsIn' v)) x) else [ ]; keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { }; diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 703a1b8b7f09..e7d66f391f55 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -35,11 +35,11 @@ </para> <para> NixOS’s default <emphasis>display manager</emphasis> (the program that - provides a graphical login prompt and manages the X server) is SLiM. You can + provides a graphical login prompt and manages the X server) is LightDM. You can select an alternative one by picking one of the following lines: <programlisting> <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true; -<xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = true; +<xref linkend="opt-services.xserver.displayManager.slim.enable"/> = true; </programlisting> </para> <para> diff --git a/nixos/doc/manual/development/debugging-nixos-tests.xml b/nixos/doc/manual/development/debugging-nixos-tests.xml deleted file mode 100644 index 30e58e1e3554..000000000000 --- a/nixos/doc/manual/development/debugging-nixos-tests.xml +++ /dev/null @@ -1,37 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-debugging-nixos-tests"> - <title>Debugging NixOS tests</title> - - <para> - Tests may fail and infrastructure offers access to inspect machine state. - </para> - - <para> - To prevent test from stopping and cleaning up, insert a sleep command: - </para> - -<programlisting> -$machine->succeed("sleep 84000"); -</programlisting> - - <para> - As soon as machine starts run as root: - </para> - -<programlisting> -nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build-vm-test-run-*.drv-0/vm-state-machine/backdoor" -</programlisting> - - <para> - You may need to find the correct path, replacing <literal>/tmp</literal>, - <literal>*</literal> or <literal>machine</literal>. - </para> - - <para> - Press "enter" to open up console and login as "root". After you're done, - press "ctrl-q" to exit the console. - </para> -</section> diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index d068887200a9..2695082e3867 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -16,5 +16,4 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test <xi:include href="writing-nixos-tests.xml" /> <xi:include href="running-nixos-tests.xml" /> <xi:include href="running-nixos-tests-interactively.xml" /> - <xi:include href="debugging-nixos-tests.xml" /> </chapter> diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 0b311189430c..3a81b3a20409 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -23,7 +23,7 @@ $ diskutil list [..] $ diskutil unmountDisk diskN Unmount of all volumes on diskN was successful -$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN +$ sudo dd bs=1000000 if=nix.iso of=/dev/rdiskN </programlisting> Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command> completes in minutes instead of hours. After diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 89d9f48aedd3..da3b75cf6144 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -408,6 +408,21 @@ from nixpkgs due to the lack of maintainers. </para> </listitem> + <listitem> + <para> + It is possible now to uze ZRAM devices as general purpose ephemeral block devices, + not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, + but is still possible by setting <literal>zramSwap.swapDevices</literal> explicitly. + </para> + <para> + Default algorithm for ZRAM swap was changed to <literal>zstd</literal>. + </para> + <para> + Changes to ZRAM algorithm are applied during <literal>nixos-rebuild switch</literal>, + so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, + use <literal>nixos-rebuild boot; reboot</literal>. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 6fec322f9095..5e86ea479d51 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -27,6 +27,9 @@ , # The root file system type. fsType ? "ext4" +, # Filesystem label + label ? "nixos" + , # The initial NixOS configuration file to be copied to # /etc/nixos/configuration.nix. configFile ? null @@ -134,9 +137,9 @@ let format' = format; in let # Get start & length of the root partition in sectors to $START and $SECTORS. eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) - mkfs.${fsType} -F -L nixos $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + mkfs.${fsType} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K '' else '' - mkfs.${fsType} -F -L nixos $diskImage + mkfs.${fsType} -F -L ${label} $diskImage ''} root="$PWD/root" diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index c95bc548e04f..006da889671e 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -156,10 +156,8 @@ sub start { $ENV{USE_TMPDIR} = 1; $ENV{QEMU_OPTS} = ($self->{allowReboot} ? "" : "-no-reboot ") . - "-monitor unix:./monitor " . - "-chardev socket,id=shell,path=./shell -device virtio-serial -device virtconsole,chardev=shell " . - # socket backdoor, see "Debugging NixOS tests" section in NixOS manual - "-chardev socket,id=backdoor,path=./backdoor,server,nowait -device virtio-serial -device virtconsole,chardev=backdoor " . + "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . + "-device virtio-serial -device virtconsole,chardev=shell " . "-device virtio-rng-pci " . ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); chdir $self->{stateDir} or die; diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index c1748812821e..925d945c081e 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -6,10 +6,27 @@ let cfg = config.zramSwap; - devices = map (nr: "zram${toString nr}") (range 0 (cfg.numDevices - 1)); + # don't set swapDevices as mkDefault, so we can detect user had read our warning + # (see below) and made an action (or not) + devicesCount = if cfg.swapDevices != null then cfg.swapDevices else cfg.numDevices; + + devices = map (nr: "zram${toString nr}") (range 0 (devicesCount - 1)); modprobe = "${pkgs.kmod}/bin/modprobe"; + warnings = + assert cfg.swapDevices != null -> cfg.numDevices >= cfg.swapDevices; + flatten [ + (optional (cfg.numDevices > 1 && cfg.swapDevices == null) '' + Using several small zram devices as swap is no better than using one large. + Set either zramSwap.numDevices = 1 or explicitly set zramSwap.swapDevices. + + Previously multiple zram devices were used to enable multithreaded + compression. Linux supports multithreaded compression for 1 device + since 3.15. See https://lkml.org/lkml/2014/2/28/404 for details. + '') + ]; + in { @@ -24,9 +41,11 @@ in default = false; type = types.bool; description = '' - Enable in-memory compressed swap space provided by the zram kernel - module. - See https://www.kernel.org/doc/Documentation/blockdev/zram.txt + Enable in-memory compressed devices and swap space provided by the zram + kernel module. + See <link xlink:href="https://www.kernel.org/doc/Documentation/blockdev/zram.txt"> + https://www.kernel.org/doc/Documentation/blockdev/zram.txt + </link>. ''; }; @@ -34,7 +53,19 @@ in default = 1; type = types.int; description = '' - Number of zram swap devices to create. + Number of zram devices to create. See also + <literal>zramSwap.swapDevices</literal> + ''; + }; + + swapDevices = mkOption { + default = null; + example = 1; + type = with types; nullOr int; + description = '' + Number of zram devices to be used as swap. Must be + <literal><= zramSwap.numDevices</literal>. + Default is same as <literal>zramSwap.numDevices</literal>, recommended is 1. ''; }; @@ -44,7 +75,8 @@ in description = '' Maximum amount of memory that can be used by the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total - RAM. + RAM. Run <literal>zramctl</literal> to check how good memory is + compressed. ''; }; @@ -58,12 +90,26 @@ in ''; }; + algorithm = mkOption { + default = "zstd"; + example = "lzo"; + type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str; + description = '' + Compression algorithm. <literal>lzo</literal> has good compression, + but is slow. <literal>lz4</literal> has bad compression, but is fast. + <literal>zstd</literal> is both good compression and fast. + You can check what other algorithms are supported by your zram device with + <programlisting>cat /sys/class/block/zram*/comp_algorithm</programlisting> + ''; + }; }; }; config = mkIf cfg.enable { + inherit warnings; + system.requiredKernelConfig = with config.lib.kernelConfig; [ (isModule "ZRAM") ]; @@ -85,25 +131,25 @@ in createZramInitService = dev: nameValuePair "zram-init-${dev}" { description = "Init swap on zram-based device ${dev}"; - bindsTo = [ "dev-${dev}.swap" ]; after = [ "dev-${dev}.device" "zram-reloader.service" ]; requires = [ "dev-${dev}.device" "zram-reloader.service" ]; before = [ "dev-${dev}.swap" ]; requiredBy = [ "dev-${dev}.swap" ]; + unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig = { Type = "oneshot"; RemainAfterExit = true; ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; }; script = '' - set -u - set -o pipefail - + set -euo pipefail + # Calculate memory to use for zram - totalmem=$(${pkgs.gnugrep}/bin/grep 'MemTotal: ' /proc/meminfo | ${pkgs.gawk}/bin/awk '{print $2}') - mem=$(((totalmem * ${toString cfg.memoryPercent} / 100 / ${toString cfg.numDevices}) * 1024)) + mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / { + print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024) + }' /proc/meminfo) - echo $mem > /sys/class/block/${dev}/disksize + ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev} ${pkgs.utillinux}/sbin/mkswap /dev/${dev} ''; restartIfChanged = false; @@ -111,6 +157,9 @@ in in listToAttrs ((map createZramInitService devices) ++ [(nameValuePair "zram-reloader" { description = "Reload zram kernel module when number of devices changes"; + wants = [ "systemd-udevd.service" ]; + after = [ "systemd-udevd.service" ]; + unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -118,7 +167,11 @@ in ExecStart = "${modprobe} zram"; ExecStop = "${modprobe} -r zram"; }; - restartTriggers = [ cfg.numDevices ]; + restartTriggers = [ + cfg.numDevices + cfg.algorithm + cfg.memoryPercent + ]; restartIfChanged = true; })]); diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 48e0072e0892..6b7b8069fd44 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -124,10 +124,14 @@ in config = mkIf cfg.enable { - assertions = lib.singleton { - assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; - message = "Option driSupport32Bit only makes sense on a 64-bit system."; - }; + assertions = [ + { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; + message = "Option driSupport32Bit only makes sense on a 64-bit system."; + } + { assertion = cfg.driSupport32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false); + message = "Option driSupport32Bit requires a kernel that supports 32bit emulation"; + } + ]; systemd.tmpfiles.rules = [ "L+ /run/opengl-driver - - - - ${package}" diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 52a129b39bcd..bad9356ab5a6 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -449,7 +449,11 @@ EOF if (-e $slave) { my $dmName = read_file("/sys/class/block/$deviceName/dm/name"); chomp $dmName; - $fileSystems .= " boot.initrd.luks.devices.\"$dmName\".device = \"${\(findStableDevPath $slave)}\";\n\n"; + # Ensure to add an entry only once + my $luksDevice = " boot.initrd.luks.devices.\"$dmName\".device"; + if ($fileSystems !~ /^\Q$luksDevice\E/m) { + $fileSystems .= "$luksDevice = \"${\(findStableDevPath $slave)}\";\n\n"; + } } } } diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 327e3e6989f7..4560e9c7403a 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -314,13 +314,13 @@ else # echo 1>&2 "Warning: This value is not an option." result=$(evalCfg "") - if names=$(attrNames "$result" 2> /dev/null); then + if [ ! -z "$result" ]; then + names=$(attrNames "$result" 2> /dev/null) echo 1>&2 "This attribute set contains:" escapeQuotes () { eval echo "$1"; } nixMap escapeQuotes "$names" else - echo 1>&2 "An error occurred while looking for attribute names." - echo $result + echo 1>&2 "An error occurred while looking for attribute names. Are you sure that '$option' exists?" fi fi diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a597485120c4..1a8bd9cccb18 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -248,6 +248,7 @@ ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/evolution-data-server.nix + ./services/desktops/gnome3/file-roller.nix ./services/desktops/gnome3/gnome-disks.nix ./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-keyring.nix diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index cc398174e6ce..4640c1d78d20 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -167,16 +167,16 @@ in The set of system-wide known SSH hosts. ''; example = literalExample '' - [ - { + { + myhost = { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub; - } - { + }; + myhost2 = { hostNames = [ "myhost2" ]; publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub; - } - ] + }; + } ''; }; diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index f9f9568faa5c..11efa47ec5b2 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -6,11 +6,11 @@ let cfg = config.services.postgresqlBackup; - postgresqlBackupService = db : + postgresqlBackupService = db: dumpCmd: { enable = true; - description = "Backup of database ${db}"; + description = "Backup of ${db} database(s)"; requires = [ "postgresql.service" ]; @@ -26,7 +26,7 @@ let ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz fi - ${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db} | \ + ${dumpCmd} | \ ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz ''; @@ -42,9 +42,7 @@ let in { options = { - services.postgresqlBackup = { - enable = mkOption { default = false; description = '' @@ -61,6 +59,19 @@ in { ''; }; + backupAll = mkOption { + default = cfg.databases == []; + defaultText = "services.postgresqlBackup.databases == []"; + type = lib.types.bool; + description = '' + Backup all databases using pg_dumpall. + This option is mutual exclusive to + <literal>services.postgresqlBackup.databases</literal>. + The resulting backup dump will have the name all.sql.gz. + This option is the default if no databases are specified. + ''; + }; + databases = mkOption { default = []; description = '' @@ -79,18 +90,36 @@ in { type = types.string; default = "-Cbo"; description = '' - Command line options for pg_dump. + Command line options for pg_dump. This options is not used + if <literal>config.services.postgresqlBackup.backupAll</literal> is enabled. + Note that config.services.postgresqlBackup.backupAll is also active, + when no databases where specified. ''; }; }; }; - config = mkIf config.services.postgresqlBackup.enable { - - systemd.services = listToAttrs (map (db : { + config = mkMerge [ + { + assertions = [{ + assertion = cfg.backupAll -> cfg.databases == []; + message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases"; + }]; + } + (mkIf (cfg.enable && cfg.backupAll) { + systemd.services.postgresqlBackup = + postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall"; + }) + (mkIf (cfg.enable && !cfg.backupAll) { + systemd.services = listToAttrs (map (db: + let + cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}"; + in { name = "postgresqlBackup-${db}"; - value = postgresqlBackupService db; } ) cfg.databases); - }; + value = postgresqlBackupService db cmd; + }) cfg.databases); + }) + ]; } diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 6ece5a9b5ad6..7e8e91e4b9c3 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -1,6 +1,11 @@ { config, lib, pkgs, ... }: with lib; + +let + # Type for a valid systemd unit option. Needed for correctly passing "timerConfig" to "systemd.timers" + unitOption = (import ../../system/boot/systemd-unit-options.nix { inherit config lib; }).unitOption; +in { options.services.restic.backups = mkOption { description = '' @@ -47,7 +52,7 @@ with lib; }; timerConfig = mkOption { - type = types.attrsOf types.str; + type = types.attrsOf unitOption; default = { OnCalendar = "daily"; }; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index df6f3876585e..8e7945cfdb53 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -274,7 +274,8 @@ in serviceConfig = { Type = if hasNotify then "notify" else "simple"; RuntimeDirectory = "mysqld"; - ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions}"; + # The last two environment variables are used for starting Galera clusters + ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION"; }; postStart = '' @@ -362,7 +363,7 @@ in ${optionalString (cfg.ensureDatabases != []) '' ( ${concatMapStrings (database: '' - echo "CREATE DATABASE IF NOT EXISTS ${database};" + echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;" '') cfg.ensureDatabases} ) | ${mysql}/bin/mysql -u root -N ''} diff --git a/nixos/modules/services/desktops/gnome3/file-roller.nix b/nixos/modules/services/desktops/gnome3/file-roller.nix new file mode 100644 index 000000000000..7fb558a98953 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/file-roller.nix @@ -0,0 +1,32 @@ +# File Roller. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.file-roller = { + + enable = mkEnableOption "File Roller, an archive manager for GNOME"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.file-roller.enable { + + environment.systemPackages = [ pkgs.gnome3.file-roller ]; + + services.dbus.packages = [ pkgs.gnome3.file-roller ]; + + }; + +} diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 8fe5879c2764..e4810ce9f876 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -145,7 +145,7 @@ in PLEX_MEDIA_SERVER_HOME="${cfg.package}/usr/lib/plexmediaserver"; PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6"; PLEX_MEDIA_SERVER_TMPDIR="/tmp"; - LD_LIBRARY_PATH="${cfg.package}/usr/lib/plexmediaserver"; + LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver"; LC_ALL="en_US.UTF-8"; LANG="en_US.UTF-8"; }; diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 6606980cdad8..45e3312c0f44 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -88,6 +88,8 @@ in { ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -f"; User = cfg.user; PermissionsStartOnly = true; + Restart = "on-failure"; + RestartSec = 3; }; preStart = '' diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index bf4dfc666bb6..1b1503ab5fc0 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -325,7 +325,8 @@ let promTypes.relabel_config = types.submodule { options = { source_labels = mkOption { - type = types.listOf types.str; + type = with types; nullOr (listOf str); + default = null; description = '' The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index 4ca6d4e5f8b6..c47e87a3dc35 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -18,12 +18,34 @@ in socketPath = mkOption { type = types.path; default = "/var/run/dovecot/stats"; - example = "/var/run/dovecot2/stats"; + example = "/var/run/dovecot2/old-stats"; description = '' Path under which the stats socket is placed. The user/group under which the exporter runs, should be able to access the socket in order to scrape the metrics successfully. + + Please keep in mind that the stats module has changed in + <link xlink:href="https://wiki2.dovecot.org/Upgrading/2.3">Dovecot 2.3+</link> which + is not <link xlink:href="https://github.com/kumina/dovecot_exporter/issues/8">compatible with this exporter</link>. + + The following extra config has to be passed to Dovecot to ensure that recent versions + work with this exporter: + <programlisting> + { + <xref linkend="opt-services.prometheus.exporters.dovecot.enable" /> = true; + <xref linkend="opt-services.prometheus.exporters.dovecot.socketPath" /> = "/var/run/dovecot2/old-stats"; + <xref linkend="opt-services.dovecot2.extraConfig" /> = ''' + mail_plugins = $mail_plugins old_stats + service old-stats { + unix_listener old-stats { + user = nobody + group = nobody + } + } + '''; + } + </programlisting> ''; }; scopes = mkOption { diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 25b7d6dbeba2..de316e5f4669 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -513,6 +513,7 @@ in RuntimeDirectory = [ "prosody" ]; PIDFile = "/run/prosody/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 9ed3025e47d4..a1c5d879f3cb 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -26,6 +26,12 @@ let substituteInPlace $out/sesman.ini \ --replace LogFile=xrdp-sesman.log LogFile=/dev/null \ --replace EnableSyslog=1 EnableSyslog=0 + + # Ensure that clipboard works for non-ASCII characters + sed -i -e '/.*SessionVariables.*/ a\ + LANG=${config.i18n.defaultLocale}\ + LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive + ' $out/sesman.ini ''; in { diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 73607c6f9a3b..2d6ed8530745 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -187,8 +187,8 @@ let SSLRandomSeed startup builtin SSLRandomSeed connect builtin - SSLProtocol All -SSLv2 -SSLv3 - SSLCipherSuite HIGH:!aNULL:!MD5:!EXP + SSLProtocol ${mainCfg.sslProtocols} + SSLCipherSuite ${mainCfg.sslCiphers} SSLHonorCipherOrder on ''; @@ -630,6 +630,19 @@ in description = "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited"; }; + + sslCiphers = mkOption { + type = types.str; + default = "HIGH:!aNULL:!MD5:!EXP"; + description = "Cipher Suite available for negotiation in SSL proxy handshake."; + }; + + sslProtocols = mkOption { + type = types.str; + default = "All -SSLv2 -SSLv3"; + example = "All -SSLv2 -SSLv3 -TLSv1"; + description = "Allowed SSL/TLS protocol versions."; + }; } # Include the options shared between the main server and virtual hosts. diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index e1f4ff5db7f2..152c89a2caec 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -8,21 +8,31 @@ let stateDir = "/run/phpfpm"; - poolConfigs = cfg.poolConfigs // mapAttrs mkPool cfg.pools; + poolConfigs = + (mapAttrs mapPoolConfig cfg.poolConfigs) // + (mapAttrs mapPool cfg.pools); - mkPool = n: p: '' - listen = ${p.listen} - ${p.extraConfig} - ''; + mapPoolConfig = n: p: { + phpPackage = cfg.phpPackage; + config = p; + }; + + mapPool = n: p: { + phpPackage = p.phpPackage; + config = '' + listen = ${p.listen} + ${p.extraConfig} + ''; + }; - fpmCfgFile = pool: poolConfig: pkgs.writeText "phpfpm-${pool}.conf" '' + fpmCfgFile = pool: conf: pkgs.writeText "phpfpm-${pool}.conf" '' [global] error_log = syslog daemonize = no ${cfg.extraConfig} [${pool}] - ${poolConfig} + ${conf} ''; phpIni = pkgs.runCommand "php.ini" { @@ -97,13 +107,14 @@ in { pools = mkOption { type = types.attrsOf (types.submodule (import ./pool-options.nix { - inherit lib; + inherit lib config; })); default = {}; example = literalExample '' { mypool = { listen = "/path/to/unix/socket"; + phpPackage = pkgs.php; extraConfig = ''' user = nobody pm = dynamic @@ -144,7 +155,7 @@ in { mkdir -p ${stateDir} ''; serviceConfig = let - cfgFile = fpmCfgFile pool poolConfig; + cfgFile = fpmCfgFile pool poolConfig.config; in { Slice = "phpfpm.slice"; PrivateDevices = true; @@ -153,7 +164,7 @@ in { # XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK"; Type = "notify"; - ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; + ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; }; } diff --git a/nixos/modules/services/web-servers/phpfpm/pool-options.nix b/nixos/modules/services/web-servers/phpfpm/pool-options.nix index cc688c2c48a2..40c83cddb957 100644 --- a/nixos/modules/services/web-servers/phpfpm/pool-options.nix +++ b/nixos/modules/services/web-servers/phpfpm/pool-options.nix @@ -1,4 +1,8 @@ -{ lib }: +{ lib, config }: + +let + fpmCfg = config.services.phpfpm; +in with lib; { @@ -12,6 +16,15 @@ with lib; { ''; }; + phpPackage = mkOption { + type = types.package; + default = fpmCfg.phpPackage; + defaultText = "config.services.phpfpm.phpPackage"; + description = '' + The PHP package to use for running this PHP-FPM pool. + ''; + }; + extraConfig = mkOption { type = types.lines; example = '' diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index dfff6c720d79..7544ba4638ac 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -36,6 +36,8 @@ let ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ ''; + flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; + in { options = { @@ -71,6 +73,36 @@ in { }; debug = mkEnableOption "gnome-session debug messages"; + + flashback = { + enableMetacity = mkEnableOption "Enable the standard GNOME Flashback session with Metacity."; + + customSessions = mkOption { + type = types.listOf (types.submodule { + options = { + wmName = mkOption { + type = types.str; + description = "The filename-compatible name of the window manager to use."; + example = "xmonad"; + }; + + wmLabel = mkOption { + type = types.str; + description = "The pretty name of the window manager to use."; + example = "XMonad"; + }; + + wmCommand = mkOption { + type = types.str; + description = "The executable of the window manager to use."; + example = "\${pkgs.haskellPackages.xmonad}/bin/xmonad"; + }; + }; + }); + default = []; + description = "Other GNOME Flashback sessions to enable."; + }; + }; }; environment.gnome3.excludePackages = mkOption { @@ -95,6 +127,7 @@ in { services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; services.gnome3.evolution-data-server.enable = true; + services.gnome3.file-roller.enable = mkDefault true; services.gnome3.gnome-disks.enable = mkDefault true; services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-keyring.enable = true; @@ -112,7 +145,9 @@ in { services.telepathy.enable = mkDefault true; networking.networkmanager.enable = mkDefault true; services.upower.enable = config.powerManagement.enable; - services.dbus.packages = mkIf config.services.printing.enable [ pkgs.system-config-printer ]; + services.dbus.packages = + optional config.services.printing.enable pkgs.system-config-printer ++ + optional flashbackEnabled pkgs.gnome3.gnome-screensaver; services.colord.enable = mkDefault true; services.packagekit.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; @@ -126,7 +161,15 @@ in { fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; - services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; + services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ] + ++ map + (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm { + inherit (wm) wmName wmLabel wmCommand; + }) (optional cfg.flashback.enableMetacity { + wmName = "metacity"; + wmLabel = "Metacity"; + wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; + } ++ cfg.flashback.customSessions); environment.extraInit = '' ${concatMapStrings (p: '' @@ -176,6 +219,9 @@ in { "/share/nautilus-python/extensions" ]; + security.pam.services.gnome-screensaver = mkIf flashbackEnabled { + enableGnomeKeyring = true; + }; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 8f8c9e23e13e..37a19fb9fc8c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -535,6 +535,7 @@ in systemd.timers.zfs-scrub = { wantedBy = [ "timers.target" ]; + after = [ "multi-user.target" ]; # Apparently scrubbing before boot is complete hangs the system? #53583 timerConfig = { OnCalendar = cfgScrub.interval; Persistent = "yes"; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index aa0db4afd978..ed4cfa7805e2 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -55,8 +55,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; systemd.services."serial-getty@hvc0".enable = false; # Only use a serial console, no TTY. - # hvc1: socket backdoor, see "Debugging NixOS tests" section in NixOS manual - virtualisation.qemu.consoles = [ "hvc1" qemuSerialDevice ]; + virtualisation.qemu.consoles = [ qemuSerialDevice ]; boot.initrd.preDeviceCommands = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9ee8ac2995be..7bc2f3076f1e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -107,6 +107,7 @@ in initrdNetwork = handleTest ./initrd-network.nix {}; installer = handleTest ./installer.nix {}; ipv6 = handleTest ./ipv6.nix {}; + jackett = handleTest ./jackett.nix {}; jenkins = handleTest ./jenkins.nix {}; #kafka = handleTest ./kafka.nix {}; # broken since openjdk: 8u181 -> 8u192 kerberos = handleTest ./kerberos/default.nix {}; @@ -120,6 +121,7 @@ in latestKernel.login = handleTest ./login.nix { latestKernel = true; }; ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; + lidarr = handleTest ./lidarr.nix {}; #lightdm = handleTest ./lightdm.nix {}; login = handleTest ./login.nix {}; #logstash = handleTest ./logstash.nix {}; @@ -178,6 +180,7 @@ in quagga = handleTest ./quagga.nix {}; quake3 = handleTest ./quake3.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; + radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; redmine = handleTest ./redmine.nix {}; roundcube = handleTest ./roundcube.nix {}; @@ -194,12 +197,14 @@ in smokeping = handleTest ./smokeping.nix {}; snapper = handleTest ./snapper.nix {}; solr = handleTest ./solr.nix {}; + sonarr = handleTest ./sonarr.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; taskserver = handleTest ./taskserver.nix {}; + telegraf = handleTest ./telegraf.nix {}; tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; diff --git a/nixos/tests/jackett.nix b/nixos/tests/jackett.nix new file mode 100644 index 000000000000..399a0c272327 --- /dev/null +++ b/nixos/tests/jackett.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "jackett"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.jackett.enable = true; }; + + testScript = '' + $machine->waitForUnit('jackett.service'); + $machine->waitForOpenPort('9117'); + $machine->succeed("curl --fail http://localhost:9117/"); + ''; +}) diff --git a/nixos/tests/lidarr.nix b/nixos/tests/lidarr.nix new file mode 100644 index 000000000000..58bf82503f8c --- /dev/null +++ b/nixos/tests/lidarr.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "lidarr"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.lidarr.enable = true; }; + + testScript = '' + $machine->waitForUnit('lidarr.service'); + $machine->waitForOpenPort('8686'); + $machine->succeed("curl --fail http://localhost:8686/"); + ''; +}) diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 49be0672a8e5..294eb50b5fe5 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -12,7 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : { services.postgresql = let mypg = pkgs.postgresql_11; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; + extraPlugins = with mypg.pkgs; [ + postgis + ]; }; }; }; @@ -22,5 +24,6 @@ import ./make-test.nix ({ pkgs, ...} : { $master->waitForUnit("postgresql"); $master->sleep(10); # Hopefully this is long enough!! $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'"); + $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'"); ''; }) diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 1d434b62a5cb..9e1f4f235af0 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let - postgresql-versions = pkgs.callPackages ../../pkgs/servers/sql/postgresql { }; + postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs pkgs; test-sql = pkgs.writeText "postgresql-test" '' CREATE EXTENSION pgcrypto; -- just to check if lib loading works CREATE TABLE sth ( @@ -21,7 +21,7 @@ let CREATE TABLE xmltest ( doc xml ); INSERT INTO xmltest (doc) VALUES ('<test>ok</test>'); -- check if libxml2 enabled ''; - make-postgresql-test = postgresql-name: postgresql-package: makeTest { + make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest { name = postgresql-name; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ zagy ]; @@ -29,14 +29,17 @@ let machine = {...}: { - services.postgresql.package=postgresql-package; services.postgresql.enable = true; + services.postgresql.package = postgresql-package; services.postgresqlBackup.enable = true; - services.postgresqlBackup.databases = [ "postgres" ]; + services.postgresqlBackup.databases = optional (!backup-all) "postgres"; }; - testScript = '' + testScript = let + backupName = if backup-all then "all" else "postgres"; + backupService = if backup-all then "postgresqlBackup" else "postgresqlBackup-postgres"; + in '' sub check_count { my ($select, $nlines) = @_; return 'test $(sudo -u postgres psql postgres -tAc "' . $select . '"|wc -l) -eq ' . $nlines; @@ -56,12 +59,20 @@ let $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1)); # Check backup service - $machine->succeed("systemctl start postgresqlBackup-postgres.service"); - $machine->succeed("zcat /var/backup/postgresql/postgres.sql.gz | grep '<test>ok</test>'"); - $machine->succeed("stat -c '%a' /var/backup/postgresql/postgres.sql.gz | grep 600"); + $machine->succeed("systemctl start ${backupService}.service"); + $machine->succeed("zcat /var/backup/postgresql/${backupName}.sql.gz | grep '<test>ok</test>'"); + $machine->succeed("stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600"); $machine->shutdown; ''; }; in - mapAttrs' (p-name: p-package: {name=p-name; value=make-postgresql-test p-name p-package;}) postgresql-versions + (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // ( + # just pick one version for the dump all test + let + first = head (attrNames postgresql-versions); + name = "${first}-backup-all"; + in { + ${name} = make-postgresql-test name postgresql-versions.${first} true; + } + ) diff --git a/nixos/tests/radarr.nix b/nixos/tests/radarr.nix new file mode 100644 index 000000000000..6b9a909e44b5 --- /dev/null +++ b/nixos/tests/radarr.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "radarr"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.radarr.enable = true; }; + + testScript = '' + $machine->waitForUnit('radarr.service'); + $machine->waitForOpenPort('7878'); + $machine->succeed("curl --fail http://localhost:7878/"); + ''; +}) diff --git a/nixos/tests/sonarr.nix b/nixos/tests/sonarr.nix new file mode 100644 index 000000000000..3d5c3b19b6ea --- /dev/null +++ b/nixos/tests/sonarr.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "sonarr"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.sonarr.enable = true; }; + + testScript = '' + $machine->waitForUnit('sonarr.service'); + $machine->waitForOpenPort('8989'); + $machine->succeed("curl --fail http://localhost:8989/"); + ''; +}) diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix new file mode 100644 index 000000000000..6776f8d8c37f --- /dev/null +++ b/nixos/tests/telegraf.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "telegraf"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mic92 ]; + }; + + machine = { ... }: { + services.telegraf.enable = true; + services.telegraf.extraConfig = { + agent.interval = "1s"; + agent.flush_interval = "1s"; + inputs.exec = { + commands = [ + "${pkgs.runtimeShell} -c 'echo example,tag=a i=42i'" + ]; + timeout = "5s"; + data_format = "influx"; + }; + outputs.file.files = ["/tmp/metrics.out"]; + outputs.file.data_format = "influx"; + }; + }; + + testScript = '' + startAll; + + $machine->waitForUnit("telegraf.service"); + $machine->waitUntilSucceeds("grep -q example /tmp/metrics.out"); + ''; +}) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 14bf13d8828e..ad1ccbf496cf 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.20"; + version = "1.8.21"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "0m2q1nz6f39pyr2rk6vflkwi4ykganzwr7wndpwr9rliw0x8jgi0"; + sha256 = "1p4qfxa90l26s9q4hddyb93gdf7vb0sb46z9n26ijiqlxdq3z7v2"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 4bcddab54a08..c40f84348de1 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, gettext, perlPackages, flex, libid3tag, + gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf - gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta + gdl gnome3.defaultIconTheme gnome3.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 5bc6e7174656..51c5cdad69d1 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "0.9.909"; + version = "0.9.914"; format = "other"; doCheck = false; @@ -14,10 +14,10 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "19d82dy0wprabg5kzcgs3ydmp9iz3h437n55cnlp20mbpya09k7n"; + sha256 = "0nkwic6mq4fs467c696m5w0wqrii5rzvf2il6vkw861my1bl9wzj"; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ appstream-glib desktop-file-utils gobject-introspection diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 5566c4b07b21..8c173140efd8 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { mopidy pythonPackages.requests pythonPackages.gmusicapi - pythonPackages.cachetools_1 + pythonPackages.cachetools ]; doCheck = false; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 5d13aa7daf42..af8597022922 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }: +{ stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +, usePulseAudio ? false, libpulseaudio }: let - version = "0.2.7025-beta20.1"; + version = "0.4.1"; in stdenv.mkDerivation rec { name = "openmpt123-${version}"; + src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; - sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; + sha256 = "1k1m1adjh4s2q9lxgkf836k5243akxrzq1hsdjhrkg4idd3pxzp4"; }; + + enableParallelBuilding = true; + doCheck = true; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL2 flac libsndfile ]; - makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] - ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; - installFlags = "PREFIX=\${out}"; + buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] + ++ stdenv.lib.optional usePulseAudio libpulseaudio; + + configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ]; meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; homepage = https://lib.openmpt.org/libopenmpt/; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 43cc171e05f1..7876ebc244b1 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext +{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext , gnome3, libnotify, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror @@ -6,12 +6,15 @@ }: stdenv.mkDerivation rec { - name = "deja-dup-${version}"; - version = "38.1"; + pname = "deja-dup"; + version = "38.3"; - src = fetchurl { - url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz"; - sha256 = "0wm7z72qbsljzsysxg8h5sbpg56ignn9mp8v3xynn12dv3gv6rba"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; + sha256 = "1bnvmdlm67k1b6115x75j3nl92x5yl4psq5pna2w6cg9npxdd3fa"; }; patches = [ @@ -23,7 +26,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas ''; nativeBuildInputs = [ @@ -57,9 +60,9 @@ stdenv.mkDerivation rec { of backing up the Right Way (encrypted, off-site, and regular) \ and uses duplicity as the backend. ''; - homepage = https://launchpad.net/deja-dup; - license = with licenses; gpl3; + homepage = https://wiki.gnome.org/Apps/DejaDup; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar joncojonathan ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/applications/backup/vdmfec/default.nix new file mode 100644 index 000000000000..3a480f70d4b7 --- /dev/null +++ b/pkgs/applications/backup/vdmfec/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "vdmfec-${version}"; + version = "1.0"; + + src = fetchurl { + url = "http://members.tripod.com/professor_tom/archives/${name}.tgz"; + sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm"; + }; + + meta = with stdenv.lib; { + description = "A program that adds error correction blocks"; + homepage = "http://members.tripod.com/professor_tom/archives/index.html"; + maintainers = [ maintainers.ar1a ]; + license = with licenses; [ gpl2 /* for vdmfec */ bsd2 /* for fec */ ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 125538e54cfc..4b53774662f9 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw"; }; betaVersion = { - version = "3.4.0.10"; # "Android Studio 3.4 Beta 1" - build = "183.5217543"; - sha256Hash = "0yd9l4py82i3gl1nvfwlhfx12hzf1mih8ylgdl3r85hhlqs7w2dm"; + version = "3.4.0.11"; # "Android Studio 3.4 Beta 2" + build = "183.5240537"; + sha256Hash = "0mv7ayqjkw97jzdifw1cdvjhnzygzkd2a9rc0h99fclhf2nii5yr"; }; latestVersion = { # canary & dev - version = "3.5.0.0"; # "Android Studio 3.5 Canary 1" - build = "183.5215047"; - sha256Hash = "1f7lllj85fia02hgy4ksbqh80sdcml16fv1g892jc6lwykjrdw5y"; + version = "3.5.0.1"; # "Android Studio 3.5 Canary 2" + build = "183.5240547"; + sha256Hash = "0z52ig9v2w9i6bqiqpdvgcr6g6sgl8p5317jamg72d5csm9hgfx3"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a3580b1afa7a..d7932dc4dcfc 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -20,6 +20,13 @@ let sha256 = "07ncvgp6xfhiwc6hd7qf7zk28n3yj47p26qj1ji29vqkwnk28y3s"; }; + patches = [ + # introduce a system-wide rplugin.vim in addition to the user one + # necessary so that nix can handle `UpdateRemotePlugins` for the plugins + # it installs. See https://github.com/neovim/neovim/issues/9413. + ./system_rplugin_manifest.patch + ]; + enableParallelBuilding = true; buildInputs = [ @@ -46,6 +53,13 @@ let lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ]; + # nvim --version output retains compilation flags and references to build tools + postPatch = '' + substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; + ''; + # check that the above patching actually works + disallowedReferences = [ stdenv.cc ]; + cmakeFlags = [ "-DLUA_PRG=${luaPackages.lua}/bin/lua" "-DGPERF_PRG=${gperf}/bin/gperf" diff --git a/pkgs/applications/editors/neovim/system_rplugin_manifest.patch b/pkgs/applications/editors/neovim/system_rplugin_manifest.patch new file mode 100644 index 000000000000..f634d3ec056a --- /dev/null +++ b/pkgs/applications/editors/neovim/system_rplugin_manifest.patch @@ -0,0 +1,29 @@ +diff --git a/runtime/autoload/remote/host.vim b/runtime/autoload/remote/host.vim +index 6266b312b..965fabf1e 100644 +--- a/runtime/autoload/remote/host.vim ++++ b/runtime/autoload/remote/host.vim +@@ -71,7 +71,8 @@ function! remote#host#RegisterPlugin(host, path, specs) abort + + for plugin in plugins + if plugin.path == a:path +- throw 'Plugin "'.a:path.'" is already registered' ++ " plugin already registered ++ return + endif + endfor + +diff --git a/runtime/plugin/rplugin.vim b/runtime/plugin/rplugin.vim +index 122d8d47f..83fbf8b57 100644 +--- a/runtime/plugin/rplugin.vim ++++ b/runtime/plugin/rplugin.vim +@@ -54,6 +54,10 @@ function! s:GetManifest() abort + endfunction + + function! s:LoadRemotePlugins() abort ++ if exists('$NVIM_SYSTEM_RPLUGIN_MANIFEST') ++ let g:system_remote_plugins = fnamemodify($NVIM_SYSTEM_RPLUGIN_MANIFEST, ':p') ++ execute 'source' fnameescape(g:system_remote_plugins) ++ endif + let g:loaded_remote_plugins = s:GetManifest() + if filereadable(g:loaded_remote_plugins) + execute 'source' fnameescape(g:loaded_remote_plugins) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 3dd3710da772..7d76bc1fd1a0 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -72,7 +72,6 @@ let --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \ --suffix PATH : ${binPath} \ ${optionalString withRuby '' --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } - '' + optionalString (!stdenv.isDarwin) '' # copy and patch the original neovim.desktop file @@ -83,18 +82,39 @@ let '' + optionalString withPython '' makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH - '' + optionalString withPython3 '' + '' + optionalString withPython3 '' makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH - '' + optionalString withRuby '' - ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' + optionalString vimAlias '' - ln -s $out/bin/nvim $out/bin/vim - '' + optionalString viAlias '' - ln -s $out/bin/nvim $out/bin/vi - '' + optionalString (configure != {}) '' - wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" - '' - ; + '' + optionalString withRuby '' + ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby + '' + optionalString vimAlias '' + ln -s $out/bin/nvim $out/bin/vim + '' + optionalString viAlias '' + ln -s $out/bin/nvim $out/bin/vi + '' + optionalString (configure != {}) '' + echo "Generating remote plugin manifest" + export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim + # Launch neovim with a vimrc file containing only the generated plugin + # code. Pass various flags to disable temp file generation + # (swap/viminfo) and redirect errors to stderr. + # Only display the log on error since it will contain a few normally + # irrelevant messages. + if ! $out/bin/nvim \ + -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ + -i NONE -n \ + -E -V1rplugins.log -s \ + +UpdateRemotePlugins +quit! > outfile 2>&1; then + cat outfile + echo -e "\nGenerating rplugin.vim failed!" + exit 1 + fi + unset NVIM_RPLUGIN_MANIFEST + + # this relies on a patched neovim, see + # https://github.com/neovim/neovim/issues/9413 + wrapProgram $out/bin/nvim \ + --set NVIM_SYSTEM_RPLUGIN_MANIFEST $out/rplugin.vim \ + --add-flags "-u ${vimUtils.vimrcFile configure}" + ''; preferLocalBuild = true; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 9d8c430630e5..86fb972e94c3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost -, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts -, unzip, ant, jdk, gnumake, makeWrapper, pandoc +, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, qtxmlpatterns, libuuid +, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: let @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ]; + buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel + qtxmlpatterns libuuid ]; src = fetchFromGitHub { owner = "rstudio"; diff --git a/pkgs/applications/editors/rstudio/preview.nix b/pkgs/applications/editors/rstudio/preview.nix index 340aeec15e0f..55c83ca85a64 100644 --- a/pkgs/applications/editors/rstudio/preview.nix +++ b/pkgs/applications/editors/rstudio/preview.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib -, openssl, R, qtbase, qtdeclarative, qtsensors, qtwebengine, qtwebchannel +, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc , llvmPackages }: let - rev = "f33fb2b2f1"; + rev = "f79330d4"; ginVer = "2.1.2"; gwtVer = "2.8.1"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - buildInputs = [ boost zlib openssl R qtbase qtdeclarative qtsensors + buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors qtwebengine qtwebchannel libuuid ]; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index aa6305ce8311..2e7435b48bbb 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -24,7 +24,7 @@ in postPatch = '' sed -i "s,/usr/local,$out,g" \ app/CMakeLists.txt app/app/app.cpp app/app/main.cpp - sed -i "s,python-py35,python36," CMakeLists.txt + sed -i "s,python3,${python3.executable}," CMakeLists.txt ''; buildInputs = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ce2bdcbd298c..c9fdbd255d46 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,13 +8,21 @@ , python3 }: +let + +major = "4.1"; +minor = "7"; +patch = "101"; + +in + mkDerivation rec { name = "krita-${version}"; - version = "4.1.5"; + version = "${major}.${minor}.${patch}"; src = fetchurl { - url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10"; + url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; + sha256 = "0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 7f118b6adc9a..acbbf73465df 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sxiv-${version}"; - version = "24"; + pname = "sxiv"; + version = "25"; src = fetchFromGitHub { owner = "muennich"; - repo = "sxiv"; + repo = pname; rev = "v${version}"; - sha256 = "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d"; + sha256 = "13s1lfar142hq1j7xld0ri616p4bqs57b17yr4d0b9a9w7liz4hp"; }; postUnpack = '' diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 201930c53d6f..fa090d503547 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -5,7 +5,7 @@ akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtspeech + pimcommon, qtwebengine, libkgapi, qtspeech, qtxmlpatterns }: mkDerivation { @@ -19,7 +19,7 @@ mkDerivation { akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtspeech + pimcommon libkgapi qtspeech qtxmlpatterns ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index fd4180a8dcbf..06512f6123b1 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -43,16 +43,16 @@ let ]; in buildRustPackage rec { name = "alacritty-${version}"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "jwilm"; repo = "alacritty"; rev = "v${version}"; - sha256 = "17802fgfkp80872wr6qkjhs3gdjjw2cibigcifqnzcfzwabp07iv"; + sha256 = "1yjmlvxs5vwqhgjlb83a4hq2b12zzhr4pp209djprgdi0cf2bbqw"; }; - cargoSha256 = "0adw5zwxy1x9laa1fx11j2bhhs2w7c9n0xnjwxw8vchqi4xwqvy5"; + cargoSha256 = "11n5xl43l07zycdg0icv4i7mh6zy4ia6aw48i0wm59xqdl7xqn9f"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 9b1c99c3eedd..cd3ee82acebf 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.37.0"; + version = "3.38.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "12si7jag5ildy08h0nfs4rfpn417i82valxbk2wjkypp226gqi05"; + sha256 = "07fvpnabk17sfg81xn0bsnw36k45hawwz0fcz5cmp5qydm85ncv0"; }; patches = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e90fccefb065..de42f2d96571 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.3.0"; + version = "5.3.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1gn52bffjn2fw9yhi1rv4iy9dfdn5qxc51gv6qri5g0c8pblvh7m"; + sha256 = "05ra1bicah588q5n114vd9jqk9qdjix7b0zv5z83cagksb3n52rc"; }; installPhase = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4ca82f1adc32..c6f83104fb13 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar }: +{ stdenv, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: let qdarkstyle = python3Packages.buildPythonPackage rec { @@ -13,15 +13,20 @@ let in python3Packages.buildPythonApplication rec { - name = "electrum-${version}"; - version = "3.2.4"; + pname = "electrum"; + version = "3.3.2"; - src = fetchurl { - url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0nwipn1alk3r54zpsv2bdwsqxw4f08bxnfmygnwakfkiaifmmhxg"; + src = fetchFromGitHub { + owner = "spesmilo"; + repo = "electrum"; + rev = version; + sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i"; }; propagatedBuildInputs = with python3Packages; [ + aiorpcx + aiohttp + aiohttp-socks dnspython ecdsa jsonrpclib-pelix @@ -36,7 +41,6 @@ python3Packages.buildPythonApplication rec { qrcode requests tlslite-ng - typing # plugins keepkey @@ -53,6 +57,7 @@ python3Packages.buildPythonApplication rec { # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py + substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 ''; postInstall = '' @@ -65,10 +70,10 @@ python3Packages.buildPythonApplication rec { --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; - doCheck = false; + checkInputs = with python3Packages; [ pytest ]; - doInstallCheck = true; - installCheckPhase = '' + checkPhase = '' + py.test electrum/tests $out/bin/electrum help >/dev/null ''; diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix new file mode 100644 index 000000000000..7a89f6952f21 --- /dev/null +++ b/pkgs/applications/misc/fff/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, makeWrapper, xdg_utils, file, coreutils }: + +stdenv.mkDerivation rec { + name = "fff"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "dylanaraps"; + repo = name; + rev = version; + sha256 = "0jvv9mwj0qw3rmg1f17wbvx9fl5kxzmkp6j1113l3a6w1na83js0"; + }; + + pathAdd = stdenv.lib.makeSearchPath "bin" [ xdg_utils file coreutils ]; + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D fff "$out/bin/fff" + install -D README.md "$out/share/doc/fff/README.md" + install -D fff.1 "$out/share/man/man1/fff.1" + wrapProgram $out/bin/fff --prefix PATH : ${pathAdd} + ''; + + meta = with stdenv.lib; { + description = "Fucking Fast File-Manager"; + homepage = https://github.com/dylanaraps/fff; + license = licenses.mit; + maintainers = [ maintainers.tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 96f8cb116143..0fccf83acf76 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -79,6 +79,15 @@ stdenv.mkDerivation rec { for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done + + # Add desktop config file and icons + mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps} + ln -s $out/opt/google/earth/free/google-earth.desktop $out/share/applications/google-earth.desktop + sed -i -e "s|Exec=.*|Exec=$out/bin/googleearth|g" $out/opt/google/earth/free/google-earth.desktop + for size in 16 22 24 32 48 64 128 256; do + ln -s $out/opt/google/earth/free/product_logo_"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/google-earth.png + done + ln -s $out/opt/google/earth/free/product_logo_256.png $out/share/pixmaps/google-earth.png ''; checkPhase = '' diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 1810d6d5c476..f7cfee3e6516 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; + buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { homepage = https://blog.sarine.nl/tag/gpxviewer/; diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 2a26d7ecf278..04c3e0320f65 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -11,11 +11,11 @@ let ]; in stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.1.1"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "0ss0ip6yc7sd8b1lx504nxckqmxjiqcz105wi3226nzyan489q3g"; + sha256 = "1vr4j2vb2wpn8qzgq30l8kfck2an03jwchwywyx4zsl2vz3qp70x"; }; buildInputs = [ dpkg ]; unpackPhase = '' diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix index c718d6c7bfd5..902e9268f722 100644 --- a/pkgs/applications/misc/img2pdf/default.nix +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -4,11 +4,11 @@ with python3Packages; buildPythonApplication rec { pname = "img2pdf"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "07wxgn5khmy94zqqv8l84q9b3yy84ddvwr2f7j4pjycrj2gg7si8"; + sha256 = "1ksn33j9d9df04n4jx7dli70d700rafbm37gjaz6lwsswrzc2xwx"; }; doCheck = false; # needs pdfrw diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 30e36c3dcf0f..3260f6a50690 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - pytz six tzlocal keyring argparse dateutil + pytz six tzlocal keyring dateutil parsedatetime pycrypto ]; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index bac0eaaaba6d..d6e05056e1c1 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -34,7 +34,6 @@ in with python.pkgs; buildPythonApplication rec { atomicwrites configobj vobject - argparse ruamel_yaml ruamel_base unidecode diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix new file mode 100644 index 000000000000..e0a1e33dc628 --- /dev/null +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: + +stdenv.mkDerivation rec { + name = "qMasterPassword"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "bkueng"; + repo = name; + rev = "v${version}"; + sha256 = "0l0jarvfdc69rcjl2wa0ixq8gp3fmjsy9n84m38sxf3n9j2bh13c"; + }; + + buildInputs = [ qtbase libX11 libXtst openssl libscrypt ]; + nativeBuildInputs = [ qmake ]; + + # Upstream install is mostly defunct. It hardcodes target.path and doesn't + # install anything but the binary. + installPhase = if stdenv.isDarwin then '' + mkdir -p "$out"/{Applications,bin} + mv qMasterPassword.app "$out"/Applications/ + ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword + '' else '' + mkdir -p $out/bin + mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps} + mv qMasterPassword $out/bin + mv data/qMasterPassword.desktop $out/share/applications + mv LICENSE README.md $out/share/doc/qMasterPassword + mv data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png + mv data/icons/* $out/share/icons/qmasterpassword + ''; + + meta = with stdenv.lib; { + description = "Stateless Master Password Manager"; + longDescription = '' + Access all your passwords using only a single master password. But in + contrast to other managers it does not store any passwords: Unique + passwords are generated from the master password and a site name. This + means you automatically get different passwords for each account and + there is no password file that can be lost or get stolen. There is also + no need to trust any online password service. + ''; + homepage = https://github.com/bkueng/qMasterPassword; + license = licenses.gpl3; + maintainers = [ maintainers.tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index ab9029512a20..abf4bb054621 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,7 +3,7 @@ , makeWrapper, perlPackages }: let - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation rec { name = "qdirstat-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = "${version}"; - sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh"; + sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc"; }; nativeBuildInputs = [ qmake makeWrapper ]; @@ -20,18 +20,9 @@ in stdenv.mkDerivation rec { preBuild = '' substituteInPlace scripts/scripts.pro \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /usr/bin $out/bin - substituteInPlace src/src.pro \ - --replace /usr/bin $out/bin \ - --replace /usr/share $out/share - for i in doc/doc.pro doc/stats/stats.pro - do - substituteInPlace $i \ - --replace /usr/share $out/share - done + --replace /bin/true ${coreutils}/bin/true - for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp + for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp do substituteInPlace $i \ --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open @@ -45,6 +36,9 @@ in stdenv.mkDerivation rec { substituteInPlace src/StdCleanup.cpp \ --replace /bin/bash ${bash}/bin/bash ''; + postPatch = '' + export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" + ''; postInstall = '' wrapProgram $out/bin/qdirstat-cache-writer \ diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 5417a135dda4..7527fe963abb 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -16,6 +16,8 @@ python3Packages.buildPythonApplication rec { sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; }; + LC_ALL = "en_US.UTF-8"; + checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ]; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index e57e9394c105..a10b58d00b61 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,16 +1,16 @@ -{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: +{ lib, python3Packages, ffmpeg }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "1.4.1"; pname = "sigal"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit version pname; sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61"; }; - buildInputs = with pythonPackages; [ pytest ]; - propagatedBuildInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ pytest ]; + propagatedBuildInputs = with python3Packages; [ jinja2 markdown pillow @@ -32,4 +32,3 @@ buildPythonApplication rec { maintainers = with maintainers; [ domenkozar ]; }; } - diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 680703737c2a..ddf8cf18fc71 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, - glew, eigen, curl, gtest, nlopt, pcre, xorg }: + glew, eigen, curl, gtest, nlopt, pcre, xorg, makeDesktopItem }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -112,6 +112,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin/var cp -r ../resources/icons/* $out/bin/var/ cp -r ../resources $out/bin/ + + + mkdir -p "$out/share/pixmaps/" + ln -s "$out/bin/var/Slic3r.png" "$out/share/pixmaps/slic3r-prusa.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; src = fetchFromGitHub { @@ -121,6 +127,16 @@ stdenv.mkDerivation rec { rev = "version_${version}"; }; + desktopItem = makeDesktopItem { + name = "slic3r-Prusa-Edition"; + exec = "slic3r-prusa3d"; + icon = "slic3r-prusa"; + comment = "G-code generator for 3D printers"; + desktopName = "Slic3r Prusa Edition"; + genericName = "3D printer tool"; + categories = "Application;Development;"; + }; + meta = with stdenv.lib; { description = "G-code generator for 3D printer"; homepage = https://github.com/prusa3d/Slic3r; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 5f12bdb4dfcd..25855c2a6130 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper -, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver, cf-private , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl openssl ] ++ lib.optionals stdenv.isDarwin [ - ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ApplicationServices Carbon Cocoa CoreServices ScreenSaver cf-private ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; installPhase = '' diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix new file mode 100644 index 000000000000..15ee275c0e19 --- /dev/null +++ b/pkgs/applications/misc/tdrop/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper +, xwininfo, xdotool, xprop }: + +stdenv.mkDerivation rec { + pname = "tdrop"; + version = "unstable-2018-11-13"; + + src = fetchFromGitHub { + owner = "noctuid"; + repo = "tdrop"; + rev = "198795c0d2573a31979330d6a2ae946eb81deebf"; + sha256 = "1fhibqgmls64mylcb6q46ipmg1q6pvaqm26vz933gqav6cqsbdzs"; + }; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/tdrop \ + --prefix PATH : ${lib.makeBinPath [ xwininfo xdotool xprop ]} + ''; + + nativeBuildInputs = [ makeWrapper ]; + + meta = with stdenv.lib; { + description = "A Glorified WM-Independent Dropdown Creator"; + homepage = https://github.com/noctuid/tdrop; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ wedens ]; + }; +} diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index eb7a8e41d4b0..ab6ef3294700 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus , gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret -, perlPackages, wrapGAppsHook, xdg_utils }: +, glib, perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { - name = "tilix-${version}"; - version = "1.8.5"; + pname = "tilix"; + version = "1.8.9"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; - sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7"; + rev = version; + sha256 = "1l1ib3g01mxiywbwjxc2522qgjy3ymjzy8bxl42k0hprpp95rw9d"; }; nativeBuildInputs = [ @@ -25,22 +25,20 @@ stdenv.mkDerivation rec { ) ''; - postInstall = with gnome3; '' + postInstall = '' ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - - wrapProgram $out/bin/tilix \ - --prefix LD_LIBRARY_PATH ":" "${libsecret}/lib" ''; - preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH ":" "${libsecret}/lib") + substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ --replace "Exec=tilix" "Exec=$out/bin/tilix" sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop ''; meta = with stdenv.lib; { - description = "Tiling terminal emulator following the Gnome Human Interface Guidelines."; + description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = https://gnunn1.github.io/tilix-web; license = licenses.mpl20; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index bc36ffa5e101..b268bdd0962e 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco -, qtbase, qtwebkit, qtx11extras, sqlite }: +, qtbase, qtwebengine, qtx11extras, sqlite }: let name = "toggldesktop-${version}"; @@ -39,15 +39,15 @@ let qt-oauth-lib = stdenv.mkDerivation rec { name = "qt-oauth-lib-${version}"; - version = "20180521.233208"; + version = "20190125.190943"; src = fetchzip { url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; - sha256 = "0f46d44slzvzaqx0lksvv14lsc1jp8vd2mragxd61r820hybf5z3"; + sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebkit ]; + buildInputs = [ qtbase qtwebengine ]; }; poco-pc = writeText "poco.pc" '' @@ -100,7 +100,7 @@ let libtoggl qxtglobalshortcut qtbase - qtwebkit + qtwebengine qt-oauth-lib qtx11extras libX11 diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 1fb43715a063..d07c4416780e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "65.0b11"; + version = "65.0b12"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ach/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ach/firefox-65.0b12.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "852f1c81849e95a1b52db156aef3a265fc30bacefc1d7b1b6e8176905b15d5a661d4b71ff28fd23f94f1143083dce6f0710de84b33fe44625d8d885681874921"; + sha512 = "aaca1aa4438ca606790b1852f0fe2c4bf1c735b93c63ce61484ff93cfbcd3920b10099179b0986ebc925671e6a9566bb814c2126188bdf7874baa6df70a501be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/af/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/af/firefox-65.0b12.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "98e05d94365c1e329c77f8e4c061c1999c85b223e04a64e091990e35bd457cce5649f28f90df408b761cb92b3f209aa278be52df38042feff0ce9ed5dad9d882"; + sha512 = "5f5413975d34db95726c442ca493f04d9d0532e701f37c98d15e81daa7535a7c81685a7e5dbea9852895165be1b5b201998fc90477907583c2ca4a3f15e62dbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/an/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/an/firefox-65.0b12.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "267bfb5a399543f7e2148ccee1ffb4d0a2ed8ed35620bdb8a5549471f084a2609e7d0bb3b381424d000dd1154f463cf03d796f3241ee6f17ca8b235e1e8341a1"; + sha512 = "4c39b51ac1bbf9485d7e218baa2297853ed2fd742a4b311247949db8b3ec733545448173da0ca1f15dd91e46929d25bcdb0ae79a7cbaeffa2b656651c88ff805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ar/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ar/firefox-65.0b12.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "dc6404d25cabef0821d2875a06f64c9e821c552ee482d61e6242ebb7a5bf8fea56f3423a4f0ea8e27e640d3c1a8b2024fce37f2aca0e23e5d4485912b6f16fa0"; + sha512 = "b61e63941a04e040c100b7fc2c7ab02283cdeaccf3f1f7fd65c631ea30e44f281bfd82a37669b37b86d9637871e5c712fc4a74d37b517a136cb5af2461fd1eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/as/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/as/firefox-65.0b12.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "9a7161ac423ecc40e3e6e3fe38c7c02795c095cb19f1081913ccfb3a0966c3c17eb12d33481fc962e76f90380c27dc6de4e2e5e0b81f144730cb10d364600a88"; + sha512 = "61c4c9b6d31c546ffd2238e7502604f50199c28fd69803c92c6cc93f55f7db28fc31d6598b8bb16704ee17e74b2f68ee9f687805f1394b502b2eeb410d701ba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ast/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ast/firefox-65.0b12.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4b744e5448038107d920ec6c9340f43f4c77b6d2abdbac9cc888fb16f72b4ab209ab28757f0983a376ef1dbacd37f8838a1d21aba9d0911d2ce98e51e49021b6"; + sha512 = "964d73fc59bd13c4c026ff3d404460a6a9e31a53d365c172548e60933143923500fa56482168cce6d5651d85adf40bbed074f13059577d28e2df35a20aed149d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/az/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/az/firefox-65.0b12.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "22f42909eabc3312ba72fe19913cbc197a6ee746f4c86d07ec15b014f6ea8df524cfef7f0259c8fbb890ef7b432448e4ee6b14a48b3e427201c21e133b8a5aed"; + sha512 = "748445aa6f2c41562b8c0547a07c320bbb50638e91d6fed8325b29c0633492087200ee1dc60fdd2dfbd4729397234d3208127d97cf9d8893b58fb3612db75d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/be/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/be/firefox-65.0b12.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "7ee472a3017ab650f3623724e4976d43ecdae0a2435b652a20409a751ad2e28d05e9a6fcf8cabe56ab7f21a8a41246499c0594b14298183d64372332b9cb92ff"; + sha512 = "8ca527ef41fc373603f7ed9dc35b309b047828fac0a68151f5a99dd182cb33e76c6061e303b127bc8f680252ceca82ca47a08fc195241145175c348f0c6c370c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/bg/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/bg/firefox-65.0b12.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "3fa027b2e469dfab4e653a89683271a45cef5fdae6c60e38ed42b13bfc6aff71022e6ac464966f973d1f2071450ff18d58b8c9e8badd9d2dab0656f5747c1dbc"; + sha512 = "0bd051045c5062b4e026a76a38d190fc823d662e11c437f223f9ca09c7d06715e9281255c6fbe697fe437c1dc9e203f5f6790b288baef3b65cd5de1825f8c7d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/bn-BD/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/bn-BD/firefox-65.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "b1f4fe426cd6edc240fee006a101de99de651578a5375975e5eb431728ff7de889bdcea6cd86d3580fd5476f3fb1e3cdbfe0473b04cda1f8ebb3e49573ec0054"; + sha512 = "cba5c69324b5a126b3f4d4cefd27748e5bda5cbb979e3b20f22c8370a930d20b19adbd7170231597455eb388f8fc9a53353295d089b16e6c733cba556828db8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/bn-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/bn-IN/firefox-65.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "a81fe3d8d2cc315c2a8902071251f0e376548600464acc01ea030e099f380e1f0f87c4d14e7551e2a3c472f920d628a0764141e0bc4bd203704f634d34309b12"; + sha512 = "c9739b1d893299b0333321044275f8ba80a2a13e2c9a9ff4e35777ff27d3f32a88c94368ad75c3fdbc368ac873fe18eb635060c80b158266a77f144c77f0f037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/br/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/br/firefox-65.0b12.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "eef1c4b5a3c138686b176fce270eb0202f5081abddaf8f3181dce04aa25f0f10fae2ddc899bce5343420838b639679474e908e2a2615cb4c39c56537cb79b926"; + sha512 = "10c83f9a995d6a04339879f0f8d52be81c29804934db75ddb20c5efebdeaa26bccd7c823f7991dd842a23845cc829a2255e2a57807e21023f5aed1849836c065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/bs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/bs/firefox-65.0b12.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "5c79c850eb05d539c938ece146c167f43e44ef89efc8001c6863a639a69d39fdf4af493815cde63fa27a226c1ed47bafe97039ae3d8c4d5ce844973fcde350a2"; + sha512 = "3f9d85c0238402d2076595d549d5a713280b957a0a1f9b27e6de39b60372bcdea7a21e1e700d10ba716cd72a971920494d3810c4392bb142f27937a331c77d02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ca/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ca/firefox-65.0b12.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d4cab6e39f6a24e78d3f8ecb98bf4a1047622e2b4fc6d48f28f8035c6222ea1a9ab7fae11c742e328258c99ea97324e6a13fb28080fa8ef4e6ba07256361b4f0"; + sha512 = "bb29b1d132def46fc01e8e7f850b63a36d3e089d24cbbfa8f5ee99ffb9d7823fca85963cbe583122f36fb74336b74750f13578fa900716b5b689c3e8d4a68506"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/cak/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/cak/firefox-65.0b12.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ddca81b4246887fb966b0596079c808d25bcf8cfd9caf0970ddec9b3ab3558864a70e9839fd31061d84d4f12c696d1983e51ac5c0edc3cc02146cdf9a99fa029"; + sha512 = "277870937a1b6b35404437e660e8e8f7006769838c935297af0b5ce511d790593cfd4b69c0a7498a02ccd8068d635a706ae95da72d0f0a7063358ee77ea2f41f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/cs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/cs/firefox-65.0b12.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4aeee96c717852b94ccdc1dfa858e6b4133590768159e94b5e8601e5f5304733e1a4968d0f26db898681a9852928b6eebb24eeb046cd3e12c6f843cdae53d38d"; + sha512 = "6e3961d9df1c89109487c2ae98e2cde159bd6d9900b0c6110e24312970cb2dd3fe80a6352cd60bed1c5be837043bfb75bed238941686479dfa5cd7c65e6eceba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/cy/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/cy/firefox-65.0b12.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0a1d2ee6d8defd36d1fd2a6a7f5a118f416e5cefae29b1a21b2004614a44ee075ae5c69fc8e14d59b059764c148879c6a25a32d4412004d326e9a830215265e2"; + sha512 = "a30dafb6b732412501dc3749a22874df74a814b542a7acb08024343e2b958b94a45814203032fd66f833ff499540a500ee2516c6b328407ffe4c40acc38b4e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/da/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/da/firefox-65.0b12.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5ebc3265e8fd2235019e3fbe5e31f4889c458a3e9bfe1f28ca291ad64a58660a9cace6cd5b285f0f90e03f2aa743ff29215e3c4c632793b95701bad752223efd"; + sha512 = "211da6863445cec0743eeafd22d02d53bcfb71506e4dd7f8d7fe4c602b6d74c681f5d102985f0b6c8c2481aeb26a44370a1da29cdb5de66092819e86fd1e18c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/de/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/de/firefox-65.0b12.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f5518a766fed18c1315b6e4d21fb0e23b2c9ad915e4766df8e1d6186445c3ae778f7098da4ec008a37f788cf63264cea8fc9fda96696b0f2e0f9fd1747e63a81"; + sha512 = "f2df03fb7cd1d8c2b06ba77282f1fb35357faa57ffa19adb3930db0f8f10de032a7c790487b356fe0981e8e42449cbba5194d3efaeb4cb47fb32de5b7e6cf148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/dsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/dsb/firefox-65.0b12.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "7c8016480802eee8df2809ff5d7321604d9601e70dc68a20df457ddd34e249841009a980c8412d458144cd5b9df7c16024c6ab83e728bd9ab3764a59e731dc5d"; + sha512 = "c942f341c8dda696a774b025a7102e754ed3512bf352500cb84ad8914c0ac4349befa1d84b601a97d26cabc741bc81ef974a318be00ce489e7abc9c5f34f9c62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/el/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/el/firefox-65.0b12.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c973492da7a86d9824cae248a8490779e875fa38973d5c4200079d28247bb98d1bc0f862a62fdfea060bbf6c0ab2847d81ab3876a9746998b7073eed6b194c80"; + sha512 = "ada7768a3b55aa214560e4c83585662d1278b5cf80175802c90b1a72f6b688a4d4e7ca84ea992c233ffc9aeedbf7ec8085d57172aeac5dcb4709cbd19d31b7ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/en-CA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/en-CA/firefox-65.0b12.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "7a21a976dfa3dd8fcd823ef845b12ae1f88ee93319e8a7906cd959f225730d24600af3838072641be0051bf05fc739f6f939d9c84f3da5b1759d8fdcb89c616e"; + sha512 = "a45cf77fcf00be065a4b6a260b5043e48c4304314fbaa45b561c3a5d400eb96d7d83449d9959a5f12dec8a6f1c4a8d7d0816c663e8399d068adaf4ff9c8997e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/en-GB/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/en-GB/firefox-65.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "fc6b96e8c991e6a673a6335390e6ddeb23cf10452b3ae6d0f2af04dc9816823c1adb59191c8623ad503500462672533722d852f2a157e0759111de1e17acf597"; + sha512 = "7366cd246897fdc7fd9707c6946936b2fa69347fd152a783390fe97ea83587f20edba28fb32c3abb1f28272f6a35856f041f659f2dade8f2d75c2fa56b08a54d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/en-US/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/en-US/firefox-65.0b12.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "8aff407a1631c9e0e3e86b35f7c4d02bab1878d25220446b92ed31322521c8f13e55cc0aa9a262ad36a5cb61459dde88fe4f392b532b26680cd944a114145fe1"; + sha512 = "66fd9ef2538bd4fbe35778fa967775731227eaa490aa14827cba8126e2d4d641883e7d1404772e0eb15ef15eb6c8439f8c677fb10d442494ef70b5d6b80ac36c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/en-ZA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/en-ZA/firefox-65.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "92ffd0c40b0f185622935b96867c4d6b8e9a46bc1e4215bd0988a563c774bc5c6bf3b173824a303d2adf27f5cc7ed13938f2d8682bd0f0fec8cccb7a6585079e"; + sha512 = "2b94c548479c386e4d967163e9d3399f4d10c38f5ef8dd955dae86701e4a5822e9d0731567efe9e45c6c448f0be0d052c56bf359242dec93f9ddeb18c8577bf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/eo/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/eo/firefox-65.0b12.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "95481d474a84d7846363cc517bd57352f1a18035b1fa52539ba1f0d02ca19b03f1faebd40d352d05815b3f5582446bd09497a1e863757db9b7242c2a2953c2fd"; + sha512 = "24c04518eaf63f6413e506a4e59e6fa4b9144a80a9242b638719c1812a0f107c0ec7c7951c24064843d784835f37e05102b1401f74bee9ba9267ac2fc15fe5ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/es-AR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/es-AR/firefox-65.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "dbe567a9c65e7f2f132a26fb6310a8612c72c4f35ee16cbd7ed4e8ab39590873979efa8d1a80f2a29c1f465fba95b57fe5072cc59269622393798df9491eb62c"; + sha512 = "b5e4d70432eb0c3e2a52e7d651928eae2a6a42a9b58c66cb8173daf9bd3619d3a74e35172987f3c95091ca46c212e811eb073ad3368ab41c09bcd9aff51d560b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/es-CL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/es-CL/firefox-65.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d3cb6d0109e2bc3bb870a070cff8dbdd193bd57de7e63c19edfc487889fa7024089ce31453a7d0eff12534c40087dd6ccd813b08139549081d24811621c09836"; + sha512 = "1e82e4ff5a2480a71ac6a1c20f2bfea41055fbe80fc40e112bae446848c3a7e67526e276eeb54a3de496790651eeedb5e1e6217fb8d6675f68c13623eb4474dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/es-ES/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/es-ES/firefox-65.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "8e397177cc6e6af71d4f957082a757de845a3660b558770c794fae3f3b651ee08c74914101ec9884ef688372f3cd0ada7cc88a22e3e5d53709a77684b9cee72f"; + sha512 = "5d19312f384664097dbfb1903a95a7892e59d53183397614ded485b73572ddb675f9e7c84a87954daf71155749e107e9574aff64a1cb95d216616c06aa07c42e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/es-MX/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/es-MX/firefox-65.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "b5ed96dea80ce84a957bde26348721fb9cc78660c0f383e50b4895a08e756c1298799685498045fddbfc4ec48ab39321b6ff2794153f496830cb480bda5a3d61"; + sha512 = "124c7f3ea196c1846582afb48e0fa2f016757e71e0bb0b947c44ac31bdcc812d6a04c194950d8948c996dc878ab08fbd0d01eb1745480b89a91a3f5ebae85bc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/et/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/et/firefox-65.0b12.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "aeb6979c72acc790d784e2084d57b75494626e968e4ed2816ec0c78708226126d341e80849346f97c251f1885f8a013572eab54971139d95f4eb99443b88e4fe"; + sha512 = "17ab8d6181ad0e80cb33952269127fe2a2444ce999a59b1b56c6a8da96d6268b5b9ff78acf14ec6962e747f1aa33058d18dad891c32d98efea6497b5c4754d11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/eu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/eu/firefox-65.0b12.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c79097d8f976863a6b5bab7a7fab17678c1a934f2aac9ff7bdc8156f7a21454ad8bbc0d9a322958acc0fe2a6ce2ec5707b744df3a4d8792e9eab2c3e5a01000c"; + sha512 = "f2bb7d2c7f7f286e337008fd1abcceb3b3a8f2c0dc267732f6c891e0a1c3022e741f445192d68ea11ec92612b54bc6311271218df9434fb82de2798e14a00266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/fa/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/fa/firefox-65.0b12.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "da333712491216f4cad2d82abadd24b008621f4c6d9d9f85b6a66e33a033b78c1cbecdbd0e25accba57cef220af6485705bb2d71e5915a713a187722ffb935bc"; + sha512 = "076074a6c5d73157e1b4256a34248a2aafca4623559c91b657648a884d7a4946b95537c731e14297bbb5e1c978098f23e772c888d38c8909ed046bebb2970a2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ff/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ff/firefox-65.0b12.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c37db0264db4a204413a0fa368d26f3c285f609d3acdc4aa198c4bee64ff558119f869d2a4ea5caec3061ade4932590a0a1254261c8830aef3c568846f385ebe"; + sha512 = "9e94e3fe3818c7d4715d6f97fcc2f64d888b5e7162efbe055e5f2169efec019655b64948a352dfe7e65744019c18fd6f125d8aa862f2f1b8c92f93bd763fbb82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/fi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/fi/firefox-65.0b12.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f322df1df42c345ebecce6427311e4e77b55d5cfdcc45a3e0ce5adeb55fe1b899366cc9bbeebb02ae9b2a1a5f9ec1ce36765709ef546444324443b9c5a22d6ad"; + sha512 = "906f0633fca34feb927b6295f2f649daf1ba091cef3b8d9c9168d248d3e81a72f4040189c68de0611652d617e4bca4bee83a9b85f9e2c1796b49b54fbbf23d74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/fr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/fr/firefox-65.0b12.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "948cfe12b2b928a0753f760ff3c882bac1e01e858cb1f37df11d5d0b9398a3bdb337c706153fc5a782c300fcb4c67a5e3aa23665f83e66e306e4052b4df4701b"; + sha512 = "8be60ee83fcd3ffa1be41c789aa9288fdafcadcea2f412560d559d24bd4deda94f6e4d9cff8e677129c0513dcb6b1e9198eead2ea2eed8e51424f925e96d6045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/fy-NL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/fy-NL/firefox-65.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "770bd127c526319fe5ea054eeda55e241249942e65f5d2d04be5fa645700e835e32638cde631cebb2d553cc8f29db81a69324c87b1b664bfb4137ae6f410336f"; + sha512 = "0738d9cfc0a5a065f72acb9b08a01557e01b8ed8fc063d3dbf5bac48a256351e682fae1b8cd2281d830588c4d100b176a4c3197c5683c9e95f41a66ddf59efed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ga-IE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ga-IE/firefox-65.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a8c84fb8cab5eafeaeb5ac5d4c17856d50a36fe1f60c9704057635584c9e16209304fe6b19f2e4ce04e5a454d26d482acbbdd0d05296104cad9b2181db263786"; + sha512 = "381f553b761b4e241d40e30fadf177bcdde8d0375beed1f750ca006a012a09e9d97f06f5e013d5cca4e79255ef0fc5aed0a73e2ecdad871f1306c4a895ff336e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/gd/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/gd/firefox-65.0b12.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e2ae0f413c836ef02dca8f96023e4412658380de1cced076d9e3354328035cfd42091bb945455ec1d15d98cf9f029f5920d0dddb97f0935fe6e505518864388e"; + sha512 = "838c2c936fa9cf1879a9598196f66f738393012d07d5c59ccd5659a1c4df2ce023b337d03a8cea6e615ab332eb9046d174926e6518508fea83b5efb35fa63ffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/gl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/gl/firefox-65.0b12.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "d66c64f5d4bf1401f8ea6f27deb70f5ece36ded9d8e0088c008d2e112d6217b39402f46444870ca08a566ce9d47e9f2109e070a21b5fbd7664054e339490c59c"; + sha512 = "c23f50cd67d50be9cd0663f756c060603dbe4a743c8053ebb3e65515dd2983994b342342e8af2af23523962ccbea370359280485266f51a6c90f5c6988383c1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/gn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/gn/firefox-65.0b12.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5c31817ba2f5381763626cc2b40f7b79b30bc97b2ff5360af8e842bed90ff4d73fac0fe906f7302ec7fffae75300ce794a0ecc1824e38ea96f1de66516fc7359"; + sha512 = "b1d264c2dbfc51f28a15fa5746976275e1de30b2b2d311af8908f77cbfe39f0c125a9009b8ba66e20c182c0d6b4d4764d149594278028c4a90337879d7f57d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/gu-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/gu-IN/firefox-65.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "961cd49cc395be3a1b71a58118595842300b5f9d4aa59c291a18ddb6cb4da3e1e8b148ffb0cefe7882adec8df5cc9ee2a2fcba105a4182c7cb44376c70b66288"; + sha512 = "73dbe533dc9d4db2707837f915b2c1fd2acc26c464fab29e3545d9ad0908a940e993fe9d86721ba0ca287d0350152ab152158ec29d091db0013b3fbf68060f0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/he/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/he/firefox-65.0b12.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "846209daef39c0a171b9a55d0482046fe3ac5f00c8aea3b1c648705202875f33f4c0dc26f3eca9e91b041708cef87839959e6e0160f95a7a4a6376bcee35cd42"; + sha512 = "4fe7e5016bd62428c6654fd04fdab5019af7bf5c245a66ab22c93c7c4a0bda57a51cf868a698664455d1636ea7fbd2d9f99e9d1f8de9c8c1a051c3e48094905d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/hi-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/hi-IN/firefox-65.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "82abfb9b11267e59c688c17efa3f01b72318eda51ec37dc11c8039acd14d17668256db6ddd406909932f836b2225a3b3467999563fc3dd65f0bce0ef1fcce0ed"; + sha512 = "ec964e714d1162320f7766678d528526d93704b40e1694181a8ee38131b0e7393c89c2cfb76c3acb182b3a86181616d47333a82a70bd75068f2d9e566fd0e430"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/hr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/hr/firefox-65.0b12.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0fc02db4b963add6c7e190a2b47289cd3e97ef8764725dac49bea82522567fe8ca19a9590d8ba93929c722da5414dd910040586327c1d935b932c4654073918c"; + sha512 = "cec0e0981f07ec4f224bff6a561a235434c449c4cf6d1eb678e83ad2a4526ebb56374e2bb32cc1289cb0690974d5eff12ba00c83c80197db9f9f2792a698fe49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/hsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/hsb/firefox-65.0b12.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "95b4c946d065d72ef0a3ce37a2383efd2ca45e3e3bc49aadd9b3494a4fe82a1ddd4cf38748cb182a13dec2a4f53d4e435e0febee64639fee80d13ed8ed975581"; + sha512 = "81a48c59dc8c9ecb1e6a68d7e8149bd114280cf3ccbeba1353ae1c5a9e68e1516a67bdf09f06796d9071ca9f721a1cf5ee7ffb9742388475637bf3320d79ee00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/hu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/hu/firefox-65.0b12.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ace56b9c89edfff796c3a0e4cf8f5d59c88012759dbe377cb9634e9255829c9841f9965055272e48b7b63108deebbfb4a794ac8242e783018d47daccb2f4d932"; + sha512 = "6d0adcf72fcf692d37ef30cf5870f0d9644ecab20dd764f6c159c3353cd516dae90b48947efb4df36e7443ffb62e9849c663adebc1bb1cc993105eaa0b05e85e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/hy-AM/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/hy-AM/firefox-65.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "18c8ca101c31a5e5cd72053a7821c835dd39509a3dd439fbd505a77fad923e812869043beb91c80fc384f6946d01c422b1b9ea274ba755c039422900a929d14e"; + sha512 = "5b30010a5075cfe39bbe07fc247ef148aba9504230353d73b1cce24d761168d63bdcc5ce2cb203d4d3a3419180c65fae5c19e48984d9a2a65205a03e8c78ac71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ia/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ia/firefox-65.0b12.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "c2fd37c14aa7721adf761371010374dd7d5a5c4fbd286eb2ef4e177632dc7520cb8702f6511915945c1e8aaf4d561bc578905c15dff8be2ed48fc05c89396470"; + sha512 = "7fd5ff9c00530c12113bdba81c30071084f3d10581f079064fc8d6ed8704398be4fe02bf89dbfda702254b0445bdf57617c0f4d9db7cc4015327a86470b69018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/id/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/id/firefox-65.0b12.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a7c75f4dfb80686f3d689ff664c02af6f8635bef3dc7ff98609e82e01ecf185be3aee39991d5273686b36f2d467e1c1969e240834256249afbe15b98021d0709"; + sha512 = "75d52366933f05ce620c3e8759aadc72f1130046f4b98817320ad792c9f3363b1f21a4785ba0c85e63412f391cd225c1e55dfcb700a03c75970d8c26126ea728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/is/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/is/firefox-65.0b12.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "6f0d44dfdb6d57f8eba4b066554ee75f2c097de69595e53eb395880a98234ca00da34d6324abba76954bf48bc076fd2f558ab594ae616de18249f21a4443ff46"; + sha512 = "6d8ecd4535e1e882b9dd1ff2226d1ce14bea9a3f04f95a32cb1c2dfe03604da54e9c53bd090fc6911fa5f0c53fc97e34c198befb7ae7797926174754e5156c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/it/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/it/firefox-65.0b12.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "137ef9e49ccf1c3a07ac1a6c95dac659cc1bb0d48e5506b8c7bfe6ab7cb7c1c352571bccb7fd45498ad2d972cd1692efcec337973b3e62d798b171b0bd2d2d0f"; + sha512 = "a184a5c3cb93867c46d251722c22e18a1a2f68306262137e767e4ea0e1ada3b633f96a59933508c6b67cb90f60e6736fc3985b9d3d4f96dcc529e68ac1ff66fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ja/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ja/firefox-65.0b12.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f8784970443caceaa041dccf2c35abc986f28a936a837e417a47a625d3794666226495d6f2e1acf22a0cf4c481f3609460e771e6b2400b0c82c9f5a72500351f"; + sha512 = "3d30bce9e0136b412ca12f47992179dc2317799733623401f60f4258b49acfca7ddcd3fe8b4e6307dad7111943fc169d595528559d15608df41434e69a826b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ka/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ka/firefox-65.0b12.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a025706a4246799dfc4cc5c7b08b14c385e21a7b29ea0cfbebdfff9f7af466e6988934b51dc3023ee9785b17a1a3840687f53c67132dc6bca7ab3caa019426a5"; + sha512 = "c1281f06ff467fca31b02848a79f37964a5e23ec712dc86ee99559a5a3c4d495f654b4951d3b93dec3d882331c0622535b521b3edfb0783f7e115b97069e5339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/kab/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/kab/firefox-65.0b12.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e2f6b99be24f6636aa3b8de39dea51b0909fd05fb06481962fdff500806ac5e7327cb9d939e162d48096a80726f0470459a500175f3cdb4210062bc7d4a744be"; + sha512 = "8332d83af9b7e9b71927cf4c37f32ffa01dbab89d37fe65713203100c7d01c9b49ff916500069a3027b5699fac08392f761c6418315a40403acfb2b81e809aea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/kk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/kk/firefox-65.0b12.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "19f91d8c47f17f5408f3fb9ae1c13fea4295b32075910de2aba6f7a39aed3e2c0a32aa843fe8e72bbc74ab527fda19e024ff73b3320af7c155fcf48d07e1f478"; + sha512 = "dfdcdf0aa7e04da93659091d3127fdfd4d2d0d8dd6127b2ff342ed221c910c4533ef9ce8ead814e33b2c3edb848931dedeebbad971c4fb1f109e2aed3da2577b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/km/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/km/firefox-65.0b12.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "a9e42ebcc76049b670ec8085a031edd5014be75789f1ca98b7becbb74ff2da6c59e2dbf85ce866940f60ec970480aa4fb86a0314a769a2fc9141217b705dad34"; + sha512 = "61cef797eb8a50153d0a419353ce73d7603e0e155016fc3d946397b31ac8d9d652bfb319fa5e43b8685768cf5442d0cc11d6f006bd431b80f5ebedd2a262dcd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/kn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/kn/firefox-65.0b12.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "56b00c1514741c90a07ecd48efd569ad2024495f9886ad4cfb8fb87aa7ccbb2b20b116a2557e64b276d1209b530026a94388cfd7bd86621bb91f989020930c0f"; + sha512 = "d48d5590278ba46a951477e20e3ea3254568713fac5786893df2de24da886585bf5c665fb5844e93db55ed05cb8ac45a4c1a1d4c1d7dce60b5c0d6c652b9d3a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ko/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ko/firefox-65.0b12.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d41a687be138fd4f74e4c5abb232ea965ccc2a6e45da45409dd6b679fe64799a667348b8625479a50bbd4139bd5700263149d535a673ff87ea2f9f86f245cbdb"; + sha512 = "32b64bdf71e34306a3390ce8bcbde6f2760171d84389d70a8f631f61ecff65b577750afa2017ce26debf415aa652a869cae8ea79506f2c7bdf5c6d2b81ea3495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/lij/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/lij/firefox-65.0b12.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "add9a16c10b5601cf2fb48f6158366c5a4e808139de47e994a5986a47f6b2f32bfa46dbe46138c005dba58dbf46179fcdc43ba397ee8a8b7cc60dc8eb30fdb46"; + sha512 = "8d2b6106519983dd641204df2c6d20a195a59a72080845827ca0b41d682aff81c30afe49a0730287c5786d720b935e57d72995ce7d98e4996bed80e4badf3c06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/lt/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/lt/firefox-65.0b12.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6842f8c98ebd5e433b74c54071e6e96bd529e499b9191e782579d5cc5af4152bb2b8e63c3edb891ace7b89349ee9fb6ac5de4b5173dc1e02f5690ecfa8598951"; + sha512 = "739415bd7eb9487791283f8927e4c25b1735c84c75d157a079334cd68fa3692c80bf188a914c8b80525ea2b22bf91b4566c3169d15763dc4fa8332fe1459a889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/lv/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/lv/firefox-65.0b12.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "88e0499414f276be1c3dfe7906b2adce2f4f4e501f855ce30f1353e146c9b307a460197474d69c7f05cd04dd02da4d735c628d4cea862163524e3a845d4c7d6f"; + sha512 = "7b55930ab348dc043e24cc0ad184be5e0dc4219fceaad99ac5f4734280c635ef615bc83916f6094f26468e050e03999a78b1c4a0e3328b28e659990f1c9f7885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/mai/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/mai/firefox-65.0b12.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "88c9aa3035c2199a99900f8725e1c85038b64fab8ec548bce4337f457f306dd0f283e88d40203c4086174ee8b2741af6f70a270fa5ac99852ac80bf855d903a2"; + sha512 = "83c703f487905d46ecd8e8b5a4bddbad8129e151cc274f20aeceeff56413249ed16d024187777237a5ad8d8581db8e7b5dd8cc855ae09999ff0ed027e0bdb343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/mk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/mk/firefox-65.0b12.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "827bbb941ef1a6e645ab90ecf1e84134eae33cecc45c7f80bec71d4eb6ff00e3dee568bac7e629895e2394f93dff03d7213529996cbceea68a9013473545faa7"; + sha512 = "af12696923d30c4336cf964867839b543190d1d54112b93f13c32e9c1b6289aae528f08f42ac5446a0941984295c556edd1cef4a0dc24ea8cdab2ef90edfc8bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ml/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ml/firefox-65.0b12.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "04c701b480cc1c0c7aa69cc07dc29d467c74be51c528a8ae74f69ad52e99d7d9f9feedfe6c8799410365312f5f9c0191cee721a8b29216039cb3c90c6d5a0b5a"; + sha512 = "17218e9651896474ad174af174e72f3dbfc478dbb4b3f7aaf41e39bf39834d8e5b53b1d2c831e022a16872ff5a06cbb01b988a8ec13d5de54e6609bf3b5221b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/mr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/mr/firefox-65.0b12.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "57815995c84bebfc4bb08c8eb0f59c984231069ce2df120d76c28036f674db36e870fb899b167e2f8d61f0ad2658a5b04d651d7b74f4afaab1e8bef8a38819dd"; + sha512 = "997b9a56a4db0d4648f5098428d970f4549d74c547267edaa24f47666d343950752e6459f04a2abe0634f021114df3c8a1cadcdfd6ee96f76a901246d3cbdcbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ms/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ms/firefox-65.0b12.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "607fabcffbdaf3acaa44b9e49bc1de8c3499d5bb8697764f8f0d96fb3deb1a9f1ef88514edc771c94dd56ad88a476a26dba039462cf328f8df0ee4425d553711"; + sha512 = "bb39dfca6524423998cbcb8fba0be76b11b0e51d801fca9f59678bb29af84f99a281e14854bed4093143d5ce6940062652d9b64ac04634c5bf8f4e2faa3a2f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/my/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/my/firefox-65.0b12.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "07f27b05282c7617b15a3a5bc3060eeaf5515c1a74964dd8aeb1554ec4b01b40f027a64f643c41b536247d35feaf364104314374990c8518539afa9d70f6e708"; + sha512 = "a374c1b09e491bc6bd16d10e43aa24fee68c05292f09266fc5beba793a7fb0ac9c6a291b6e9c2b674c6ee48bb39d0114ff2727f7bcb052fe5abe4b1186e5aa5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/nb-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/nb-NO/firefox-65.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f2aecc8704a4c022eae4db031ccdf73147ece74a8b4a0f8985d3e373b19232de123ed552564d82e7e5c5ae2d4896a60ef85714b8dd120a0d63e921e0c779cf03"; + sha512 = "357ff5e167797403718214118b78fd64802bd90376e3e44d2e7fed1144fa9780d6b95cbb1101fd8b1c83b89d4862d6d0df6f4b48d74eb76104f6b0e8411236b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ne-NP/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ne-NP/firefox-65.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "d85dfb4e70ea54ca736e612727fa54a19b80480c13a1ff609c05f1bda2a024b16f803a0f6574221c78688cc26334e5d31ef5492bf8825bfc81c7dc0f78204461"; + sha512 = "5e14bfedd78fc1b3e41d8ea7de932d10935d471c2b83a868ef034e25183f1b62ce0260cf27b644a557708e80bedae7af961f9d1f56a1306cd0f59add56ea66e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/nl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/nl/firefox-65.0b12.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "7d33a57fe06749152043d7ffd364e3ffe85cae49105238e01d7decb90016eed5c5a629836eb96acff21fcc986ba39441baddcb4b67cdd823ceb33c433c4e644a"; + sha512 = "7527b398ace18ed48bc9d7334c732153e5f863af9997e4e3f3a7032634d1f4c5198203aefa935d083bba5524e3f9abe0a248420d110caf0e842157a9eac95526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/nn-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/nn-NO/firefox-65.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "f447627be7d1ee42da349dce3754c32dbd10f750ee1d8fed48b8e09b45a507b14147a0bc3fe426c9b8b0caa1443599b2b2d0b467ac3bf2615cc0c8e1f7fb90d7"; + sha512 = "9728f2f3c4cb2ec0146b6e7bd6c78ed3466870d3927b0befec9cf641b50a03021a7885828b0c788d45061f5762fd3949622e7d21c338a1895883ba4698cc47f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/oc/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/oc/firefox-65.0b12.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "fd20fe5db15ac7ccae112d34c79949db4f96914aa0e6cf9e98a03f03cd205bdf4594522eacd5a3cadc388e7904373ce2642b7bc43b18234e9357d319f9bce3ed"; + sha512 = "77d03448c9c9c7eb5db081579f72a87a10c0311c832344fcf11467b6e3608e4f0ae9c848e8ea11edcc264334f0d9ad222dbe67d7c0f1473edc4fc7a54ab0c08e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/or/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/or/firefox-65.0b12.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "b3d03432f4baa6d06ef3dd2811e255e225788b2a918d0e8b7706df3ffdbdc702617346b6dba611de77935c58c500da463e6b9b7d4f29d6d960a2bd93fab086b6"; + sha512 = "0687954826fef64ba55d2a79202aa53d7fa22aa76a4cc4e15f039ac668b8aa9f549c0d2b5542dc1a8742f6de44f4916b9f507c1d003ec4d5a4117fbeb9ad17b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/pa-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/pa-IN/firefox-65.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ff1cc2f140c1c219b1abd2e629e763e182327e1c5d1be72f158041863089e10f2790f69ea3aa293e2034581466721108d964ada96194a67d710a907572d8e77b"; + sha512 = "27a743fc3d957d75dac3a17739e6f44028e5daaf94003ebd25710edaf3ae03eecafa70a0b52a113ee50207ecd7bd7a96fe1224ffde4dfbbdb9d4ee97e4504e45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/pl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/pl/firefox-65.0b12.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "59944dcd470c2bee4da3508c24cccb636ab86d491c8d5f764b07087f281dfdf6a763f87686b08efe1e622ece32463c12281ab97fb8c4da94cc03d601265017c5"; + sha512 = "46edd8180ac9231fcf379a4c6d08db90ff540876d8c26a3ac48a87e0eff7dc409ede50e1072d296a3e17c900af426f0645ac19d1d3d62ef418459305d25c9373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/pt-BR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/pt-BR/firefox-65.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a3512d613d7c0cd645cfa5d34d61ef86bda76aa654192308656f1af9630b5ec4a75cae511f60f6b2ad2dea1a78d1c4a440797ab9fbe5f183a069479d47ccc411"; + sha512 = "9536b55f94dd725df7b59497e9c4773faace6e0229f850a1eab018524fd486a90331ea7e47974b31a700465b1c4ca4a8a4f0db2bc20eff1be6a23e26d89ae5b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/pt-PT/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/pt-PT/firefox-65.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "31d5674fd1772c428c6ba58e050b238c19e394e3baf1c1ee13db3d60ac795bcc89f4a93fb63290fc0638148e5aaaa1d9cb5d5b1df2b7a6ae81bd77f525f0f936"; + sha512 = "81a2bd54b5c2d094a8014a4880327cc7de5e5e88e7715276fee8253368ae9d2b791c96ba50f98c733c3391c9f0d8371d748e10490b4b372248eb0427215016e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/rm/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/rm/firefox-65.0b12.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b5b0169f8980a077170f93784923c6c8cad45ff9200349b16438cf0a5205e3495cf11918b802130a211ab8acfc555a79b9a24bee046c61cf14be89de183edb33"; + sha512 = "39187a7851831922336939600b11f24485a9ded710a2bc75dde7276387de430d71d5a52e847980a3a05e86ba0efecf43474891fc6082f534d4b4d33384b3ed44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ro/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ro/firefox-65.0b12.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "77903c223a32c76d64c770fc7216115d46cddd00fb7ffad79c7f080dc94d55fe65931db0964667d16b0cb6bd358cda598c04695451312d159a8b8ea2c1018437"; + sha512 = "92a1b1da29e7a6a32a367517f037874d13db93315ec1e2b30f4be4ad7e14d40627cf4d3f128cc499f0b837eb3a453fa4db26d98a6d9a5ddf440b41966ebfb920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ru/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ru/firefox-65.0b12.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2cfdb514f421a0435d31a11f4786712471b1385ed1c93f3e17079ddff4c5927e3f1e14aea4016561c5995c862d9b3c8059de98d9f7ea756d5e26f3776662a653"; + sha512 = "57a50134ae90c479e1ab0b9f7237cb4e9398032c4242c0559f55b3b1af160e7186b67f66e684c8f1d535d4a54a28acd7ab70dc1e9bf710e0492ec15a0dfdf50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/si/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/si/firefox-65.0b12.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "9d38e4a4560cfa5db1e1b62a1c65b5a167dc5615a6c27d76da6f2dd31b6249ae7c85fc034f9dee15fa1e65534fe2fa02e8d21aa94657588334385d7439ad0b6c"; + sha512 = "cefc26f888f9b41294ca5d53fab79e18940f79a18404e62b230fa61aaeb4893c3d260764b4274b0e53c19501766d1bef6d843f2f4c57776b9c58e285cdac1670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/sk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/sk/firefox-65.0b12.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "58e0ff69a66cf6d44c20d90abb86a34dded1a127407977b0bda9199af0a2c7a13a5606523a13646881d3630e5b96fb241de2fa963d61c48781d7375d741a413f"; + sha512 = "af0a7334da8c5cfcec2e244e528cbbc8d0d00b5ca85069d0f8480b294c9b83d23eaed0bd7d2f990036cd66368a075d4a6e0158faca15b23545615c7e7b747c51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/sl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/sl/firefox-65.0b12.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "563574683ac6e8f03eecf08c66f6e0a6807777836efb287ab80f874692e8e9ee33cb5518aa237caa7820ee0a7d8d8688389290852bc38ed2468e67d585ad6b70"; + sha512 = "be07a303150b7f401a4b353cb2ba2a3de318939fc9a041c717bcc661752eb098bec7fda837e699d14571a9cfa768ba3d6b3a91208ba9228b3347eabe83c3f863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/son/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/son/firefox-65.0b12.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "306aea41858cf38b631f55d63db1a8018f08035e388838f247e30b690bd133dc77bab472433be61c840bea1083608e6babd051ae782929f6ed43d0fd3b576c9a"; + sha512 = "8e02e24fc34ee961a7f6ce4e819df9d9cbfbd6c2c27578615be47d207f646e6a44bcfc8c68bf7b1e04946168ac50ac96241c8002a21f1021a7e5548aa60613ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/sq/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/sq/firefox-65.0b12.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "192bdfb30cf74a1d79ac3c5f09821318c7f19ffd814a120e41304d8c02718567c166126fbea6cc3b4f240e44faf9117d011a8547c57461bb4b0d6bbc67b261b2"; + sha512 = "23dbfef5a9a1742ec09d56903dd5b7a80bbae491881b829c3098fd7d709f4b2bf3e4df0f37fbaccacc834cd3ac50685c2245df39fafa121e3f46375582a7f774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/sr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/sr/firefox-65.0b12.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c1fc6489a997a2e12557f4ce82458f4b94c6145ec2f1cc35ea18e0bbf2e7abbf34d85df2c6a62e5b329bcebfa9ae7ab3fa09a5bbddfa47998d37ae7f43092044"; + sha512 = "ad48740414411c05b5199f7b84c38a2b6b72ace8971b9853d7f208841a85135d0f4fe1bdd8d7808d6507069efcac120f22cd9a06ac597f06b67beeccb88332a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/sv-SE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/sv-SE/firefox-65.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b60d397223254acb6c49c6f6d8c653ad694dfb20c64a618a5bcbbc2f8742b0def304187aa8c4b489afba6999533012464f36432967be2d1da4dc5a44196cfb42"; + sha512 = "b761943a043b9a2aec7ebceadfb07acd4795aa032d68d0d7e3fb4409fb0f829a003dc176093fd3322ed2843d3d72d4ac2c33bb76c466866b0600d6258103dbe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ta/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ta/firefox-65.0b12.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "fbb65300b724da4f26e6e6c60faa9a3c5d457349775abaf6461df41b5ce5d992636165e98d4df5ae2e93ac6cd2b40ab996af099e2bb1ad7d06f38708541dee70"; + sha512 = "3379f0d35a5ba50232f7418a1eb4d58ce19c19c83cfacc85a1c6c22dc133ace5d2bdcbc9f13b2515e062e91957a8c586e07d3f9b740a98e62af2c606a64e8747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/te/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/te/firefox-65.0b12.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "aafb476e66ebca88ba43a0d548933e46e573d2db47721201217d7e7d86b223f20fec4a07b748a2aafba1f72e3811b165ef8491fb2352895cf98eed54ed3b6ca1"; + sha512 = "c5e86e8475b06d6f92ef23dbb54151adf7fd94a5ea88936627fe75132f7cf10640a544441f5ab9faf4e6c398ee5808fc3fa1e79771264232a185f46911ab9188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/th/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/th/firefox-65.0b12.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "36c916505835ac613b89a7f53e0df80cf382f478f382afb6e7ce1c3f615cd1df2094bf8c3566adb3835baf20e727402435f5292e3c7055ee84e8e666aaba458f"; + sha512 = "ef305469466635d8d015ba4439a7b58b9b5d44e7e46150262d15b8036886d33e92a5615249456b2504c4f5c45a5c1f600c8c9791588cc4950dc8fedc258749e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/tr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/tr/firefox-65.0b12.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "b7ac73ba96e7dfd5f5ba5ca2a36461f21d3823e121992eccc95860abf8f80201e1b2791b4b774b0a79beaf2e98fba2d1f917a9ecedbc02d1de87a1d5b205db97"; + sha512 = "79e1c8b13f8c2f48485bd65af6f46df068631a6960e97c3b2204bdde35b2b7b083a866225b5ac70371fded36d7fc382004d4158a4dfbd9d5a5d330c20f464cc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/uk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/uk/firefox-65.0b12.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3887c76a2ab02e593abf97b1588af0554a4f3e63e607d278fd57020fb7ec4625db6aa32e293e149674059782dd1c128118dc98705366ee66116df73abb27507e"; + sha512 = "f3701fb6c4b42b5dc5f97b9ce2866e9021c310b45959dd4fd8afdda15cc571c03f24dc0d1909c9e03adac867452ae619254991895c4c02b72d9b6a208262a501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/ur/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/ur/firefox-65.0b12.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "c7a9fd638829580fc504534b4371f845ddaac474ff35ff3046da4ca6e82512ad72ca68bfb27d2a64aed90f2f8e4e063fe6e9c92cf5c60afd63bde56c5ee5df07"; + sha512 = "850d496ff272c783b2587bd709211541882a80982b53779527a45046c25d59441180ed9c7eaea5ac42b35aac45d25759ee800ad76ba45faebf41ad15563b3482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/uz/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/uz/firefox-65.0b12.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9add80982727ff19c521c6705a0ed674db2b7a2b9fd34c414f68cc3cc0221e83c5fbedadaa2ec377a606b4274ef77dd749df8d530df13b1c8c588388b8b54612"; + sha512 = "41d864c23dc258749b1dede978ce13e32c5f88528c4653f5371968d1918a975dcc9778ad8ce348bb3409de0dfcc61671884cf57bacb6a4b9770d076c524cd4d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/vi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/vi/firefox-65.0b12.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3ef7260916655cc7420ac1cc59ce377a6683a3276695a8f60871c1803df4d84100e8d7f7ee4ea8c986fa6559ff08dacd62b65ded3c333dbb7a4f878ca5f04c78"; + sha512 = "d3c549bab38331ed688e70fdaca2ffe07a5767c778aa74f1f91605aa9447251882b9ac6012c43a4d8c8b8c09ee9648c34d4e2c3a2ae99f8bca4a7f65c2df632d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/xh/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/xh/firefox-65.0b12.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "627b8be523d83c50a064b52b25afd54e9bbe375a1dfe16a0601e068e3b35febdea9b973cea732b5aaf5ae0bb1ec61bda597bff88f238cc70ff026f1bc99e466d"; + sha512 = "9e9100548db72db2eac7950c5af145f901d1a5f106039ff2436acbc586f758cbe7ba1a7da53c76c4242e9439f14ad40d4b1a46f7429c3446963f34c3208feec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/zh-CN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/zh-CN/firefox-65.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8de2cdb18e93560077edb151203ed4cdcf6cf931dfbe5cafaf54b0849d49f6eb4f9e6006e052a863f9cc37ced070ee8824b2e8df12115264c4432c4b5aacc95e"; + sha512 = "9d58d63021a478071af0d2e2cee2f0af7c623288cca6dd06759175c2ce59b9384b97ff9d256f08daf457232a64de04de8cd8a8ae54c82301a1a0f8e24085a726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-x86_64/zh-TW/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-x86_64/zh-TW/firefox-65.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6b9fe2ded71c806f3de1679310dab0215b9301ca5de88e3fad9478e1dbf5d154cdba4c413afbecdf74c7fbac91a305eb15627495ffa153749f170e4e73e128b8"; + sha512 = "43379234262cf6d4b6393ed6073770618b327763803b3e7669d31eda29b45d9c207387521c5742b8fe205d71553548f55047abfc3e6156f84d75f2ea4dd7a3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ach/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ach/firefox-65.0b12.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "78f713c99add748bd84c8d0a14b0bd96f7b09be99d779d3a0a76e2da3cf69bfd16e2a6743cb8e9fec5fcda82346d3a3949ccb6ae25b4611460b221c4d2a62747"; + sha512 = "4382880f99553d544fe888ac5ceda1ef0ba531d0262b8d702c075359f81d0e6e625fb18a2ad6b4e8f0a05769a4dfbc6a50dfef9dd629ffdc82d92a9814f606e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/af/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/af/firefox-65.0b12.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "237af5893ca5fcd6492b32a762b644c8e021e1af9cc91039cb92bcd17f6ea471d90fdc3b824e1515020e6cccf3ee34750fd4e3442d6f6d00495cd51208f670ab"; + sha512 = "e1bc02a59eaddf0a9c39af6c4b2d3e864906d14de7f515646f461a3f5e4e8584bd8c00eaf6a4e276c874adcc3830ff64d6942a92bb3efcff0b4d83a210e0ac9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/an/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/an/firefox-65.0b12.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "9a231c53b3f997fe6bbdf2276bae9b74c0c80fded7edcd3290153e1818e59ea8c2aa65cc708e887d7e5e633e4e819748e1b6a5c8509c387a26d903d5713eb151"; + sha512 = "6e0cb8327cf786559ad94a7f4cdbb2ef455bef60390973a993c039fa942a715a9b2fb81d6aa6992d634eaa290dd3993e8a747bd4cfdbf44f8877913f93c7f4f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ar/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ar/firefox-65.0b12.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a30eedd5d8f287922cb917358b995357eb2ec41c2b4c0dad1a3e8d7e41193af934a050d5c204155f83b5405d4312e83d903b5d28a65ed81bab8448b324c4cdab"; + sha512 = "8100c0f4fdbbac28a65a32a03e3832988bd2b8849736a85e126ce104615b0c3eb626940b260e0b2658ec46e7cca13391c8b3fbec4d0cdb63ccecb4e33432aed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/as/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/as/firefox-65.0b12.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2880c9e7f15ea2eff5f826df852a26f9a01fc6f21b9859bcd462e2d1ed1ca6d6e2856bb1523f895f8257d096fe537ed3b7e0a7c80a0a832013fcf5b380a657e9"; + sha512 = "c2ab35646700a9ed3f35277455917c89277456b375bd2d3516dd4f10494c3710a7088ad160a88fef77c137c9f23e227571e896d10b7ed45ae79b91dd49321212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ast/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ast/firefox-65.0b12.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a3bafb194e726dbdf159583d256838defebd2c95a46d6799e6c26cd7385f065afd558f1c7adaf0ad601578ac645cf7882073af094bd76e03355d12ce53c08933"; + sha512 = "e58e29ca285415db6b03d2be734f9c75425e5dc5bd738330672ae166ea35eef49bed5276905cd19b4c4b62a17c64d8360185bad7a59919b807aac787dec41d12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/az/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/az/firefox-65.0b12.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "c7d7bf79c6832a824699ed838a72ca80befe4372998d5cce5252948f5997d8dd6d52f27734ff0aa62b5ae014eb14c793083c854a99574a9018491aa89bc210eb"; + sha512 = "207ebf9d38fc5c86969ca287504e9b5cc048e8e896d5463986e66682efdd1b7cc32ab9fce6444b3c34fb4168cfeab3f8af0c5eed6c57e04cff215136606ffea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/be/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/be/firefox-65.0b12.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c6f46d38d0fc355c36bfbda2b76441ace3be056be05aeb56c44e27dc431a56554e8236b62aae1c276ff7f20e154205633fdb43f1856695f5144cb480cb96e1b5"; + sha512 = "3e2ff8885995350fb22aad1c11b2bce3d81e62aedf9978660e4b8a5a77865c8420549825d078fc4a44a7c4b9317d6ab8479d776855ce2c13655dd1df94611879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/bg/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/bg/firefox-65.0b12.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "29b682cb788aa445fde8a151e88bbbde8f7231d639a1cb4d6d3ecd901bf53b1b3fb28325834013d7e4f6a290f2ea6e5f6bbd4d3f083ef794c39bc49f81794076"; + sha512 = "4cae4e05dd6cbf01f0fddb61e762106fd4d34f6c9d2c5cb0bb7a57f97817e5d36bc126cdd87eb7afd1880433f30147f4a955823d9af36992285f47ba62914472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/bn-BD/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/bn-BD/firefox-65.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "47d7933441044b292299b4412cd021bc097f65558417605759867b221a52aeb903739d0d430969a58f9d6dbe77c18099596c5f03128fac525bd5244101a1e556"; + sha512 = "88ee8e36971b6d619b9280a88b2b860c83b210ca770ef5298fec785a9a47ccf15e50066a7e3e77185de910bfbe05530c96589090f1f6baacd385b1ace04ac47f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/bn-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/bn-IN/firefox-65.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b2dce403ad791c02ba2270a7f5e5c70138c65a50fb438ed5d8e612dde3aece73105429b4f0aa299119938c0d6efca5b939f3a1eb7dcb8602726cb4732ff55497"; + sha512 = "928fc0a14872b8a2dbbb3715563a778b09f203e9b933c3573dd818c8dcceadcfd3c0bc01aa961a048bef065d5ce4afddb3e04ba15a6b470e75c44394c290c0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/br/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/br/firefox-65.0b12.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6754d6b2cda0cad1515f55f868841209cb1e68954ba3885e6a8d3524727ce74e3a89552c9fd515395b526a65019a5f0e3bbc654eaa0bcd4c3bbe6ebb32d116e3"; + sha512 = "90f2fc4abfc8dcee13c986722d5f0aad5bd9bcb240d64f8c0e24f580de81bfa1bc6aed4f76bac479a2098fecace29f4e061208426f60f3f3642d0f8961357621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/bs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/bs/firefox-65.0b12.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "cf8d92bc6efdbab16a1d35f6c221331f838661dd24b755fe966cf327d197ea849a5184ad7632aca059c590b2fab8d7fb09fb0d8b0364349be15173cdf61d3179"; + sha512 = "326943958739f7c9f1d9e0529c01b9bc03441770731aad5ff300854b2dc3790652f268d208d4ec8592b67c080369094b15950550bb405d91b8447b18ab0eb7aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ca/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ca/firefox-65.0b12.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "30098d1c9cb0db3f1c6650b554a83fa4f9a66de241225b28e1fb1851f48ceddbad680d36d72c136bce2f6c76fda324affa82c5f097031c3bb7e4d43a563526eb"; + sha512 = "24d73a2e79d1877ccba5537ad155523eeec9f28706b98ec8c749c85464df5d1c9b437bf17dcbb63293e22026713c11fa7e24cc23b4ca909f987e6488efd180ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/cak/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/cak/firefox-65.0b12.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "f1a46fc16da3654845403eea2be4b56c05528faa7ebdf8ab4b2503726a11db108bc78264414e8a4cb47999a67af76d84c6e27c976c3f5af0e844bc7cc468f77c"; + sha512 = "4af75aceb01531cfe3bbe883bc1b7ae5169f2b18ab91e87584a7860ae7e16701e2772235b4fa6146947cfc47b353c468f3e520c5b75dc7cf13f7c1e476907670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/cs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/cs/firefox-65.0b12.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "57439c08d0ab48db30686c6d7aca889f9886aead1ef3b9962e6681416fc255a87699e716f729700dbb9290b1669bc84d22d935faa1561e45bbdcd956bebcae54"; + sha512 = "6aafe83d8590d6a7775955552316728d392dbec58e87fe57db540bcdf6db3f7762bfcaa93b8b6464a6f51a351af0647fd81d2410f2bb317344971ca8ac9cf037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/cy/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/cy/firefox-65.0b12.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "cdaa124caca3e8ed71b17c975589aa9388e97fe9efe28ab14beb6e64756d0ea14ebd85d74c939d08344db153db7363884e592e7c2d7d39310a124286de65cf5b"; + sha512 = "aa68027ee75df05164fef25534314d0dcad184764caade99d00a4dadda531cfb8925de066108a5858b8cca0583bd197116f14d06fc3ac468a3b2e211a8f11fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/da/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/da/firefox-65.0b12.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e72b87450ac5f776fea1ed778bcc8ac97a9f989bc9dc268e4d57597c2f4cdc66ca2a3b1fa80c8839884427b1c3ce01231487c284d263949d866baeaece308952"; + sha512 = "e7357cbb266465e3e02edcd6f8ad22873aeae7148e2c3ca5d3b2d294f2efc5e53cf3961698be8f65d6d49e0b7d2159a57e85d4ca85818418e54fdd27782f9db8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/de/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/de/firefox-65.0b12.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8e6465a46cfb98e8f9958a237dd24669bdb4446a3835b94940f5590abc264a99bd0a7aaab2cca0fcba983fc57b921e43e726be4651d08fb9cf3fb9c99a5a5172"; + sha512 = "09340d255c11dfc45a99ce620ed31099aefb22038e14bfd947d42bd4479e10be4c8e8265fab1b88b8aecaa4fcd08afacf5ba083b503c7b6b9aeaa161a2241e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/dsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/dsb/firefox-65.0b12.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a414d26edd15886b9754e094d158ab40b6a3f9103e0e0d86ad959d2317c2fa4e3716ba789e83879a46b93cf6b26f430ca9aef326d5ffa421be9200d7fed47e66"; + sha512 = "13d939cd107394f7e08ffed29eb25184c28ab975d84b240ca7282b0242e7b319ab621b4a0fa22439b307d6129ad84c8fee7e0f542b82dafa9d6223a82262ef02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/el/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/el/firefox-65.0b12.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "4e0165be7138d787c6aa0b02c3ceb3dd64656f511cf3e7747f45b90b6a4bace0cbce6fac2d4c1245cfa36e4f16aa4e825090d15771bcc2453dbfe70ae570737d"; + sha512 = "ebf4a93e7e09f464dfacc036a99a5c544813bb8535fcf0fb2e219ef0f94c8b96f82f2fc171ee8ede407dcf41c5081e94eab1c908cb401dbfa074f1f8e283b170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/en-CA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/en-CA/firefox-65.0b12.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "dafc72f82f25a1bf3b036511f8bd0e726a72505969aaa1c2050c5650b6d9e812a264f73d399d53a1e6da5bffe95e1ad7ac4ecdb5972630cfa88125c52632ce62"; + sha512 = "2650766715466d3a1c6ea7c55c6f14efe375df780b520f1762282e43fc80efbb1cec66c1739e959b57ef29046d9236a339de2cc4aea6815ef31318c1374e5aee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/en-GB/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/en-GB/firefox-65.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "fc2d3a12f17642d56eed0f8de36d4d8dbecabdff8c89ac03f846269aeb07482f952d26e08b01c2698363a651198d9b3a6e79e34309b832661794c0073dcf2307"; + sha512 = "e898893b7435acffb0ac7d7fa3c98e53db230dbf70647cd3d7ff2cf465c2dd3d6bca7edb207f879ea6f6055a077b2fba97e2a02329e445f13765abff84934182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/en-US/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/en-US/firefox-65.0b12.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "64209411f4c7c0daf5e4f35e7ad72efb459124679b3716c9798006c896214c0d78c9e195903952d8a94fd0891e7c501291900cfc424199ad0e1216de1be32f89"; + sha512 = "eb2fe4c5cfd230843d3ed64901753f9e54827ee6042fcde04454863a7ad455a77c0e5b530de8907019df97aa6276bf4b3d23349eb845399e1f511b612fb2300c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/en-ZA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/en-ZA/firefox-65.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "f585c099ba8aa8eb95302ea559b6a92061522f9c4c83ee83046a6f5f8b553073aae8ee0c71cc5cc4e47c648618b7245c85660990b1d843284bee08d8d7adb46f"; + sha512 = "6e8530399448b983134ebd5337e19aa85f81725e37821378559f578abd5250e47e42cee9e3628e5cc12112aba1a785bd1ff29a579e419b9105f480bf89aafd6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/eo/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/eo/firefox-65.0b12.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "19d38f02142e10bd2d910caece5aebe07f12ba66e05f7b72802c8f7e4208807083edd1006715d01b07e6ad70bcf21abe8df0cbec7c33df6903097166d3729b69"; + sha512 = "8839d19b1ac67e3c7ad870c2397c33364339791fe8bc9782f9196c6d5d21a7f6f57209d47ce30c535194eed332d3c52fdbd7bc1ffbe63692fd75327a563fa72a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/es-AR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/es-AR/firefox-65.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b0c341920f78ed81675b3f0588e33b8906d153c5dda6dc74ec2aad7ce45f33172b0c61d58064933c2cab5f033175b1e7dfdb03e305822e4f35b78b150bb1d871"; + sha512 = "5ee2b4e3dd172dcf040a0ff1664a4da9067673a42ceec362c65aece524af1aadab5a316d0bc1c870b2d3de5198383ed704d299d753f8d66487aa264275de40e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/es-CL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/es-CL/firefox-65.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "1201b0c29ae2ebcd3894a77339b44a9fd1e3d226bc54e13b72019fe03519df82538fe1b800634432689afc4d5718c7b48f521c359b04d07004b974d36c6497c1"; + sha512 = "01152e4f4b892f84bcb446c1b1ec972a11127107680818f29686fa8edec322992804e44ecb72e69c330354c4d3b219c49bc930ce1554c85b2271ad303403dc1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/es-ES/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/es-ES/firefox-65.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "dd3a6b3a3591340e54528ed88ad1941bc217c8d9d105038c24e4ba2448fc55daa910170b91ba32a002e0902c36e81cd474738711e875e8131820777b34c33491"; + sha512 = "5dca4b01fc087fd8ae24a27de96d816ac4a5e72ffd46e196979c552e7c9a2fb4430a2ae6079e4f16d14effffa22ecf70e6719ca2f023fc9c2580e306f10cca22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/es-MX/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/es-MX/firefox-65.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d8ff73c99b6108824f1da0c542d857f348f0f9ffcb74ea49f1239e97c28eb90eb5f8b0fdc7bad52b8b6b6f9e565a3cd692ebc335da51bf341710b3aa4b8a037a"; + sha512 = "ada1b37d361f625c3f8ffbf9f1b460cf9daefa4dc79e57e4851199dfa98a9b0c7856fd430d47c1e83e2aedcf4f9a7bb97cb29d122a15519d7c43ecff5a817cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/et/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/et/firefox-65.0b12.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8dbb011529c6d61e6eddf6a2ed19ace7df83449689edda753c5cae5096cfd4597ae4b6f70eabae6645ca849626a4138e3d58e8b33dd63d8b2cdd3c6a81123c2b"; + sha512 = "6e04852f771c71af1fda88eeb60b4e9870c6f4aec35abb20751a0e32f03bc901c0ebfaacb2ff1fc0f3ec305ad6bb65125adfd666d14b50b76506398cf58d5e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/eu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/eu/firefox-65.0b12.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "759b591f4d192ae6e606416c52f82747fc7141308ef6584e73e121e0df8dda372da5dba2ae628cb301b5d2223f66c9b0db875b4cce73185e852ebb79b20f40bb"; + sha512 = "99b83adfd6112183f9fdd2373d8de7fd5b878c112094f57a640a6072f6a6a9c2ae55d2765de91ea6e19471b625a04f0c531d6c2e668d513a5f6e32790513c4a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/fa/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/fa/firefox-65.0b12.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b1a120e279aec69040ec7d5bcf613772cf429ada4ac735cd3ce17bebd9ee8f8c29f6b628ba670b19866c85d6ac65089054242ddd715ad6e9b0040eee55284bc4"; + sha512 = "ab3c70f1476d46a83fb059052ce6d7d6ee9d4583c97f8554c02a25263fcde2387bf91573089e015f530263f3b207780b3356e6ef991a2e8d1baa4e78397c9b8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ff/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ff/firefox-65.0b12.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "12dcca4c31577d90f9627cc38177f5c543da2b93fc9334b4dfb98cadfdb3ba4ccdce6507b6639d38c61fc8d77e25004c8ce201b450f84e54f8a26e733ea182b2"; + sha512 = "e31339dd19ad6776a12b12b8a6f6316c653feb03b283277a2085d1bdc31ce6018e20b425f6f147ad3437544c627f7a7cc9dd3ef471c3b7fa01c68ced426de427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/fi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/fi/firefox-65.0b12.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "68b7af07028a3793efaef80cf2d5c7dbf991b4a2203776a5ac0c2bba3ea3417f0f8b9444320f565c9ee7a1a0984b114c4ead933b7bcf0ac387966fe2b8c1e3e4"; + sha512 = "2c626bcf701c5c9f87f33a324fc5cdcc759da6e42982f4de3419b4f6f3878fec7335de5daa7c27c0a4500288b901301594b1c60d7a41dfb59b254eb30c546c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/fr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/fr/firefox-65.0b12.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "65e89affb5720201ab292fbd433f131de63d61270a0bf447817e921ffdaa58becf10c2d3b0047b99319987e1ef7e56105b7e3b00f8fd4854fb0fe16c30018262"; + sha512 = "cf7134cad609fb107f85a369b91fd2e9981bd858e8a1b9f9ac0c6fd4b5a2122fc0ad8a7bc0107c3302059ed522f2a492fc582d0a260c5bfc2056efc0a7b8455a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/fy-NL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/fy-NL/firefox-65.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5c2b4cea727cf1d1387aaacd47e9a032e85377c9d192919ee8203f38dd73f37eab39065caee18da15a2196e9c29d37350a0b623e917d77da9aca3de85e8df7b8"; + sha512 = "c579722fe3dd98d59c5a0f7197b799a0b57a12bd979e79e2a0524cbaf6c87d2dfe27266202e89a72ff081942b195b78a859274423403df7faf54da90820e3a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ga-IE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ga-IE/firefox-65.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "388bc3fb7ab5da2782b60db936874e12952238945d65170863874a2b38bfac048009e8343a7388b10f89d42ae3975a117874c29bce11938991ed8dfadce1c639"; + sha512 = "07c6e2180195c2399e972a9eaa72cbcd0739dce1248ae07a478b5aa5715148a1cabef93e28e1f6a6f3f5f7757cdf5d63c817a34d7ba8732befd8539e00777cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/gd/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/gd/firefox-65.0b12.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "39542653ec46e4bdd70a3db7eb69dcc46ed393a7e9ebeff6d7508722a629b1501376ff350b7f660a80be4fe9b0006d8afe356bd125219cc0710eb0b14fb19a17"; + sha512 = "a65bb22adad02cf7a91bb7264d4b9ed8cea67fa9d56e7d5dc477e5fd6976f36116ebc41ff67f935c41049dee30bfe6990ef1bbd16d4088757facbe9bbf88b066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/gl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/gl/firefox-65.0b12.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "2a9a42a38396bee21753fb4e132f0953391208e25fb7b0b8daa2ce98bc2b30d7c079e0a8cb377e7460f2f318a9afe8a1deff591ed3475e86d3b0476addbd6503"; + sha512 = "ca5df13009b8b5d68235fb3439421f64363c64408bf7ff73daa90f7b744e77ea02c39be9ea32567fc99e5dc336cade477f8c9dc348e89082c71f84f8bbfa95bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/gn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/gn/firefox-65.0b12.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "03a00a5699993139bade633fe4bdd3c8f1ac14c8903b786bc2f6bcb600d17c1892f55c3f85996b47d2584c9fad674b39e4812589332f6b3977cf92038da123f6"; + sha512 = "9246f814e3c74eb43baa473616697871298ee441a7fdf4f3832a169c8b8ec269453272ede829841b2ce75632eec5f113a60a768b0c4eafb7a7ff15eb2ecc8572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/gu-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/gu-IN/firefox-65.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "c901b5a6f284a310378f1c027f61422b2c757df0be2f93cd238a42631764c8bad9806787c61d6b826b3da37b731bbd9390547ed912c9b52b539ebb9409bcb1e1"; + sha512 = "2ecdf5fc087eca0ed9e0c4b62731ad1747663d7fa28d868590a190affc4a5c1e1d840686bce3893c755ae6fe19e454225ffefaed9c9d7a65b7dbca640b89fcd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/he/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/he/firefox-65.0b12.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "cf421d25daa50f00453d1f96a1954694dbf2605f0f361c823ee954b3b6377feff2ef8b62570e6eea2bce15883222613fa2fde865efc1cabdf7cbd19e37fcabc7"; + sha512 = "2fb984bc0053e2a080794b7a950d0d6ca23c4698ca9d4c75884508c5479f117710b4ea31ad6686fd7f84508f31614669b902ca5ce4991ecdb890b0b78505bea3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/hi-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/hi-IN/firefox-65.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "62c3a098e7b67942a748faabb9710b6e27b1fb1bb067a254907b48ee986c0fdbd0f2ce0d6808a7ca628b729992e634d25dcdfb6c1a5dc5dc96de073f38809aa6"; + sha512 = "7bfcb65b632463cb455bc0c29b54bacc47bd290ea96743a1268f5c7912b211855623424ac24f67a4bd3d3d6bf488b2843c7d57234f1938bb194a4f54d7fc0eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/hr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/hr/firefox-65.0b12.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "96c6e384b6cbea934b23719436af1145d31667e02b6dcc3069b34bc133397335d34e2712860edeeb00a32924c087464f472288b23b6180e9c659b89d00d2efe9"; + sha512 = "75b12792d917b71d25d3f6b0fe03ee824655b49cb2bcdc42f33f159bffa9e9c122f7b3b4d430985825ec0b11184258837cdb97b913b7fd7b803c10a57afda634"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/hsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/hsb/firefox-65.0b12.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4ec6f783f6208898df58261de1de91cd9bce6833c34245cfd63a61b9558c8d3adc504d83639cee02eba9e3ba43894a5ad17e0fc65e5059bfbaf42b6aa79fc789"; + sha512 = "d1c7119e7a0bba4c7e5d4be992139cea33e581e60748bdad9c6c798511cb8d7d84bf9e3cfe6fffb303e3454a73d72b5bf2d79e31cf4f818609dee31f7f019a9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/hu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/hu/firefox-65.0b12.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "45223b5ad376800c6b3412738cabd2f9dc05199eadb719d6dab3d79e9af58ecfee468f6ee22a96a35d833302506ef553411ef1c5f78a355f32ec07f0afb6a2eb"; + sha512 = "34750d5a3f6ae4d2c2093b1374e8daaaf2de41a6d560f0f4fbdd7cc3ecf7670e298cf09be33de2839198a85acca65b40c2406b3d79eb29df85d2e4bd4a9225b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/hy-AM/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/hy-AM/firefox-65.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ad7989b3b4c45aa11d91baa04c1eae6177f8e480f416060c8c76e2fcff460799da474bd3c9eafae43faa38dc962a43d80fd9fef9415083f112cafdf3adb46142"; + sha512 = "4be836e6e68c378ed7bbe7e22e0f8c2b11074ee88109988a1afc3fc5f72499246537f76380c1635017efb251e8540681ad30304e1bed9d4a42bfb8749d66de05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ia/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ia/firefox-65.0b12.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "638c5c8679e3d6c3634586aa4e066180c6bf6164e37192084137c34cec50a5fab6291d65ee10b2f40346f3f3e3574fedcf421424ed94c26f928eb019e0af60ce"; + sha512 = "5c4459255fa08faf284862459cf001f0f6f87b2b45c570d55e086a143d32e5fff4dd4ad44c206f66b5eefa58519de9833758dea6e4a4c036b3b26794e52b66cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/id/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/id/firefox-65.0b12.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a37b97b334b9aea8ec57dba642ee40e14a07d8d711234b847c45190a59fadbcab7298de6777d62c5b1289da4294526898445e2ed992e8fc1355c686279883d5d"; + sha512 = "9b9dab0d616d7eaa3ab9e1aca3798c650089346df2f36fe1f9078065ca736757ebb4fcaaac8389459188006a61771c98e4fb39ac427e29fdd3ad8834280df482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/is/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/is/firefox-65.0b12.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e3a3beeb02c72b8bdd782d8ee5fde2de4738eba9893e9f3f32f1239d6c0b03912beb2cb67b04782b48394743de3f91b6a1facfab4a1f2dd6d9e24f0e81140017"; + sha512 = "a77c51bc679eb808b8d63051797a673da8dd8bbdde4a09dd47f3b35ea61a01c0de259eab30ca7ebe58542ae663e039b43efd37be47a711fddb0a34e245c37940"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/it/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/it/firefox-65.0b12.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7e4dac20f03a230251d66434d2973329bf8a23ab718ab843484261d74629536f611a2ec8831dd11c25c6ee0a4673e117809b22cf4c880cd2eb647430aae2d912"; + sha512 = "c7a360aa405a74ed03766599654cb83a028e8a93d2933c4c4d3ae9bf5ab186adabb4516dda5190620e8954c2c61cc0d9ecc018951dc0f46fecf5c1f3c21ccb1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ja/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ja/firefox-65.0b12.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0840cdf7c096773a35aae2b466d7d26681f45d65a4b93ee54fa4eb5a286dad454594f7b016b52ec962e1c4b549168f4f71648eba285686c19cb290d65a70904e"; + sha512 = "9523e5a4b9959571ae9d1b4c258698e1858c47b781c175468ff822f90cd04fa8d7137f46a657392fe55bb898731ef774b3b8dd560e7ddf173c0261b5741a393e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ka/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ka/firefox-65.0b12.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "aba7b2f29eeb152fa0f8c51f26d9927cbef102e259f93f15d8122334ad5c05d44a72ba5130677aac4a55a928d4f748408190bc7b8405119d622b3fb05e6ba1e5"; + sha512 = "e4283f0816aad8e54af0e29cd8b992ca4d400a59ff5bab1c66307ca333c70db9e6e1aa28473c49d1400f79c0dc67fd7530028e652ff535d9ae024e030b979285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/kab/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/kab/firefox-65.0b12.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "585e79777a7967273e20efed2c45fc9225f8e1bbb66eb75cebbbf3aa2bf55d1a25a9559b07d96090d424532676c93eb9d68ef2dd139b0e1eaffda7e2b17c8cbe"; + sha512 = "ad5fd5745e341041176bbd11ac067e8791c7dffd4f242cb0b861069fddb2450b0e65a1e5d0ab6c24c18ba18d8ff220b8cddcde7dacd5605d8e9714ca10bc2bd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/kk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/kk/firefox-65.0b12.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "3399723e0e15a5909049ae916b6e3125443436cbc1c279dc3e213e6ee7d1e81af86d85c16eef4bda68c764dba06979628e3905a29a8bff7efa4a96530c5c28ed"; + sha512 = "97af4a3d4314d13e6cdaf3ece49d9aa8222e0a81255350055d9e0a8b880eff04035506df94d0dea0286aba62ea1584c78c8fee4c20bfef483322ef02799672bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/km/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/km/firefox-65.0b12.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "79362eff83fc6c70134fbd3a90b2231a467f3ac8f8f3e1f29630843ded79a7785ae3c786771282c3c0e3153477cbd8a8315a084abac2ab273ed290d75c1421cc"; + sha512 = "f70ed81ecc13daaf8c27128d954684db6621ee2e527d576c77f628ee6ad4a810caecf162790ddfad0cb2d7f8776f540aaf5f1f828d06f372fd4ce72462042fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/kn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/kn/firefox-65.0b12.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "6ea47f1c58f2f2c1af2638210f19dbe7de8ee9ff9ff81b06c0b681c6330a6e2075accc70425250b78a561858ed15cfd7b2fef7dfce2c49b655b17bbdb5282098"; + sha512 = "a751e52b1cd8d8bd265086771a5ccbddc76fd26944a07e86ad734adffcdd91b364a1c39125b1d93d9c7db4b52a4d9ae39c0567160cbb37d407482da0b5a67bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ko/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ko/firefox-65.0b12.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "75092a19261c2b77ea8208c352e38ee67be0e65bb3cf6f8331d7e6b164d28c709081f1b72e9719a32e72b96370f3924ea72b8e828c874db8fea6942918a143f1"; + sha512 = "ef3fb96f71ec0d8d4678bad7813e3db00024ad3bfa00f4de8fad454f5200e7e3cd5538441fd1283e846810c8b89652a741a9870601b440e7b2824545b39f59ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/lij/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/lij/firefox-65.0b12.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6b591dbc6bdd21a577cb186d15cd2fa0cb1a652c7ee8c1959fc9a6ab63d68289a592642b4fa6148f5c5de18e91591a7049c242857b3993e02a0d0aca54f50f7e"; + sha512 = "a7cfab12ef29ff68e4fb4f60dc15aae65b6648b9e60b227cc13471103ce2fe472601aa7b702dc8f2bdb57485163f78da17ddfe0821ebf69f5995f12f55e5950a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/lt/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/lt/firefox-65.0b12.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "44fda420ad71f5adcc7278374af6e14d848d71579a897bd4a11ba4d5e6829e497038b00ae98e8fa9f17d2d6b8fe48a8590eb5a0459bdca02fa9b6b5b407a82f0"; + sha512 = "0740276dd1fe50192c6a99d0d43547a450873d9cf8575858f53754c1661d3bb85d7d02cc4a09639a2641eed7a687c856b30d814ed1ba923d6f765a8be027940d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/lv/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/lv/firefox-65.0b12.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "2ec07152fd1866016f4cdca0f17b8671e127f8ce0b1ddb64b9e11533e20a56c83ebe526af17e87aa7cec1cce7b174110c13d079497042818345c06fc7b6126ec"; + sha512 = "3a662715a16f2b30cdb79926b3265b791d7a7099240d193a66ce48e33da7aeef36e4efce19097b37af3e5e330a8cabcae273ce2f87bb9dfa3fd3015c061f897d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/mai/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/mai/firefox-65.0b12.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "82eff8bb4cc5096a363f8140ee1eefd660ea5e1b85f57ef6da4244261188537e2e2bee2f05f9fce1ce7fa7157427b370d9f9dc5a6ce731227fd0063ed24db9d3"; + sha512 = "d2f08fcecd588432210207f30166608bfab8dbf9353aa05bcc0c00e74a9a974b59d301b975d0c06e9e2c48749eabf8c8c485da8a56a4479c4672dfb0aeb85418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/mk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/mk/firefox-65.0b12.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "43aaee642a698945388df4b679164dad1713c87aadfc56b9b588fbbe112ba90ea0bb18f9893baa9bd6f4a41e8f1bc2a84023b5085eb891150da1e4b7285214fe"; + sha512 = "586c8c9f0d80620adaa29dd308fcc28733da5d7119b27315442e0f1b698fc81bbdac059c3f2d08ed941de551ca5abc2eac6b60969ede63503e943fd8720d95c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ml/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ml/firefox-65.0b12.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "5e41900c63adcfebfcee00d04ba1b6a57c757982c9b4ca35bb44a2f3523630bc1f4a0b3e7f715dc571d2887ad0f7cdcafd594103bc26cb122b32df7e700b746f"; + sha512 = "7517cd5281901ba3d32dabff34dd806f7d3aeb5074f16e4f27d352f0e063a64ddebe0a6f4fc59cdb263fa33e84c374591b882bc2e8e6543bd2d4f595f29a27c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/mr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/mr/firefox-65.0b12.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "212dfe128d63d47fd2a7b4526b9b7df7e08c20e2cbbbc1cdfa2857c78985aad36e1a32cc98d54e33ffc9082ba8f9dd986e8ede959a799d140afdc4d3e6e20e74"; + sha512 = "f533e442c3ee42fa0c1690f2887b93665aed40f44007c477f73ac4102af41da2440b96414a1fbfcd42786df09c2a72bd414893d33e1ae811e069dbb318671e0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ms/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ms/firefox-65.0b12.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "e0fb4bbabac7cde6df5afb3dd1dd9da107aa3136b79369ded3749f4211b2184c9933f0d62840f0dc1d6ef49ab1a4828ff8927753c57155cee6f8ba566a1a4153"; + sha512 = "72d1cb5296f2d69eab16cd3ec8e1e0291668329daba0f62a36660c8a5ad435ca0f8d3515f668fc60cd4fe4247fc29cb1139e4accf5d3fa66ea6a3406e4c5e221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/my/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/my/firefox-65.0b12.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "03d471aa448dffd0cd07984f90d737fd575901562d1fbe4e0a7e5d0b71c2ce6716f62b6ae979ee739613a1ec3c3b5ab4b85390bac16a2abfffa553077e785f20"; + sha512 = "260e5f5564146e316876ec2df886d3e59839475a2c2ad1aa122c9344f7be5cbc4d54434b14788efe1922a3d4c7216bd7735f91300f51c294f197a0ea95cdc394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/nb-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/nb-NO/firefox-65.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5a2ffdb04869975fbe4252f92cc746cc8136d13720d88e0e7f1ff530765b92aab9b67672e450505f0abb9f2335643ddafe2087c98132e88bec198ab729a3816c"; + sha512 = "19ec8c0dfff78abe703c032fb4f13552aa85ffa7febe837d093ff2f6fef80399d0b462eaa2f5aad7ad84774690b04f735d65dd8e2f8d74cd233b38e204af43eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ne-NP/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ne-NP/firefox-65.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5714a7a2d6d706833158c04254b564211ac2d729746ba483613b86728e3632480b28abacd4683abe56b3ab954a6b303ea4f8247b025a1cdfb962bf0c18664e54"; + sha512 = "4d709f5500327c8706a530853696ca23e5dc8cfdd66604f3f73e8951f9e490e4b381e89c303276c0f363ac2882aa18cfaaebf56677385ff8d6e0ef94198aa588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/nl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/nl/firefox-65.0b12.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "71fbea4fd306eb6e1a880f2e7e5aa4cd273f3ffad60e6b315fcc48a6455e218ba737ff2b6e39ea94d6b3ce779a71bf79a433f9f4165f760ac93df997b2ac1ef9"; + sha512 = "25207e8e66246e8fe5a16f4602c5ba3b424e0873634089cbd4758d6e59c3413ff685224f31c7686ef7759a71c332e80661f1b6d2e961425af7fbd21dc9c823f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/nn-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/nn-NO/firefox-65.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "728f08bb9f423450e779a34250b581b58160b345b4033acfe832cce1f62cf0536c243d7931d0494b41e16c3a249d149336ff7308a5eb963b8ca0ea5fe09dc245"; + sha512 = "b1394ec957b18782f4b47315a035186f94ffce9af626f9449494063245c54deeb571c9f840e18493994da84e871eb7d5abd585054c87cd8922457db8ebf56098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/oc/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/oc/firefox-65.0b12.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5be2fff7539861954b2ccf48f079b211e0b9bf68c58ae173968e96e12ed63ad8eb4f82a524bdda6c5c7a173dd9c580f3f56d8ea1d3d475e97525232ccacefcde"; + sha512 = "460076314af3db9e501b5316ea55165e747d1edf621f23d8429129cd155fb92a11d7774908745ad6d06253bbfc445cc57a07d14421b83bf4bf71762eefbc4cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/or/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/or/firefox-65.0b12.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "863b0ab7e80c81c347ed87caaf72f2997434e94e42298bae7ad84c7bdfddf8f9f5a60781d4985719a6d235dd9e5017cca4541d06c29a0679ed933c26596a001a"; + sha512 = "e5c45be724efbe252a7bbf4e0ef8e7f62086a5469097ca230050718fa57158c4bac224bfaa554055f05acc4565ce7e7c2d7c274da744948e59feae2f4541a803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/pa-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/pa-IN/firefox-65.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "303a4802fd7ca7a0ec86dc9fb3e9ad3ff55a6a011dd6a0bdb2989e24869cb7543b354dde749f592611b5a9f438648c793122e4cdd109db6eb7908b7a98eae2de"; + sha512 = "362655112e436188c81bed46fe58064b909f1fe9f30d8b1f6c0f11739470156829ab76ff05c60de0ca9e69924603b93db0288161ea1b79ffcff2b0efd12120fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/pl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/pl/firefox-65.0b12.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ae69ab89e4f23e99e1b658ca17b40670f91331946888104426d7c01439e2e19e55177f1b7ec6074a874f8fa7e86dd8ff46401ebe3d9e7c079011c2748c366b3e"; + sha512 = "2192b299c48b74c154198c29fb07b10562af080b5200bcba9da6855e29812587dc5750788ae30735d5d3c8dd9d2ec52006c44ef5f4195f58aacf645a705ea39e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/pt-BR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/pt-BR/firefox-65.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "1296cbe67089edde1bb8b67bc1aa384cbcec1fee33d9929ef8bbf37972483ff0c789726d1ebfbc9b4efabf798f713848c206445930cfe6ab9d079b17a630e67d"; + sha512 = "d3cce88cef29643963c6dbb5e6ffb35e4d54beee70d97f00a2a9a8dd5611d57efe7bd84efc6ad2408edf28ce35fe71016eaffab833896948d78c17d9603ae278"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/pt-PT/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/pt-PT/firefox-65.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fea6f4fda691f6f2276dd894703de3978260ba2929b6cd67217fb3b99404622ddc09e2fa8cf1c931c8c5abf965b8a7c014dcca668e1fd1ccadc592ab97178c4a"; + sha512 = "3d20bb42522ab982d4f0d12f33cfe652bcc57f604db75b71a04bdc429fd177660a7bd969c8681784f55ac50e6b4e5eec4aaac87bfc7dc7ef7489adc903c007cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/rm/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/rm/firefox-65.0b12.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7ddaafd8ec0e00b5a22a49d9553597b3e6bf5a0bb2b0b011bf07d18da8480d799327b9ed7a6ad2d31ff03478003719c35fdb068e35b47fa9395158d203bb998d"; + sha512 = "3bd1a044d6a1fe133d17ca8a9968cad4e9384f821d7abf35c3d3a8d5c4f6b9f47ceb7627bb888b336cd4ae147bdc95b7f5909676d9d65de8e1cfd978b531634c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ro/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ro/firefox-65.0b12.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "38486ff9156384dd96bda6e0e902346e9944456aba535ce2689803a0d5579d2ad559768fa84fecdc583231771d1d3b1c9a1e8b62e9e1c29f116b8b5fa3a93723"; + sha512 = "d66eb188299fbcf7d37001aa6164fc3912f0655bb262aa88f291e787241b1b689db83657a4be84a51d8fb2704d3075c32033b3a9693cc56d79dcee0c1b825678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ru/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ru/firefox-65.0b12.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ad6eb93a80aef56dc916770c3eadb105790804ce23bc9cd8cfcafc4b935861db231b9121e5b65d7cbb45b2d33b37e52ebe756d8920fc6ce9baf55c264a127128"; + sha512 = "f59e7ed927c5313e3f272bc524da4281efb7feae46bf275ace08d4383821f7d32193eb719c72ca9873847272ec373097f731fea7a0ea324057c2b83edb283e68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/si/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/si/firefox-65.0b12.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "4b8a97584cbbc875b3b1c8814e2823b5aec9ceec5ca72da48b470287b6d2092eaf7f74d97b9a32aaea056ca28401148306b566fe9643cc349bfdeaea6bec1cfc"; + sha512 = "a871e5f2aec31f60226b336b4628a422c6a7fbbdbfbca083207c6bbb495b582ae616c4ef22dda7947a995d26f441ba6ebef069505de92fdc4350bee9b6e47211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/sk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/sk/firefox-65.0b12.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "661f07f750c6ff38702459ec9e87ef69183afc09f595ab624f4202aa4a5fd6f20054d8d4bcf0b9245068e0d3bc92da5bba4d21f10f6d24e1ccfe29fda0f0c5d0"; + sha512 = "a9aeee27f7474b92f54c70bd818d50f7884253524613b36213cb376c9023c1664e31ccfcfcd0fbf232275262067ef10a79038ea2b98fd2925793cb8f26756e3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/sl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/sl/firefox-65.0b12.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "91b441e3b53878b2844a06b304d54d6557b3b29a93dc416c17b611e523afb12a105cfb5b03f6ed2a7fab427b1cf551d822c9d2fbd9c014a92457e249c18d3090"; + sha512 = "c1dd4f330171a534dae4c85c87d9ecbeb00115a208caa4cde8e30a5479a899662fda0198700144a38cc21ea0eb42085312095ce46f6548a2a182000434862efc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/son/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/son/firefox-65.0b12.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "153f8c33b33d62067d8a95373aa69d1eb0ed672cb5d7d7cce2d2f4a519ca6a8052856a0c9b7a90e56ce90e56758529d5da5ee4f522d1786a5f885648795e01d4"; + sha512 = "b6bba5fb1ff51a83530e14b39b377805f562470e115dc8b1da741b938e3471e635df1748c1aa6f5f7a52cd29277606157b7054a711144f2d672dc750bee55a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/sq/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/sq/firefox-65.0b12.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f7f42bedae456f8cf6669097febfdd69372efc4bdf96745a62d29bd6000d0ce75d8cd1872a9b0b445fc78c158f828b2caa8a7fd71b074148be501ed32efe3165"; + sha512 = "5bd4e1e3003f656b83188a9fc457938b9d6a4e19823176d9cf472cea4ef2233627e9092d91be55d1c92c36e57339335ed0e6e202a2da5c32f62f36e5cbd82a23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/sr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/sr/firefox-65.0b12.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "238e53bc9f6c07a3e81712346c101fe62592eaf60004e12391498c459bf1ad21c0a3492b53db1d423d3693353f8ad21170d4060c9f3ed48941716faff9603ac6"; + sha512 = "0ca72f7429da10559e66b947b2dac5382d3a910645fedf94f6c97f5116d6ee7d42ba239de0cd2082b5ce623b4b67175ec82dc4a7a1c6f203aeaceb2590d1d23b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/sv-SE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/sv-SE/firefox-65.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "cc96a96cc442bf7d4f443b42c8d98551117b5813751e137e4f6ba4e18e94525ffd6650341362e83fa7a21d1e1c8f343c7e2ae447800c3527fee3a6523cbb5fdf"; + sha512 = "8a7b5ed5cf372666280da49c8002a23542f809940e3220a3d37385b3487958fdfe318d4683d0e3007f10de268fb1344f5e4267771ee26f9593692ce8fe5a38fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ta/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ta/firefox-65.0b12.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "f65887fa12935b866884305dd66067e0452cd0744c62576fe705e07153a48fecb8900c9b119e483be1709f169f86f90b920514baae5888b711f7bff6f9030478"; + sha512 = "0f1af7b374260ce286d7f510076ca9fa210b00519db1271c0d2c243814c2ada0cb7490492cc21cbf0b7bbdc6c32f707cb1c8607113ffd6678fbdba7b223b5cef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/te/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/te/firefox-65.0b12.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "de5c5108cd94b4483f879067acb18b9983c2488e4eaaa3a86e90efd66e123af491efb62f6619af5135a4e9609775bddc62f25773810ad0bc78fcc8cd255ceb8b"; + sha512 = "7bc2f045878b68e44c2c2c0ffe24011e46a8aabbbba47caa7d55629960230d9ca7d99775899132ec171747c488cafb5080b6b9bbe01c0e53737bfb281f7fd1c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/th/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/th/firefox-65.0b12.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "592e974fb6cc53e11e9019a62643d5c799abc6aba5637afbe433ade41facbc63819999f3678230e9ace705c4036447aa562c5538a116b6b23a302df6e2cab248"; + sha512 = "e341e0b03322f7df198e6e9b748e9b296dec3c5dc58021dea18440ca5c7df92625429f1eb38559d3743252550da5126282d73c5220a49c33bc209c4b7769230f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/tr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/tr/firefox-65.0b12.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "60e7a794b41251ea44684f783554d8b049a977a0b9851090181a644b08e5f0dfa5549b67e38965f773641a7f78235280c2d8ed3b4a51736fc31b2157b70c7f58"; + sha512 = "aea3ab0002884da768847b3596954c0b912863c70a194f6636729498992baf5971f45f3fecde839e501c5d1d1ac4d7f3dbef1c0f3c0eb113b1d77fe6d5cd85b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/uk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/uk/firefox-65.0b12.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "cdc6902486102d7d49ed428f9697ec7e6c7572869486beac421d111190609ec2814cfd4c801270c1bf37336138c8d66a382da044936993df01026a8c51e7f759"; + sha512 = "0f2a4a001c683101fe53e84e1e88083c42b44586c331c121b7f72497d8e68998bce0fa1a6d9ac134da7a380fb1b2e78dcd12ae097f3b33df5accd67f52c717bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/ur/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/ur/firefox-65.0b12.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c75c27655dc70266c6b77407fad9e293775f9168fbace62362acbc34dae3620cdcaad8c637347f14e25c25d725136f1571552b51562f41e704f9695dbb399f08"; + sha512 = "b7161a7d3a398615963907a4340c6405589b64d2d39b5a3a1032a2d11ffdb4b2d3248a1615292782cd766f9b5ebdc6e055685a85ba5c1bfcf94953c4973e6372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/uz/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/uz/firefox-65.0b12.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "de0ebf8c3f4c180e6bf5281570e0aea71061f45403ea90b65360966955481c7735654e889fb1597811567e032ee2607aae727e42e5c5cec8c947d395ed42b549"; + sha512 = "fdb287a21830aa499892629a8f3bcd6355c090aec4787953789d8ed106537de4eecafdeed627033e542652c542467fad1f42ea6a1414d4d5e4cdac31f0231cd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/vi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/vi/firefox-65.0b12.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5cc132674ed0b141709461a9d31a0390bbbed1c8f2be6b84dfaa43c6850006c472a92bc39276d98c36d017c59cffeb0a1d058afb116b0b853e0ac3f13e6341d7"; + sha512 = "6603aba34bce11aec31355ff5f09c07b6c72acef52006217ea407a8d9377ea70df44c323eee0bf3ab622beea298e3fea8e674185eb723773ec43069bda404b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/xh/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/xh/firefox-65.0b12.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "729b04fcfa54fa3675bed9ab3e5a5d0a0ece1a0986fbca53074ac3e450121863b7bf632b66280032b43f81a196a49bf7dbe433b14a01841d5a3fe155f73b531a"; + sha512 = "c225ece9270cad69a36f1c73556dd841aa82696b0f7ef59ac71dedf69be8468c7ad5463af4eaf65e91dfcc9b1bd855929c6a4b66c9d9fe6aadfd873663f56013"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/zh-CN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/zh-CN/firefox-65.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "178240975d8c4ba6ef8006cf50af6ab08973d83c1cdfda67ef757f3ec0e8694fbcdc0651dcbec2ceafd4335954645d0cb1c5f379b556660f91b1f025a8147c8a"; + sha512 = "dc36ab62716c5eda3b189f2d29e2abc60a2dcac9391e4de19fa7205d24a6bcca6cb8fd3656a6a7c20c9c74f80aa7604cb1e4fe8df4ce65b49dd26e35edc24881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b11/linux-i686/zh-TW/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b12/linux-i686/zh-TW/firefox-65.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9fa665acd6d0fe9ba0a2023d89e6159db240a1aa1622de766dafd5263879c2a9566bf425af4e9fd50e2d354bc68342f5c203b772c7f3bd5e3a1a807746840da3"; + sha512 = "9ba31d621ea4679f8e2a82218152f2d4d4473e22e4ad728b48aa8a363193e48d0f8639e9073e6381559a64fdd2c6d43afcc560bfe56501ab915357080f81920f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a4178b9d73b8..62fae32f609e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "65.0b11"; + version = "65.0b12"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ach/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ach/firefox-65.0b12.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "676491fbc13496868111abba7e2615a2c32b021624f2df31c880876ef411586b1b304d48aecfe2949b42a4f5edd3002ceeed587f6c3ceac51675e4b6ab83cdba"; + sha512 = "c7e801aeea4a4f70df2f9e574e0fed987a29b5ecd04f7fc37414aa61e8df388e788a038f446f4aeecde17720adba3ffa2c7925116c7c04ae5741e03315a25cb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/af/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/af/firefox-65.0b12.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b19d107e160d1231a520b8da6530078282099112b91163971e4c6f535ae4ce7828c9ca435e6c09570788efdb64531712ad1fc48f298c3dc89ac53099cfd92511"; + sha512 = "07c169ce9c27d2a22968699e3b1e7564a3e24066f568ce2aeb6e6c28874452ff21a350d7f2553f5b308d5dc33beda0951e08f4b48e74c6522fa53b5e2fb42acb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/an/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/an/firefox-65.0b12.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c972878867e293079ad4fd4d8718cd93ee7fcb1142ed334f2b76b203d2a0b2601a7c33d6e43e4abb9b6d668c6c0a168e00b19aa5a2fe42f0aab7030dbcbf6c68"; + sha512 = "ced9cb1bbd8944e6d96b4479296d0d12ea52dac8fae80e60db53313ae9d37744fe0846a3d81c3331e6cc52d404c2ff2e2e4c0b14acabcacabfca375531009135"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ar/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ar/firefox-65.0b12.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "5d72ac8bf4b970b4acf57146364f8bcb1f526666fa2834ec344b2187950372cf79318ccca6cfeb5ae98d0558e24ce217a1664b66a64d7f2a136c9fd2f8060ee7"; + sha512 = "88492e88cc77be2b6251d9fbc7e667d9eb930469a9148a0c455fd03b0c4488a79a2b522428fbb774319bba8f2c99aa9eaba11b64ab35d90312b2439abc6b0ad8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/as/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/as/firefox-65.0b12.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3f3344fe3033f1ae1023038e659bd279b3b7a88163385717d670799b826faf79882c29ab8d32d2cd786ea677ff0e5eef7bc726d26fcce69c73f35aecd8a1d3c5"; + sha512 = "6c98c4b2a6f22f5e433164999c00a4d2c42f7722131e7219548742baf6884218606aa237d415ed3803b6ffade3d6afd04a36edd63ccad1b61ad51df6bc9a9843"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ast/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ast/firefox-65.0b12.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "0254b5fa5427e68678d81e6505329cc166920ee48498d845636134774981e7b0431805ce532ed72a7c415549a9df21e97eea23046bb678294df25f9dcae89a8f"; + sha512 = "789804535ba52c81eecb2954dfafdf36ee7287c2b0670688b6bf6fc47424484dadf4bfb54c72f81fc5449d4f5678348015a81783f901cba9e656c0eb6ddff60a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/az/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/az/firefox-65.0b12.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b8ea00f733fc57ebb75f088cd43e6256a69dcab254ea929fce159c128389bcbc4bb2deb75f43c3d0dbb20a632f0b007440007e74eb320f773f623db4125fa620"; + sha512 = "b82e9a99dfb5eb4a73f88873e26d1ffeb7dc1f63d183d5e8cb7b678763ac101cc790739fbdc73cd84883c63368085472105d4ab15fc6938d006b89891762b0d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/be/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/be/firefox-65.0b12.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b0cfe76930db7c23d16eb02bd3ddd0540de3790d0ef70d8650fbef1d6dade2cba094e2871ddb0d00c802f43a1e5062dfa83f4f661a12650862a022343712c4bd"; + sha512 = "cec5411ba065f3bac0b62221bd4dc04cb142d919149c72c74aa544fab4de6bb8cf7c7366ac491891884d8e93316210a77c410aaed37aad149b1553f3d6069adf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/bg/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/bg/firefox-65.0b12.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "c548f0e62069743864054e70c933576e1eb314b3586dd4feb47e94889c2573f72396bb3f986db9790a8db96cf89b268b879539c616bce193c6e53179e8647f56"; + sha512 = "120b3408bfaba89bfe883abacf8bf8a2b4c49bbc39f50f8fbbaffb99b588c004a2d45f0da67445d1fa1955d956b5ceea0a60ac9f56a5be8cb911a698b877a28e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/bn-BD/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/bn-BD/firefox-65.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d2f511d6dcd3dbe87225674676fba5ad9d967233013e58f349b26fc735228accbe21448f6e36d83e95a0295b3209300f24b2795eb6f5bf63189fccee503d621e"; + sha512 = "0ea135cd16eae0b7fc0a73779db4c0c619daa66fa5182e955f9e28bcf074732d0465d17366ea91cf6a15a5725b434abf8e8f727b4f29cf43883c5b4fda62a377"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/bn-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/bn-IN/firefox-65.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "bd7cc090ffec4fe44a85a1d5c03249bb17944472e1b584eb1baf3434dd2b7c4eb748e3b805441e255977be5ed0dd30bc4c66a7543cbfeb8b07f022795ca45542"; + sha512 = "713f80a23ee5ef4e4dbea6da71a1c494877b152289eb432d72fd8a14f430b8090adca8fef8fa487c959896dc40601d268a93c8365f9d4f834f204b2395b6585c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/br/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/br/firefox-65.0b12.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f939e72b652cdda4d384e3be51502760b9f22fd2c87f66831e01dfb690094a9e9f354c26f3fd70bdb8ee9d690aa8fc50993cc16d8d6f14808f511bf1437a016f"; + sha512 = "46e1e67e770c0df98e13e78a4bee20b572914c1ce2456a1d13bd8f3483ae9fe32edb39c7f6ed50699aaaef70054c3d484dd4ed5c0cd5ab2fe0848cc6efb259d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/bs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/bs/firefox-65.0b12.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fe8a0846167ffd84d81ab0c42679d3647bce1444855b90fe9bc4f1342533d90a8f2c63cdb9da5cfe3712f11d981db357350b67d1bb9830ff51e5d83158b2ea7d"; + sha512 = "4c96b842720e038d03c762207737e73cbbc374d8cfc36ea938518549524f2a0b52b4f68431973ad4f2ac6a6761644e37a8905adfbc83747f9150d84351f84c55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ca/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ca/firefox-65.0b12.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d025a4c3e04b14f88d66e590eb2fbc09e794210b579ebe1ea0bc271e852d73ed89a8b9762f377d6223ece95fd6207d077539e0c8d8f11ea668c5569b6fcdb35a"; + sha512 = "a663b0ad52de947eedc0a6a58ad8a281005b0b053fdf044427cc7513b1ada110161ba3f8c14b4bd205142ec9f18a46888f61050c77b4998cf2174c6b33047c01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/cak/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/cak/firefox-65.0b12.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "48fd8b26ebdb3f1961400a8f8c570b925dfcf05b1bbce402797b71077aed82638c6f10ad38d73a11964e820568393aa16339d5834d685ff450be30306c176493"; + sha512 = "d0fcb9fb6c02b88ad6ac87df7765be517ac83c1e3e20ecbca44316ae3dc5cd2b62ea25337c10d076c5a46a279a9a03d400448a75420653ba90171448cb1b72b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/cs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/cs/firefox-65.0b12.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c3249d5ef8030e6a37cbacb3a3276371f399b403513bf2870f60a5b52b4f2c21daf06d07e5021e090f0183ebbf4b4cdd01f7f3f4842c37065c237a0f412d7f8f"; + sha512 = "5475781a23bba12a2d1cf54d257688a7d7a809b57ccceb456ba7c475d22ead4c9671b1dd8975b1d227db19540eb69bb38d7b83eb0757bee959796066706e7870"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/cy/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/cy/firefox-65.0b12.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ec64fd5789324af6536598aeda2e9dbc8e9066a8eb8970d40fdbbfd444c810ec3c4dba2ae610dc5afe1fc0e20a20899593bed92b164febf491cfc7f7a30ec22e"; + sha512 = "65ad65951386b8ffac30095e3a0f435505fdf716273a94840462fab3a18558366359ec40a09aad4ee35925ad1b1c15de954460f0f4f173aedb35d5b545c6b50e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/da/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/da/firefox-65.0b12.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "87b91f8b990a656f8d820faf04826791ea778be1397f042be196f6a0342c00ae78aeaac7044e32de97c9e76ab78e960751f2336be4edb11d983a736711a6569d"; + sha512 = "de24f2e713b9166170f8b3ea1f4fdef3eb4155d2612b30b669db5357a4a31134cc1337ec9f6418b81ed6eca5869551c7a6641d52f26cd2cb732ce88ffd6d6083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/de/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/de/firefox-65.0b12.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "0ab8cf8319157b1271508c4be57cbdad2042f7a1ceafb62e488188957b96e6e5e54f33cdf33e70e92fde561c64668b87d05f65c9cd6738d1f690dc9e5452ae78"; + sha512 = "358632e42f6a0e6075385fdad197d7a8ffb130ae6c7fc7fb2c476cae3e2ddaedb88d824c00ef46d9c93de404c1d5828f9f82b21a406ba1838b8619195394f422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/dsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/dsb/firefox-65.0b12.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "550f875286291b0a4e8d8564e0b2da8e79348ff91fc7e325c4713ecc95472316eaf7d2bbdaddfc2dcc30f8d7e695a35aae9db7ba776d9002c5658926605843c7"; + sha512 = "6036cf0e5d9fd996a5180b48773543f88ff50ddfb0fc647dcce42362fe5451e247a97029d7d7ea5151dcbb8fbf08d56aa74a726a512cb887ca102b858eb5b478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/el/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/el/firefox-65.0b12.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9cd49ca4e53c64bd6086340a1f967ec387effd9af8759b244e49d4edb0b0c1a39dd4e6d8e4dac78da24b25b4931b43fae288efbc2a7f1f3e00463cb1a67d78b5"; + sha512 = "254722f83e96d53f25cfac42fa3f692c2b1eae5ba491b08783001ba2b2c2a3047e98bf966c72636ce6d659f7acba9b746446b4f9c6acd633ebef9fb733201a4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/en-CA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/en-CA/firefox-65.0b12.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "8903cbbca9b5c883586dcbf2e3556bf523c56be97d4f32dca3b04f0705e9915b2c176a03b7ebf88f7f80cd5d75a2b517bc60d3dcfac1891f67a88714fd0a21d5"; + sha512 = "4c7d46eef86b826bc401e57489d8dd8ae341ed2227df63985bff4720c17d62756524198a276a85b5f502d9860cfb7e0e1c38199aa9c597b36f1ea446c88e5f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/en-GB/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/en-GB/firefox-65.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "52905db983d781b8ffd149dcc93580a96433501ead363ea0323ff9fcc3a72ba31838b4a8fc8611edb72b595b06b2bc2f0833e94f0a0a1ec8c6582d2da20eeaa1"; + sha512 = "388d97940d3d6984cb7e8e7c17c6f9dad081c92baad0542d95fb4df87ff6654113d30950c525c9296b86665132cae2dd45d076af77449785f1a832cff9991083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/en-US/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/en-US/firefox-65.0b12.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9ba18c18c0de0050d35bf77e22c56bae278a0505f59a638fe053327442ad5f396d1aa9535f2866031da87b2e9025384581828633afb4b86ed5e98e5312ca1401"; + sha512 = "82d0604b331d6f6ec9581cd7a70dd940e83ca6c568f5f33cc859deab456079721bea67ca65dd98e72141ec293e178088295d9287c952e000bd73180ea58daef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/en-ZA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/en-ZA/firefox-65.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ad774e423a51160fdd19f1e812f256e4c8b4feb75abf0c15ac3513c9d37cab2a611f876aeb6e22f828952e3e8f8063e205bb2afc7a57552604e3c6240dbeb761"; + sha512 = "6e35e2da95b3932d48d9b3cbffc6488c7bd153cdec0884f861692d5564a0a7330cfe1147d9bd295e9aaf51438ed731e7c137a656f78c89f1e1b1d85416a5ee88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/eo/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/eo/firefox-65.0b12.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "9cbf6f7f5dd193f3f5bc029ca3d1c4eb2298524345157c983a654fba1d94d66ea0ded8c077453d29e29e26b78ecf289941f2b3e3c7b6c90f4ece4d929c2016a2"; + sha512 = "bfbdaf20b9cf0e0680b87dca2a694d8976345e51e6e9831f48667e75c2ef9984db896cdad2697d376cccb44e14cb04c83116d4db0ed976ef7959cc02503043e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/es-AR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/es-AR/firefox-65.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0fd78ece0d34bd47490c17620a57570e927a5c042c4c02cd3d5c7cc2a0a27ebab73e45ac085df4198dc8d0a4a037f4ac079d9c79409fd96ff4b89858facf2b9b"; + sha512 = "0f22cd03b7300d8eee536871c65cd971a44dd174e81d0df0f63a41592ac510e11169a81f921940470485a76f15f21c99a176661c6f02413c0ca2b76e75ac69fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/es-CL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/es-CL/firefox-65.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "cc349ef194c31930320be786461bc6e641f89803c0166756eccd0dbc5a10f2d8752b21d7606f092f5abbacbb37a7fe619b58612d68bb3f70f07862180aad9858"; + sha512 = "13bd1026abc920d1008ceb3f3c6339fda19e6ed1d03d58bd89065d458c03d7b2c79171612e1a753c7abc9d0e51c5a157e45162ebfe71276e1d0f01cfcddf1595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/es-ES/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/es-ES/firefox-65.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "2ed94f912767b7fa705c1d6b56c1940b315841b0ca109cbed4df71c6795b61dcfad922b7f661f188db812aedf21f7bc0a1d60477dd562d08ddce527e52e4fffc"; + sha512 = "4c0d0bad3563348b7ceeb30a3c4c268c346eb5c763276d969a3f2a264aa56c490f94e9c56ba062d1719508cf58fc5c692156764b1d7ca3a1d5ea28ac805ef950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/es-MX/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/es-MX/firefox-65.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3121c9de6d64e537998ce939df9ec1cc469861019782e9a5589377147c4bfd2791014bedd2f9ca457a85037ee7d2e58e38a746a6935350445b3099bcf7ea6482"; + sha512 = "8f21e8bcb369ad789ef99837be9de893e703664245870033f9c1cb2754e94887c67d5189bac7dbe39c5425a00d83067872ce73834d39538821a2d8c42e0309c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/et/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/et/firefox-65.0b12.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3802370d78e09a3f820aa35ac17fedcf61f50569ffad075f40366a920215b6ae4c7e26db17abfc9e8597c3989ec3430281ae70e0d6f9a83848f432f6acc19701"; + sha512 = "09dcfd8b9b0802c52b91b3bfd58c317457a7edcdd9ab971dbc6e464e683a3c3823c42461c3b64fad0786b2dac9aebd757d492925f5a4539f9792e1b11a331564"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/eu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/eu/firefox-65.0b12.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "daf67c1c4e889cd1e9f9fa5cf7d519cc00156acbdcd8163c4240fae7644b249fc249f42d121ebc9bc8001be7ec3f9228883aeebff989f3ed7475f7079127cb0b"; + sha512 = "6d3d88639bd0b871d5125c67b50657e504babde9753e243712187fc4b7ba5fcd2a5b0bc6bebea35e7541fae09a41a07f87056d5553317881dbdea5597b46e2ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/fa/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/fa/firefox-65.0b12.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "4139a346fbf95c70cc21d40b744a2048a606c6c44bed4b914eeac4c4a5f94669a14e1fba4495c67af33827b694c81d7597bbfcb8bfae7cde224a33a2eadc5e97"; + sha512 = "e10eb40eb36f5f7a81ba7207582d6960ef32253617ae8e4a11c9356353dbfcca335236d156b4f1d5389af0f3051b3c27f52080e5702d51eb3da1ec1bc836c46d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ff/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ff/firefox-65.0b12.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "082daed6825f83001e741dbce2378d99337d1760b05674534a46e1ddf06b4ec1d27d06efbd5306f779df13cca4b4e1a1642a56cb45c3ca091e6cc3de8a19b96b"; + sha512 = "3f67396e007f83be8449a211844199d3da7d155f5c99b7ed11913fbeff311ca044de18b085499f2ef4ac24fb5b262377862dc6d24f1729666ed326c2809a5311"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/fi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/fi/firefox-65.0b12.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9ed9c1bf36ee9325028ed6a81ed0b215efc16e5b6aac7d25679141c3d49b51730b36b5ec2cd96a1d8d2f50e46cc183c3f634407947f26ed700be24bf7720e2d7"; + sha512 = "f0de82451da119354100ce03ac95b07df2222729afd9a0387ebecbc4e81877f65a8409c873e1862bb2439ac30b50f3c1fb736e37b1a61626ff43cd5ad47fd8ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/fr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/fr/firefox-65.0b12.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7453d933fd753295631e69ffe42847699d443014b11a896b1bae0153436cb6fcf19372cd73b31f7fa35e4a3585fe1f95b6c577efbc5c59c2a9a7f52613ce79ac"; + sha512 = "e4bdc80e78de8ce5fe6bb51aa9588bda38be4020bc76c527d8121a8a3fc203fa6f2c2330d4dfdeab00d7d3ffdb61183aa9df37a5422f1241069b47ff707babee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/fy-NL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/fy-NL/firefox-65.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "8e3f4d8ff95e5d5ebe4633b328acebca6007dbc7ea8f6f74410d6f899f927e5c9c299910dc8c6a20fa316127c1ad4b2fcf126b5b4c66c245d13559e65e083335"; + sha512 = "bbae2b56ee702abce48f57200d2e08d99fed7f98b683867fdd3249a43963662ac4b2696c0afc464033651204eb7ca05d063092122b584f8378017b4617f91b31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ga-IE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ga-IE/firefox-65.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1346efe81aa61af6e07a8ad32fbd36a8aa3e2c952059abf5dfa94b1f1678e50016144b0b5a9cfcc30ebb433bb2d2bba0abbc2100632a36d736c1bf1f88dfd071"; + sha512 = "83d67d99dc5980f8c33ca05fb1547a34c3920c807057f890379b9610e95d4268bde884ca44e7fb0365eaa92d73a28d0b441fab235cece72e5b40620a576ed819"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/gd/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/gd/firefox-65.0b12.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f1382299b40257fb936a7b0b9a7e031b743c042b3b940b4d11c5f24cc6233ee701b327798a2e60aadc42be013ff3fdd64353c765be637c94b12b663c3de3ad7e"; + sha512 = "8e977fb7ac9d1c796452cd505659c29abae899960395dbe722ca643accd5a0963e9b4ac173b33867f464b4718629504bbb2a558df337a52ff8885ffd2774f4a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/gl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/gl/firefox-65.0b12.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6a35dae9c962888cdc190331567197d33ee0f36b6f536eaaeb947c5499f9b949fcd1dd55ca473bd83d5c9c0073607914bce87af7a99012264d66254164cf4da4"; + sha512 = "cc5a64944feca2851c2db6f75d7344f795c3866cb156a3da7a5e9fcf76a4202438c7bf6ae5fee0aac969c072e865650cf691b3e46542006516b1fca83605b9d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/gn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/gn/firefox-65.0b12.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "d70a0838378da6873c23631279a0d96514a2919bb21725fc29bb21e222020e709652a487a283457203c4d5dd3b604cdf5a4710a2abab96970d8f508f8a2af9e5"; + sha512 = "1ab24e52663c8e796955173234957242f83bb06c57ff1434dcadd2e1528688734181ac2d538ffb72b82cb6ac44a8e71ec9d0fa2f97ccd7496659a932aabc6936"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/gu-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/gu-IN/firefox-65.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ce30bca8fcaec89c96eaad91b136c21f909773aa8c05939d00804b2583c742d64c7a86f8bc85291623de37db81113fd8200b5123c964835159045cc6b60e1c6c"; + sha512 = "26b405fe69fed8899210d87ee2836b042b0f9efdb5a24205f3118cb2b21f47809b0d56f35764cf4d5ac3087b6f6fa94130605606065d470a7053d993929416cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/he/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/he/firefox-65.0b12.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a064c0dd413c6337bf5c534d3aeabc8275610e61f6a7ab9d1fb23dd55770ca7b138431da91b8959b5d84b6b4026812ad222ffcc2ee744d1f7f27a3a404b9060b"; + sha512 = "88b3b401b0252f37798f6f2b63ee08ac70266771554fc7c2f6a5bb9e2546ba84ad2bef7f80917e422209bad5b7c8cfefc702951273a050c86fb254eca177e1bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/hi-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/hi-IN/firefox-65.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "0f07659e35b46f1deb2fdc65a5efbf81062c1adc5a256bda56b6d87f39f9027a59dea0e2e538703f491721479fb28e4f720a8da556f8b2aa0e8e9733cf74ed09"; + sha512 = "c35bf188b8edf09c31e0e3ff09b5b63e07e4ee47e48348f245240efefad22a06b6ca726cc11d8a47cc4a02740da44500b24ed4ef9a30084f37066bbe94121993"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/hr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/hr/firefox-65.0b12.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "30930c155115b5f093d876a8761a3887dbfc9be4d7bf1a23454759d5f3bc0d912865e69eaa2fdb05c05d52852ca7e4e0207fcefbec10b95bb6d96eed81f33286"; + sha512 = "d3b425ac0d2e9db099bdb8b45e076874f6e709fb5080261dc1a70464c43c9e4f1336f355077f1882e89916a782aeb1a55909d6240e6023e42c1c5a3fde567679"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/hsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/hsb/firefox-65.0b12.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "78566ec1e6b373aaef0f1cd796cdf28b90d9f8fab466567939707eda1d3911c771356977a296086a2a73206c50ae72f91c6911e96363f3a868463d6885fd01fd"; + sha512 = "5d63e6fb0363f590910ce1320ae41329f83046eb7bc771581918e8f2ac0ff983be21156d594683bb7955e1d669a07cb97fb28c2b4558d3b48aad1448f5414191"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/hu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/hu/firefox-65.0b12.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0905488c2e3ca39afa4028643bc8e808129f1401eeac268a29b83997a46e50acfb0888d363e9392f8bbe9f919927945be8b46a6bb9fc25b0891c3655a0d3765b"; + sha512 = "d82b7af86f8a8e60931445168d8f0daca6c724bea529aa1cb78cf1adc0b792be6b17e2df9c4ec2feb2aafd2a5cebc19753c0b5b29e48b1b58968b81da0aa21e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/hy-AM/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/hy-AM/firefox-65.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "bf13b32cbf7b3226d3a5f1342aaf4bf1d34e073f48170d738058444456a23620c7a003011f8d9816cb1928d86589cf7fbac5911ee64de80c307a6f9cd284b2f4"; + sha512 = "b9cfa46b4ca5846bfc6618ba0d98877c6afced77809c9e80e60a82e0b0880166fdb43e3c1691007c18948f7c973ebca4132f20db6a2f5a22dd21666ef104c279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ia/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ia/firefox-65.0b12.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4d535b4abc5433390a9ddd14c45cdd06965bc0d168263c6d8734e4d054ea85634b9907633827de5b0a13ae2a3339f79d9f51c06620798223318da95eb084073c"; + sha512 = "842b70614fc5c304656d3a9fb601d0b80406c5896fbd2144c1d9d06ca30a62ef3295cf75fd09bd62839c9afd7ce9515df42c4085428d7d24ad8c568f5a3ac129"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/id/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/id/firefox-65.0b12.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "00de0b4222b15b4f70b23e98d31a6a181314bfb04eced0456c24559df9f7bfaa36c4930b3a60ca499eb4bb915757d3a12b1987c470860072a9387f5f92a04af8"; + sha512 = "363617654eb6346f1fd4a024aab72e49aa5c7d3941a64d784b34c12a3635ac3288b19bffaaa88dfdc91a4c715a0ae2f1c32a10b60bd7b3005746ae602c00cd28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/is/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/is/firefox-65.0b12.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f3302b8f25c4cc51e5226a1f4bbc97ba712f353861c3e6e6764900bc224c2c28ac1e69c2e21f0a548777036874da9b00635d9e819c03feaf79b27f86f930480b"; + sha512 = "40eeeb450ca9231b3c33aa8d2278539f45c0430a77cf408e256fb71b8136a90e1151f5ad9a49713bb95ddf0781a1f18605bdbb61e166ec70eb85b22d0fe17bfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/it/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/it/firefox-65.0b12.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7f3cc499453235ba4fe7cd9772efbf387696356d07d7cb3a2c2f1f04efc2efff42b55a166416f53bbb9786b3f6a34d86b5ffaac528b8c5ac14c54933cf75bf70"; + sha512 = "1e824b452862054960984da350ac5801cc284207c741cf575f894650021d40d8dfe6e9bdf7572a667efe0eaa1725c488b057682c29987375fe5c77fe8763014e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ja/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ja/firefox-65.0b12.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1e4b2d6442d2a5e66888392fb0490660c33d0bf7a2497d4ce727d89158fc448a1e138e5fc63c60f96d0f24b38a5e45a15427ffef74a5c555816e8eaf2dcfc1cf"; + sha512 = "e7e65abcad00a6ecb3cd4e834c53c4fdb5e16b00ba89a523ed372ba62434522e0750f9f357584a40791ce8d84abcc657acd2f95d9107fc5b408df1f6fb0ecce2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ka/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ka/firefox-65.0b12.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ca8e978e7b5d7b852c8698f5459d3caafdfb86b7826de31c62ccb191051a77a97f9c8683603f27117abf64bd06fe5b72c2a776f24b642f708fc30dc5f2d17a3c"; + sha512 = "1efa10f156769c102016899ed38560994f27ad504e5e5d855b94ff9e187d09699fd1be3c8eb76d8a33a4f6c4ec2d1ac3bc27cae6c31b1324e004ed0de9774e1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/kab/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/kab/firefox-65.0b12.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "90982c521aeda12da690dc5e406ba44b37183f8d02fa87d77ee3c86d22e0189b664e83e4c463c83db14774079543f00a667d42552c1a8e1211b89f299a90f0b0"; + sha512 = "94dbac9a6b727e070bd5793361b257d8f228afa62305e3ad32170f42fb2a9db051d896d3bbb8ed33678279d663e1886ebfcfb8794487df247da7ccf9ee267756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/kk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/kk/firefox-65.0b12.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4a0fdb24e17c7ea56b6c5b055acabaf42de91402c022f895e09eb1af1a414ee6530bf237569fef596ec274de64c1c07af9dce52f802c4d29aa3a3fba229348fa"; + sha512 = "40acb798dea66ab06b589c0036532bc24573e0897d139c572fec3aaf6bc706cbd949d71ea3024757cf3dd4b24f683ac9fd0a3b804b765d66ef7177b6ee5dae56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/km/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/km/firefox-65.0b12.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f5cc5dd3eeb54749fd3243348d1d9da9c45e25fae6fa9d80de17084b05b8e1e4f4775a88df731623a9cd7260c4ebe7d39b9d5b2191a41949946f9d6a58ce62b5"; + sha512 = "ebcec79617a9ea875f0bd4ce7dec7a9425d5508cd50b8c49325fd8cd871f26e4ca0d6f20541a566b521c02309b59549fd47820f5dc76dc13fb47f5c7ee5f46ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/kn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/kn/firefox-65.0b12.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "cd95b3c600cef8ad61a70e37716e44d41be7426cf3b92beaaa19b0d917eee6f9c19e4dda22fa4790810e2885cae7c66664a24ac37079f688f7c6ac136560df5b"; + sha512 = "1d3e9834bd3a27954ba250ff9ccf81f3a2ffc24375aeb343664db0e9bd055b109b7d278574ba1066377965791b1ca88c942c09069caa891076f1345486842c5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ko/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ko/firefox-65.0b12.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "faf1687e45871ffe6810c53a54e02fb13e62ce871639fd8a865027d1620b7bf834d6f0e63a2a4137167af054ae2e511cc1abb2937e2c5b547d42f460a5f9c586"; + sha512 = "8d58aa4124e9aa60fd67db61630f34913e2039c4a17378dbc0d67b640e45c1fadee2df62da6f2107424845049e7c0b8006e1ec7b0cca3fbb6ffcbf8d29e0db3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/lij/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/lij/firefox-65.0b12.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "cf2fa1dcd0db50b5a21090f0ee8396212f4125b1569a71514b2a514596b952ebe8a8a6d496540d7217289096d7bc79a7b619d47816f32a5e4ee05ef10a1c11bd"; + sha512 = "a4955bb46ac15db37cb9ff15c55f47a4c46681ed312c350ccd5c4fe69a838412f662f4569581c71f334151c953a65d07ecab612f69baaa749c1f1027548ef52a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/lt/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/lt/firefox-65.0b12.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a0baaaddd7f17b6d2654b377f94cdeecf1ba3426ed040956aa805dc4ae18360d978e1a4355719bca1e3e17acb87d128ca5f4ed934e07315d806a01b85ff89fac"; + sha512 = "b4c5716acb23b2ea44df6443a6c1640844abe730d763c5f0d83d88b52394caa47fe1b827809335fc4066cf39a5413b221b225a63efd35825fea940aaaeb41ca6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/lv/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/lv/firefox-65.0b12.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "ffb3e9e97f98e38ba7e99a95a59b048dcce42a555197eee74c41c6d77788523798af76323a9195723949e1201a94a182edf5041471f9a05daaddab526a4b26c1"; + sha512 = "f4f4d58ac03fd03f09a8ee8f48334f75ce1b95d08b972f7f97074a18e0b3019b089b024a63644e914e28de256be157e7a4238e4d090a46dc50a08c1e3198ad01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/mai/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/mai/firefox-65.0b12.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "779b0bc2e706d8643de7c27b71ba01c7cba5ba473c0f24d6d1e8c27d4c300e30252cc720a2f07e411e6a2ec8e523c2f20475cf805cd97c6bae91bc991c38873f"; + sha512 = "490192f444f8a166b0acbf49daaf94da4729c6db09f2eb2583a2b62b6ba7ab0886c11d6d1320a304c5b8cb36a792578efdab86c828674d246a0dcf91cae73a40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/mk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/mk/firefox-65.0b12.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "d688be8ffca06532325389afe5debc4e4c6088d9ff7e451c701b436bf3dfdf22503a031c946ec07a5b767760c295382f2952b9cba7edbb2884962f8749038a3d"; + sha512 = "dec7c4bba6a6910d7da8796616e5bd7303a698d7f68587bda30c2354e22e655ea5018b4b95e40b188b29980332dbd73ed14ea82c9588d76726ef24e284557ab9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ml/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ml/firefox-65.0b12.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "8e66ce1cb1a4c53df09cc29c7edae8b4e775ad7eec257bde45a4bcca05685b9bcbb379ceac49a35087c2ba8dfc27c429e7e38a39e33a255986623e142997eb78"; + sha512 = "08826ce9fcb616d25975defa0a72453ecb95bfed09bdd057168480bb8ae942002e062c0e89ecab4636cad2d7ce3f2da0d475b9728e281512eed866ee673e36cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/mr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/mr/firefox-65.0b12.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "33f1ef3c6768c526f059025f7791aee6b245379cc9c82a90b3be94b84ebf8c1cbc7df7f5fd650a681d766505fb282cc4430081f1915efb3165fc70fa9d40d66d"; + sha512 = "5e84f9db6fa32712e28d74b904dd831534054909886d54cf3a7bcb89ffdd992f2ebf8aee0ae63acda3acc88d825efa48c1bd3faeb217d5c99ae45f02a1f90eb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ms/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ms/firefox-65.0b12.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0fdb50dd643b82e48253c88a2f335c08ab14c11baf2a689c4efc01792f9dabda4bdb9d03c4372d88e98b71e8de5d17f3dc42b329af705b2e85ea39d5eb918c71"; + sha512 = "c69151fb0b0868df66b1f542ff21860df0ebcc2d242959109516459f5a22c518e3b9795dab38b632123aaca9eab7a008edce24ec23f08a675e95becf717e50d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/my/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/my/firefox-65.0b12.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "77cb8960fe40bbb31cbc2dbe01028552ae782a635ca333de4356099bccf0e6f270cd193198cdd0eb524644e6ae2a740f011ef32b83c4a056f6eb8e6ef9de138b"; + sha512 = "946019d6f35e7e165311eac6917932dc38d599683101b7f7f1ef60eda93b03483813e47d1058e32f3594da888678495338f2fd8d329db2e822a5efc0ad0fb8aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/nb-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/nb-NO/firefox-65.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9948d85b903925aa51eb8e277985b61a7c59a1a8bf4432335c6242ddc44fc44899ad17c705af7b9de81805166b4eda60f4583fd6b443c53b87c441253ed1460c"; + sha512 = "cd697ef15bd15f7ecb513f5fce4925c99eb5a29e7c8054e995619eeb531877452a8d95d2bf01d11f8191b7cf63fae4001c0b60301693db326f33172a4efc2f12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ne-NP/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ne-NP/firefox-65.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b6622b716f58512c6320eaef7255079ad1bdd1fc377036b869e28044d4e681332e222c19b978a5df482109382c199092d4a055c978cbcb8067492f1f80deaf35"; + sha512 = "8646dff10e1f2c82cd40142d3861c95961f2cd5d77378fdf4c0a742938bf19421de060f09bb54b24ca242d59eefe8e34ed2bd852dba0c40a292c2155218549f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/nl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/nl/firefox-65.0b12.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6233bd8a68755d2d2dc3b212a45db0da8e1abc401289013f4e2d0284431e8b7e6aa1bb0cd05da7c370fa46fa5290c3649581ffc34d0b601fcddb8f0e7ce78718"; + sha512 = "c7ff1575b3bac59d0277110d822015a9f6481df1f3448ec7bc636b2ea3e34d834c44d28d65aeb652077fb442dd16b98836249ff81c10988933ade48a01a65343"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/nn-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/nn-NO/firefox-65.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6327af0c909d597ef2bf0942d982fb233e9cfdd2baa2791144b277498c717fef4ab0b699cdef5730fe740b22634dcfc909cadd5e6e16a5961b216aa5e702d0c9"; + sha512 = "3be1d6b74067bf85b0a3b22edfb15e7e27dcfd95d35c984ea16cfd3c779aa0bec3412e5e68252ec0847529b047c180d64a841c1338f9984ad4e4d9acfd03c478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/oc/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/oc/firefox-65.0b12.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "9a40647f4e10645b3296ebf665fb8532f0fe4e5c72e10649600486bde1345c49aac14023215c46b695a22373fa8b3ed0e9156ab09727c83ae8173ebc2f6d67ff"; + sha512 = "58504b3a1ebd8529ce021b5b103be958e92810dd6233d630f7a08030040dd3b17aeecf1a6f369915692b976c3945efe2c5f53dae706380d79f676aef68da893b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/or/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/or/firefox-65.0b12.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "0e210c487bd3b35f6b0cd8e9b093fd815d225a62876170c84b82bc8ca060874e33f3e8c34145b1c6208316e2d6f5336878fc2ab316f7816a69403a4a3c0790cc"; + sha512 = "af7160a70f2e58ce076e7ed80ebc3f501278ca9691da4d841b9c318fd98db84c71f6123e496c39f7fba6143b63c5af9c405f55d91ac444d3061053c7a71c481e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/pa-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/pa-IN/firefox-65.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "4ab4cf233659f74066bdb3e4a1fde1c8c320677023c5dd2ab47b19ca2d831d8b4a07d3decef7c56cc34954d887a0ed9fd958935ef196afd805ba176952ba0dd2"; + sha512 = "b225309523f373c910047fe406f1f175541139f134a360cd5ba45c10d0dced48e4c4e9559a5d5426c204847d022761277a930f629c2b5d8423ac25ba2278fc75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/pl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/pl/firefox-65.0b12.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5b507a4e85b4349dc665445a532bc9affa0e5ddd1b17daf5f7a7cb41f62a64a8d99e6ca7a6d0d7d70c054bd2c6a8ad450d2f584406a753b8a363acbb87399539"; + sha512 = "494763cbc7f82ef25aa188dedcf12c978c4bea27ff3f7eef8932e9cfb01a5da7a8bf57af082393b678a42ce2f05ff9a9b2c7115836518992c1039bfa88fd2b3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/pt-BR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/pt-BR/firefox-65.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "96161187292d52730eec4701c3f9f9613f228e8e5f3f3dd7b1061aae98d8ae8359906d426a8b3b61a1eb6572bdc45fde2b28479fd5281267255c6ae0bf10df99"; + sha512 = "09c5897be07476d28c7c0d1e20d563c42fd8bddb7881c917b1e2324a97532cdcb3ccecdbcc0e05724fc3c335a952388890875833c6b912e37481bac340f01629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/pt-PT/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/pt-PT/firefox-65.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "add4e3f6e5f3aad8a84387e4e75e4dae27f0fb37093792b6b1b7cabf48707deb198106a9f3814dce14cba026b56331a4562734f0a6fa6a5e9024f4419e7265a6"; + sha512 = "873b40dc446ae0e9553c734cc5bbd01c3d22353ec8f423f480ee4b76db0072c080661a0e6e54cd525eb080cdb82db021e7cec5e36493ad0025a511d90b21288a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/rm/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/rm/firefox-65.0b12.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ce4958a242e25e916faf2691fa8398b9e070ad2c9297cfafc0db963f4b1ece55a09dbf703eb90bdd215c9bbad70d5a835e401019190a9a04a3c7ea281c6fe25c"; + sha512 = "0285805e0b8895bf55d95ec7faf6a73304d84fa178d92d1f97736bcf55895c3bebb01cc09685401c4b1eb35b0a7d4394cf966cb3dbcc4fe8da4ba00fb16ac38b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ro/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ro/firefox-65.0b12.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2eec2d9a0b62a9535319e6477e78040c7bd2bf97077cd915c6faad44268c28962662e548a318c833f4cbf5a5e6cbf24d75c0d132268d7c3debeeed665e058084"; + sha512 = "e04f4a3adc72452f9d5d4b72d1a1f0b50a87f10de9e89394488121aa457931c3c883e3cb8ff946b795e231c0794cde2801d125135a19c3d2394ae5432fea349f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ru/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ru/firefox-65.0b12.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "b66d1c65bd37dcfc34a245e6a94c2275d8d99735e79492ee6f8c09e38d4da815974ddc8aec8333526d924ed9ec5dc27b58835ac52442fd1f4724b4d482655543"; + sha512 = "4b34f77af0971c71a6b9450b97cfcd917ff77ab62a414478558b00624c80c5a0aa3d056a08c3ec22fbbcbde3b44760d811d755236d26ca61b9209334cf0a63d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/si/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/si/firefox-65.0b12.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b7e1cd9cb0222df5c159b798a216c534ce26a100bf58530954b43e12113cdfff105f941c0d984e29296a9d50f1bcb05c2ffceec00b9f2e2bebf6c325437c5ef7"; + sha512 = "497da3fb71ffc3a7087d7f89f7e4c2b0a9d055c45edba53b958d035ceebe850798938dc0820180b579cead9d6e427f8f2fc9f745d50e09310f44671267a9d4cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/sk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/sk/firefox-65.0b12.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1903384198deb7b1faa88280270a82f851c07718f8db8f55d21b0f8d0d648aecae9aa0f242f9575e40f37c137aaccad900d0d7c8401884ec53e958bd2f831788"; + sha512 = "552034c470dac93b2e14123be3311c8f85542565f9866a53de076e9ba139119c685ea5fadf925dcd7577549bf005db6e0a62579b099e68f94edbf80ba3f10c1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/sl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/sl/firefox-65.0b12.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "378ca2adf54af2df20890ae7cd0ba537dc89c8400085a774577553a677510a0b82150666783b59fde0f809bcb964d86319da9971f04a7aa5d7abdebce212e9bc"; + sha512 = "cb913f19b87afb875864cf5c3576884ee014f91e4637700fc9a9bbb8977854d2c45287ed1dadda8f4226ca284f8d8cd5d63dff6c7102b6ff649f0a4be3227bf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/son/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/son/firefox-65.0b12.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f884b267639d0862b75042b3c2869361da6d02d952d638f195bbd3fdf11468f95aa07a407ac6091d3266831a03ee5f20ad088d401bb662e78edd2aec826ecc8f"; + sha512 = "018ccf133aa6685a6d4274b151588cc32f6984a5972345d22a46be577d3324579d30d451b5f051689803b5873ee5fee5621c5334a19a53675e780b1544fd6f1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/sq/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/sq/firefox-65.0b12.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "30aff4d5699c8d3671bd11e65da270b69e144ff7f6ca1a1392fe8d48a6de15fb0d3f336a0cad19db355fef95b5b749956a1a7726b1683691f0d8728cc987a400"; + sha512 = "c68e74947b673484f51d3faf3972bb8fd5fd50062748b5ed8c9cb186101fb9371f3e3ebb2e8efc092fecca062fb0a486e3429cd48b811379295c566cfd2d2b42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/sr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/sr/firefox-65.0b12.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c25fdcb6eb66c70e37df05b4f243dd400a077b9a136fec4893668c6a494a82386717e1d439da00d275300c3b59bd295892e4b239df4f0961cfd447fa706e1d57"; + sha512 = "ec938d25b063cdb8a2a31ecb8c897a6793622b4f861c9cf77fb518dc68b63128e418021301fee61bb11f2447e4c3aac9403b9cf03b36c1a42cffc3457076e9a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/sv-SE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/sv-SE/firefox-65.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "273e0830807550ca11a695c56b6b720b775a1506b6ed1e59deae6e905b92760630c6cd5514a0e47ac0b25cab0315783f3fce40f1996394113ea28b490608c127"; + sha512 = "f0bdc72f160e1b1d58f4d64db2109b707d8196badc8220f33f6e9d14e2533d574f89ce47071d1d6b9cdd7fd7d7a138f36993a94dca10eefd9560a921d94c2747"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ta/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ta/firefox-65.0b12.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "86022f8e94446f3661fc8862634f7c25c2e62578eaa85b2e38c4eb8153781afb5521cb5ff20c1c8dd108f8769891ac4ec6d479dd0edbe656d45496a643b7f6f5"; + sha512 = "671f5a3b4eac365a690703135acafd001b3faa9cb1fe35f42a91ba63414aba7ba189c97b25ea401c619d2766e0fa3ecce32d2b12a65737dba978d46638158b08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/te/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/te/firefox-65.0b12.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ff8e2ed9016e545cf030cc0fa2fb72629cf3970c5db44f9e743c188458cbc091f84b6f067bb10424da6173f84e8b70f7617a06b481856b19a43e1d949a3dde4d"; + sha512 = "bb2d714947225feca40f74a42fa20cee2570425daa9094b561f2abc095b75fb131fc76be301b02da71ecfd2ed4431cfe98a87fc660d7c2a0cf842e41dc494bae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/th/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/th/firefox-65.0b12.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "807c0d15fbbcd51f660efdbe0fdb852d61006e9c74340e90214f75a364166e6b47614d04ad9b2bc89ca46c40fe2fd675e95d956f4fdb7163ac24f52ab9cc96dd"; + sha512 = "f3bc15cd570f97e939b556ebd64d91e98920133da8dd968f7fdea3b4a55c8e822a329b64dcf20125566b375124b7241a4358d9905c77e86c0149eab8f65cf566"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/tr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/tr/firefox-65.0b12.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c3d0425cb59f7d1e053b2d2cdf093147c5debba6d35192f2b44103d57a76be0d4bce558a41c8db7542bf72a93f4a8ae9054d32ec9017cd8f77cdf22362ca3c01"; + sha512 = "3fa5aa80803e16f3ff99ed0d70ee1190d6387edec55f7d0d761175b3ade00b3818998d0809999288624d4f31a6f877a2db5c322f0388c7138dd4c2184b334254"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/uk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/uk/firefox-65.0b12.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d3e178e6ae6ba61dc4c65ec721890b5b3c7c45db17e89fc85150089c0df23824abee8c437d6894912b615bb3b237c69038182d0be990b4b03ba5cbe3f625163b"; + sha512 = "c0f8a0fb9c0df67670fa79f34b0c3821f9e79032f06c9a28d2033ade5e4770f65fc85f4254d19e70a54752936d6073c6934994cdd4a11b8b062538ca61c6c079"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/ur/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/ur/firefox-65.0b12.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b8136f4883df6d699bbb1986b1ef4d46142f6f549959f4cd008c3a9bfbc88bd7c6b8d283e23ee6941d5a2dba42dc9df9846899ae4159a77edc0d14d84faff6bd"; + sha512 = "288274a05c693559d86eefb2b45452cf4c6647c2a186f2a8949baabe20304cb1f24d1da085c87e548c93a95cfb1cd679fbbfa558033d410963d16c295c4ae71e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/uz/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/uz/firefox-65.0b12.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ccd15d7528ba6460a40726245e34fe5b75d4d0d002a485ab7459694383df7f7a63e5f426951a3a857133da33bcee31cc72e8bfba8bf37be4dbcfc0ec25720cfd"; + sha512 = "7c929df39c64eed75980075e904831670ee64143cfdb3fa46e16a193aa7ca1bb19417b00a7b5be8d0be2595de1d009b5d6ed1cc73a1e8e87cd215ba261dad412"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/vi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/vi/firefox-65.0b12.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "7ff08fd166ee606c8ad656e1821c24bcdee42addae5cb4ec2c99ee64bc62ce7992fb0b89500ae78a435012674a190c4a372535111d0e7a69a1f0f3747161ad3e"; + sha512 = "029d538127c2fbabed83e7188d7c9d8fa08f3639bfddd9a01eb82e3b7cb4c434a65474c4c7d82127ac617f11a1da8cdb68acb7505c38998b02015f5b47b7ae35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/xh/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/xh/firefox-65.0b12.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "f1776de7a30f21c82f0507d4334974625e86acaededcb74b3ea9060558fef35ba5d26b3e40107af86f13f39794ac9bf7b4ea071ef872688b66e58b0c8d1a8ef4"; + sha512 = "a0fd7427fd23d5a684eaff577d85d3118da3f6671cf586b61de7b55644c2ce8e70dec4f51fe6fe9ff9bbafa0223db8def7fd2f1f48c2c7ca04f98fdebcc1b40f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/zh-CN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/zh-CN/firefox-65.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "06b9603ae99544b6e0ebf98d7df29f9ac25913c0274c6484d68a3ce5345f00281f2647e165ef8a655591932bef79995d2c51722c814e09836502f5110ea6e3e0"; + sha512 = "3dc4daacaff323a201dc9bfbbe2f63bf521b6a490e4a6f002ff22cc92e70c3dfda9d29eac28e24e0f3f882be52cd9b9215a6bb3e27dfce7919470949276fa7a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-x86_64/zh-TW/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-x86_64/zh-TW/firefox-65.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9b04d5772b1add41426ebd099da6d029e83086833c6410493b6ff53ca6d7a8ea1565ed73c3a4c13286c26ce882ccb02258ab1c91c3d9c4f32c7f45699b17d430"; + sha512 = "0e18039777a47ce1e17a952a3aaf98b83481ed17c2e09a733e7391941950c3f3c2f60cf3d9b0f9ac63cc83bd0bbe1c9a241f7e2461fb885e2179c2a1ceceb7df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ach/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ach/firefox-65.0b12.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f8a1dbd9706bb6028be6bf458929a74e4e7022c8a434c2af6accd421e0c4a38db993daf1e70f296a54011d09c6ce32899ff9c9991104f69c6318ee2a52662194"; + sha512 = "69bff893b544293c87887da8f52f818e93a6d291da920e6cea03d22d71babd4eea5c6184453830d6b2b97f43368aacb5070bebe6825c45eb0f9acfdef3015a06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/af/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/af/firefox-65.0b12.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "77784c35f7ccb214a6660728ef6d2acf15a8d2a9c2e11ecddcb538c63fc5c9b4264b1f6962282f5687d864035ebc68bf3fdca8d4d6fa2b65734f08a8c91ce7cc"; + sha512 = "64bc955d5846dd9e82270caa3ef8db4979e454bba51339cb9e113d3315d1dcd8c5e8f0b5a1d61585a4b4c9fa24fd60a1397be0a6d346e17894283594330cbd98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/an/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/an/firefox-65.0b12.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1bec5e91e1df97e978a0991a9bbdc812b9e8d17f0040e2011855d468d1ef3236610d34703b79bb34be67655224645a7a66ed348e41296e791466cbe8628ea48f"; + sha512 = "2ef36422330248be03b53624f9a5a37640583535e9e501180b0113d6e6df60243f2f43c500535866edd921769f5b5a3d541b14550e71502977ebd1b940e0de9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ar/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ar/firefox-65.0b12.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3b6c4a271f25d55fcfb05ab190c6176640e423c9bd16f540290ad882bd37afccfb66de47e7ec3cc278dcc0c5a9b580bbe41e278c16dba4b3fe3c07d2c135506f"; + sha512 = "b43b69bd6e906b949d0dec23875b2cd0a1c4fbf0d91168778b40a577c6dab0f2c59a49afd6389b0b3e185714925c58b0241c92a351c52d5d3d399dec3fee688a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/as/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/as/firefox-65.0b12.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2e7981abb8dbdae73f76fa229528f396f097025ce8e5b60cafac23e96f20625d13aba7117e62fa2437434dd48ce7caf952ec50a360c22ed79d7d2c6c61a1e3ef"; + sha512 = "f577513523e8c69652cd066b3a8493ac3192b5082ae384ef7438d0450128f5c2a6f1415ff772c12257c557f71077f22ba71a383a2e58343f86492125f58496aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ast/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ast/firefox-65.0b12.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "82a87898cb6462655b657db5ee4cb7c173441f01673d4d3ac5351e8c58f6d209037afc92186a840a518f862c4dd85d2f471c91e5127cfd4b818fe7ae2e5ca093"; + sha512 = "2baf8f299f7d13cb8e9fb32b07226d456071141dbaefa1b1938447bd3d27175584890a2106210793700de3c1286093d7b2035fbf3bde492752ff68528a4b474f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/az/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/az/firefox-65.0b12.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e1650a4ae98126fdeb39ce6d76a53505ad93703cfc9ee6bb9b7f7fa6765082d70877f3b8e6f2fdcc967cf6f39f449b46a17bf71cc52515e38da7bc229229d362"; + sha512 = "22b66595b68075751ada453c797d8085eac18dc7e5a835ba586948ef9fbdedc6b25a6244e1f53842efc561cd95ce7ae456cd57259b252ada22a85dad19a71a7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/be/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/be/firefox-65.0b12.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "3ebb1eb72a8c78d4ed30821af75122927f17a81e4865c8ee0fa04d419845d8f66792a7fd83f8bbf89c2928b52675b6031db15b8931f85c221c2a3ef3ab54dd7c"; + sha512 = "6fa393ede2b47db3013d7e111cb74a90dd8186dabdf1f19cf33550a7b7bf21e3b5addb3a0d7ce85313b4a5d445b395f30060e27b6c6148879b57ca95f8bfe1ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/bg/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/bg/firefox-65.0b12.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4b6d536d3851fe5cdb9cdfdd0dac4d1eb28df34b61ef9b25a6184d61722a84118f526f97c97f1de30c8f7904cbd778a9a587ea119c5d4b54ee980e7eb66dfe00"; + sha512 = "b6576340d149e3760b2f62f7829be660d4edb3ca108b9c16a9b787f64db74ddb9352f12ea5fe868a85db0f9e2ae58a891ecac99a959059f269011cbf79cce093"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/bn-BD/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/bn-BD/firefox-65.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "26d4325723861ac0e4f321ef8a88c2de8bfc1519c7835084249ab87d3a0b2d3036755273a373d4e3fe04a947bcca96e42519b76c2b674def077e41699538cec5"; + sha512 = "0d31a3031a557c395953695ee6bf46202cf7736af2f122c08e1ae008c6ff27051f2c2501ee54db4068cb382d77584669fef979a06e3bbff8dc635c6f8830299b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/bn-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/bn-IN/firefox-65.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "41b2b4bccd610fa80e8a5e666706b53f168d29408d25522d998ea3c29ffd361376df2418a8e4619cd9e85600146fd24036693b53f19913650edcd9267d0f169d"; + sha512 = "a3c50d18fe5cc1b44effb8799552419d2382d27c804aafc02b8cebd2c973512098a8c54c807e46da302c511185e355f31b4a34f59a5e6b8c81df475d9ccc6fbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/br/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/br/firefox-65.0b12.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "08b08f60c2f6c92fc1d80d04a9e0e0ee63881c7c78369c05196cd5f0e6d81ca2c04bfe15a98adf815474f76b22a05b3ee921c763633b0885fe2fa221787bb6fc"; + sha512 = "f346991f2b028fb90bfc02c7bceeac192185a02fd3ccd5188769f26b63ba2716dadd1ef6fa01778d400ec82f7f6a2e2b0eb49720481fd56c31135740e27751b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/bs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/bs/firefox-65.0b12.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4adaa4a23ddc7d6fa4d3f9ef4d74fca29cc5a69d6f933454be5124b672a109d46148b543582d86926551022482543ed285ad58a3462315ff55311ace04a6dde1"; + sha512 = "481c9f545f62976373070b7bf1dcb92815feaedf6864a73316c9bcd05fb442ebbbb3dd337f943568044e3919af3e7d0f0a2ebac543622c7c34ea438f5709bf72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ca/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ca/firefox-65.0b12.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "c655c6875ea040e9485be1c02d10feb810b3f32b45713b61b2f2c5646d419f49672f876a3e227fb93e2af16ba77d88b3b4382c3e421c1f19a3e4baa79f262b6a"; + sha512 = "42766478f0ea47053033937db4ab448008328189d10b3b440c34a71709edc7cb56655b5eabdc00cf56a5283aa2804130ceb66123d170d810176ac80c138316c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/cak/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/cak/firefox-65.0b12.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "6f66416cc027e676e555968e950ce4b01581b5a1ba8c60ac7b887e78f8717cbfb71dd93c80cbd4ad615e8c33685fbc1f3ec77b770a5c9de8c0e3de4fee3cbbb5"; + sha512 = "e24a34cdba5d6a05ce9b4dd606ad1e2a3481f9711f78527ed20031fccb2138ebbae48c49f97c34ff83196c11d60179b36b6501477d9aa8fd505dc5e23bed9a68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/cs/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/cs/firefox-65.0b12.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "404753e1a1cf1568b6e7d45ed90e599f951f69f471b55f0eca54f782cf39cd925a8d8844e61db1f9d12811844b618ecbc24d2bbe241e24331a38f167642a6796"; + sha512 = "46dd71ae684c4d814da2e59162a3aa5a7f87b9025d1a2b2a9d2e22c4436a1410905f0b2a44887e6bd34cc6687974ab038f0e163dc7b2b6275122bc7d9e01505e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/cy/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/cy/firefox-65.0b12.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "6baed406d9777c30d6bdf91ebdb49929b13ddd631ac1891db22ce69838d02153809abcc5a24088fa0f1066ed978a74d37cf6aef3c62bce44a8a4214bdd750f17"; + sha512 = "911c19d27cfc298a8486b1b67865044e085973fecb09123182b7c2cae554c2995e56192e1ada40a6738d932f4aeabc51622d37ee81110895c9424e575b2ff820"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/da/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/da/firefox-65.0b12.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f8c802efc74f56c170ed2d9e0528ab2d0c9a9c4c89dc853e7758f3fc892517e4566536150527c452101fc602c980df744a1afc0df8eae9e021899559ad34a3aa"; + sha512 = "ea0dcc2df43f635a08435aafb6f754b6ec1f763f8e0547b07ff9cf7700f28a5b5be8e86321cead17e284920d973461299611a5e0e83ae0b9dc31432b23c75597"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/de/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/de/firefox-65.0b12.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "dacfc0d7392247d2f37d9d8845512485f8853b92af0c28dd69a41e6470a0c8cbf36dc53804811e843ce60cb42e873c8850560f32389b1e67c1579264f88d220e"; + sha512 = "bae8ff236ec83b00eecbf0474fcaab69d78a3bbdf1444796dc84a142c7d9f4478a756d9f0def3a02c24887e109fe3e60fcc30e4d1a11967d8e4df65906ef353c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/dsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/dsb/firefox-65.0b12.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a0530ea6db3ac9b405ca41d9b412fd292e401aa2ffc85117d78c6ab8c0dc83bebbee3f238843799a5afdf46a6609b268b96ae8c3e277a9d40e644c96e49c57d6"; + sha512 = "f9cce8fc09ba3958478f26ef41c4e4c4dd0e4923f50fe5855c8d1e2bae767590fe7a8554563afff7f88487c4cef4fc274fc31b0d894d3a2400674d125f95f7e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/el/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/el/firefox-65.0b12.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "005f4ac8c9d920fad1bcad4f5b616453e33e6bfc949eaa8af8302bb4801546abab901dda901d007d3f93240e967583e8dd1dd00b223bd896e5bab96d463338e0"; + sha512 = "41e7b425158423602caebcf306ee103c05ba8fa9d3451fc3da1d4b33d033871f9bf8a9f7acc6de470a3d769419eef6e2ac240f64eb0d69b8ef85e009f43af845"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/en-CA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/en-CA/firefox-65.0b12.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "bb54d182088e2c85e33bed4e29b47e5e549511a7985d747c9cd58df211aee5dbdd371c32e2049b77dc58d955dbdebafd2a79cb7ce36a1d2c18b88b9f6e668dec"; + sha512 = "72468f1184254089dfc4828b4d1fb7040bb49291596e8aa87acc22964bcf257ef2151bf4739d6b6214e6a5202e784073f65deb00a7fd99c76d02d5c141d36a21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/en-GB/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/en-GB/firefox-65.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a86e4c521c00f7294bfe141ddf8979d90240b783f41343a89f19af19f7bd9e5ea9ce3b5e3b519538913b133342e95cdda11f8235c806bbb01a1dd4d2dd4e0cf2"; + sha512 = "a7e448e931a0c28f42f098d2f68d19f305a5f7499d191183bb1bdc003b5bd5066a068f317485f58c3b42626061c0fccc58f0aae7fbd494214a548473d9f1b7f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/en-US/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/en-US/firefox-65.0b12.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d4aa22cfc5e716f0d31718b36a4251d7c7bf4780732fc512767dea32086a5de4d3da7ff24da100300502e5c9ae3c9f61381505157a6503af3cb40867b3002600"; + sha512 = "3397b8c25419c89617bc1fe9b8da9df1d679d120c31aeaaf429c9bb9b9071bbb20faa05014c1295265588ddd0ae6b0138dba912d6ae03c68e6d26080ff294f4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/en-ZA/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/en-ZA/firefox-65.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "ca1a5e04a0f0be40d28d7ae39d59aac150744f303380238ddd9986fa92463b3ed5207faebc9c65dc5da60ae1aa58f2eb09a6c3d0dcce236e685a80b6a088b87f"; + sha512 = "c027a51a04f9801fc9f11f2a1c61af271cf134624ab167044a8675738215c571021ec06e39d7164fa4778b70655e452b7b4c65b8d5d4651a2a7cdd7215f32a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/eo/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/eo/firefox-65.0b12.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "2fc3c1c22f87bf10c8967372f9aba56db75070ad2804ee45da4fcfe42b613072ba822733966c204ff521cedba59cc93bea814a67797017d06322025cb1f18d9b"; + sha512 = "419e9ae84f80253d7479c486da59b7645715125a9aa8a6f73a746440e397562cdde4e6a374ab03ed10f86fff76c35688a7de67b7906fc98545a66efefc8e7fac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/es-AR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/es-AR/firefox-65.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "522ff91bd93f295ae27685e61015d7382edaa0dc2eb2d91353b4ca5db474ff3e76547d938c7822389884fde33357a95b7b8a8e3ac47cd8b942024fe6f854b3d0"; + sha512 = "26b0eff4f5aed261490f11f9972f7c7d44d39136fa3d8ccc1169473c05bf6b05fd11c94d3bf4a69312e17bf96a962f8fc88ffe948ded6e5f391fee95cce553e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/es-CL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/es-CL/firefox-65.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "a269ea19c468fc53d577ce5cde0a509fa1288b54734a7bc25ba18db523c35795b1ee901cb85e0383ce97bb472c315acff7030caa2fbbe78abe2bd5f6694b5d3a"; + sha512 = "e42115ed94fea6ffcad85717559d8d746360280b6931925e45d79a755f1e4e3a2fc098dea7be9f424aee499a108944e73ca80d7dab5448357b1cb10fc14cf968"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/es-ES/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/es-ES/firefox-65.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8f5e60b8ae56bfdd1573b28209b808ead17f7ebc9f0d6e59dcddac9a4276ce133a9fa0fc6380567b69befc1639a330c9653f1ee8ef867843dfae4985982c0f83"; + sha512 = "522ea3cae483b441822dd8381ce7571a82f3dab0feaf676737f72f90ecf2485e33e0ac2f253da798342b8dd678f9f6e9170de8838aeb5fc80fc4db605425cc04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/es-MX/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/es-MX/firefox-65.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "95cc84937e8a475d09df4cb9398c1d086b4077439230f11102d83472bdc2b5e5b001719efd68a5195bae9ee39b60b7d01588f3295fdd7977cda5d12d187b26f7"; + sha512 = "2b1d387d3560989a64008870e0f72b4d40e8dc44a159e77a30becdd2a8a6c3ae2250706da539af40be5e09b5ffad32e7b9a14c60d31c2fb53e88982c3f543d49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/et/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/et/firefox-65.0b12.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "cdd4adceebc55df21a50a6328ae094f9c4aeff66e5678cc55dbb23a3653d080281dada69ceb1749533335c29ed507e7227521b97638e1ef35795a3d5f3d80b85"; + sha512 = "c103ef7f2a9841d637aa73a1221123eb74114d40e10f016318b0812aa81a84f095088639cbd29ad3f90e111ee290eaf9ae66121eb5c834cb9ad47b75fffb5098"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/eu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/eu/firefox-65.0b12.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "05616abf9f27f9f1f15d1ea446ef93ed164524decfb2368da6736b63b483714e3ec721f046255eb305a592672bfdd0c8a7726f198610aca87b0eeda32bbf09e4"; + sha512 = "e84aa261030ff28104f7b5abe7fa82f7bba9d615313ddeba9defe434783e659d945edc50985da057a5c084155c44c0b60f596dfb3611b5a6cc49b012e39db9d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/fa/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/fa/firefox-65.0b12.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5fc56d77ad80882717c40e7c5e9fcbb74e02d7dfd09438ce85c858c8aedaf4037992db5a1d3320c96980e191e91be42a8d2af617cbe2f718ac107a1fcee5fa6f"; + sha512 = "438b76020645d5d21c36ffb29ce796db825c6cdc25f96f141e0ed16097cf13e57670e9b8cf5a0a00837b983dd01b24fbe18a8ebfd754f7b017667a9e1708676c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ff/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ff/firefox-65.0b12.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "97b26e6d14a54bc25203962de2650108f93c8704b4fc67f3732fdc50807fb57c3f18646bb287e3da8d91e46e551af6093bf9031abc2b493a00ad0d192ab0ba8c"; + sha512 = "b39f5ad96d8da28ec8f7fbd47e34294b7b25ee5f0497339a29f4675230cd08f12909b2ae9cb8ffdec7eb18ec00487aadc809f3bc919e10ca49fab02ee9da3a1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/fi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/fi/firefox-65.0b12.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1d75d5bd8611ff1f007625c3925c7cf1fa2b7cf3c819ba8cfa1c7c4d8f956908cb4becf2bb5857c3d43ccf8aa80edba29c585a17f75892792a49b4926cd73acc"; + sha512 = "bab8b6e3aa6713f687cb06a12f8ed22c2e95cd85183d55fe9d595cdd50755d48c686118ad6793fe15b80ff84f11fde79604bcbc2977a229d2f81c2640f3c4341"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/fr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/fr/firefox-65.0b12.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f863f24969a37e1b26faf89c2ccacba19acc4784b595bdb7f39849bb294e08129790bc4db65ae52f90d185be43d0814f9983953b34e8fe7bea2b53435ac40474"; + sha512 = "d648afdbe7dd41fdba3ebe66362d8495724ac036445e5b3f19a22701cbe1550528b41b67fe76c91b1f19543126b8bc089e672a38cbc41746f83e187b70cf183d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/fy-NL/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/fy-NL/firefox-65.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0804073997525eafc1d09588beaca9b33207c60db298ebf2165f5e4f0ce717c2e1522da2ef7e4485218a089d4ca96a22716ed99101b9151d9da2eacc38377a8c"; + sha512 = "e22a95c4800e20d36e9e5e2ada1c9b4f4219b86ec0305d1385ffffdcfccd4699350772e551696e2d140ce7d552ca0844c1dc276f06bfdf6df9d461f2d855d7e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ga-IE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ga-IE/firefox-65.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e7b949090f33074fdeac72b0cb5fa84810c28625e190fc9740785ea11659a98220d8fddaa33df9016528f8bdaa255f56bd329af0bad31ebbe32cecb0198fff56"; + sha512 = "da6dacdd003725b222b9259c317512fb3baf5a12e8ddc062987c732844a41599cedec60c0d9a5f55abd3ae7d57dad460dd785563458a16b59c785d7cef3e0b8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/gd/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/gd/firefox-65.0b12.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e88d0dcdc0132766228ca750691371f5a1dae73b6faa9fd9f68d50763a5bef477158ef8bfa478e60fa85cf8f2e2e52136ab6e2cf2231a37a0e93718312203621"; + sha512 = "a1a2f83ecbdebc77deaa4d954262f6f5a1750830200c41c5c72dc7e762499fe3f17c71702d5821c755c9d4998fc09509a2a3628e9494440027add0da8a7c8e6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/gl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/gl/firefox-65.0b12.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "fecc9799999edaf3f8cf2a7c883cfdc2437ac5baa4d1ca3491401eb08467007b18d671b32bd3b24435e59ee7764451cdfd3ee34722c5a8a298abac62f9bba90c"; + sha512 = "d00463385dd0d09cce650775a9a6e9f92de899f4ae3c8354b0c7c8ceb00c0cf8d5dea934a173ee3801bc7696297deb0270aea8644113128c4d2ace6f5e54f7ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/gn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/gn/firefox-65.0b12.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd5860801cf202994bf1351ddcd532574aaac4f1b88225c2144f94031ee295e8b71f7f5011214c9adc904d40f841ec19f1881bfffd112a3bdaeffa5a21b15e2f"; + sha512 = "21c55639f4c9db05b119bb935eaac9a327e3e21c74cb0bba6e02b256290ae685c9df5d1bb98ceb490d7ceb1822da2336b376451c5a8f4620a937f55f84a5130b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/gu-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/gu-IN/firefox-65.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "011d4a1b9f006265243faa08c0b3fa9fda406b8a7bc3c066e2518dc635629dcc6cb42785dfe627db7e3f17fa5ffb609fc199b7972d4b15e089fa851d8654937a"; + sha512 = "59c175af42cabd0c39958129864c25314da9fa2f2f47b9eac7703ef8fd5103533f7bbdca65a78d0845109c5aba5bfd72080b4d03f9e9578c06095afac1d88b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/he/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/he/firefox-65.0b12.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "eadb0143a28eda6912053d6fe7d528467b606d9aadcde75e28dbb40d5c005ba20caca36747d364850276128b5d491f09805b5a743667848d2b6cfdf9ec33656f"; + sha512 = "e3424c4d74470bbb196af49328d1ac108837d52b98ab72ed49ff4f6592400df4d4a23248688da1a279198da1b17711266fbef9b4b3e2140587ccec704343e3be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/hi-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/hi-IN/firefox-65.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0e66c0852895a95cc18fb17ad34d251b594c9f6c6606079022e78e1af8861662360fa2845b513e4d4d383b3190e76b979b18ab39175c5a5c6ef5c5985470328f"; + sha512 = "07d0211a0185145016b49267c6761455f84990574b292fbe7acd10b96df19197d9f9ff622ca10f0f006f3754f603ad3979a83c68426eebe588b92965959d2435"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/hr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/hr/firefox-65.0b12.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b883ea1ef7638b495e35be3542a55ea7ef5ed1f972f96732fb59e094a75badaebdf04e86bd6bc1af0940a0b98351a780674250e00a8e9bffb1570d9e7aac5f77"; + sha512 = "0fda42aa9478d67cb6397f41ec89567a546f1afb9071f579bdae8099e3557ee00a8884b6576951e218421b35f0036684563b1f0e43587d4216a17ce3d90d9ca0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/hsb/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/hsb/firefox-65.0b12.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0ad0b245817cfa8a99e666ad3f1186efad82c246dcc30fd9025a0f269aad36f65de5327c1033a85af17c7cadcefe9dd68f477108784d21c7f47efb8b59611271"; + sha512 = "f4578ee4672f441e458dca07cab6394ded49f0a7cec83299b85fbf3aabd96cbdb1bf9e0739edd4176975f2104127f0187fce7830e7a09bee164200bceabef5d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/hu/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/hu/firefox-65.0b12.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b7d4c1f808b38f8ef6013546ceeb1452eecce288727d0c6e881027584a3edf6b1cdaa888bcdb1dd6dbc16d4ce919818b226d4a9a9131adf82d4efe27b00cd578"; + sha512 = "192097918350c6701d762bfa249994f22afca5f7647d6a850b85f1af7860a01fd39005d3025ede6ccbe26fa3f979de2e61494e332b4d2eb0d196b342c4086ef2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/hy-AM/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/hy-AM/firefox-65.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "bc77edfc03807112e07abe3a6f8460627749853b3660c5eb9d7bf6233588eea084edd6077f368030a70a992a9af3fd7f59228c27b900f7e1cd974b105844f088"; + sha512 = "214a2be2c19df26694e8edfea9818d92c8bc90711e624a4803b1b4ff3d243b3b49affb98689602ae5b1e172b64b996c8c16b3d7aa5b787120babf7d154b64701"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ia/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ia/firefox-65.0b12.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "2e6d5a0bdaf6c47b1e3275f1784f7189e2155ef4863935364682b3bf1240d83dc6a0b71870b68db33709888a3b40ac4925f1d89856b8bcdaa7afc471f1554070"; + sha512 = "0f289d56dc4ce11ef31b50dfd0d61d05dcc2893b103c6d91d0270d223692da88e62859c1e93fcb11b199a9e1042c7a61882faa89a96c4fc354cf6cf84f83d587"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/id/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/id/firefox-65.0b12.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b3fe1cc5a31f1b9745599fab425d24b96ef29037ec42694850eeb42536af53ae517baeceb616076eda68580b7d8551ddcf2a8eacb150fc47124388593670a81c"; + sha512 = "16947e1ada091fc6d539d1ccd309cc06860d9cb08b602cf8031e74d4241fef00e0f8c253153fcc80535a6d158c522459b3d16696ad7fe7e2d863dc885541a609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/is/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/is/firefox-65.0b12.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "feb57755f08d1d436a5832548ca242dd24400855499195e9bdc2e9266e94eec03f799e9182a5b17227156ec803d35047c9a928b2d2b54b2efe34cada93f98658"; + sha512 = "b89c9edc5400dfc32413445dd0eb9e189ab9195678e12454be17396d374cedbc48c8879fe243aabe74429b2ca1fdd4e9b9dec7ac258d70429623da3cf5161d5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/it/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/it/firefox-65.0b12.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6e3f7be97d35e50a6d64d44f31375e7d3b1e43ce7d806d2289d93b20a5e7de0bc7bb0842b119d6a79d4c3c5bfa5ed80f697b51b23f3fca532f315ac3b7292d61"; + sha512 = "30b5cbbb5ca8badcd54a9c77fb316b801e9e06a8307a926ff6ecf3246950a758a3b2ea7a68ef669161cd017a47d0603ddd70477024691e190ac4babf1245ad09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ja/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ja/firefox-65.0b12.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "326077baf0adff3d6aca8fe6ca691c0b6c8e5ce2f60e0eff6cf240e0c1e0a5415f5b779b1a6ec3c93a9be93a93fc436f7d06cd55c87ca7c8c6247cf22b8b6604"; + sha512 = "4477c723120fa9d01b51f3225e5973aac04d6b4a9313246d7ca91305b0ee550e36be9b7759afdefbf471533c1a806a672fb58139081276accfd03f0b8ddb1292"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ka/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ka/firefox-65.0b12.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "020e3be45342c548c4c3f3941b7e5abcd02aaa50531e162b28905ac19bc72b3dbd8ae42584c7365f206ef7e7d1b085569c2d66010141d7ad4c646ad804798bf7"; + sha512 = "0e9b42939edd33fc10dc17449f7cc63611e3a485e28497fea8f6882094e9551d75a401d446e7d8fc9b48680ccacbbf36576048d740b89e72c1e449ca7ef61636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/kab/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/kab/firefox-65.0b12.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9bf4b3cbc7c63aec8d12684abcae5a065566c096048de521de180fcac58a9d3b7b5479d49e72bc1745109eb6d86430a4d0676f517c98741b8f4bd260836d755c"; + sha512 = "4a23dcb974b08269ed4b151daedbbd8168e5b59d3ec423149d946a8165e1ee2a43c612fa9130c1af15d188605e13bf6299a48d7f77b9dd87062590c1e04739cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/kk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/kk/firefox-65.0b12.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "d1bc275a20a6881581da5c2f0d6974ea2c89202a18ee3c0a18cb99b97245b751e56b26f1b4f00b8887f590ee3042a6cedb21d2c11dded8bbcd04215ea356b3c5"; + sha512 = "d3be943df25bb4d3cab7338b6bf54df10b0cfc2dc4bd6d9f9e2a8c0518a4e1363d9600b9774a694048b99b92c1098b409429ef5a454f92e6f987f6aeddafd0ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/km/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/km/firefox-65.0b12.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "fa758726002a85fcb1d5a1e3218d641b1c32ad20d14b64f74e85f737ae7f1e77e2f56cc4f707a238b1fa02d5afb37b6b5a7a380539d908e5bbb4b0054e932b12"; + sha512 = "faba217e3be6fb1b52de3debef4ad1d9880b44043564bb96b7ea95dc19595175b6a58cca5e266409d325b6729bffcdc03f961b665f001bc94b2a509ee3b68a6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/kn/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/kn/firefox-65.0b12.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "3ced6c9fe64e00865f3db229be8ba50810cb1eb572791375e2f32e80d632044f83c285836ae37fb395e35224ecc88b23f29a77996975a66756f5d0468c584611"; + sha512 = "badebd0eae95a11188a67010f8c96a54322bec37b7eec52fa6b0acfeb782c47d0bee1a8ebfcb10ea000d35d8cfae26a13e31077546dc4ae9bf2dba7e2d4aaeb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ko/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ko/firefox-65.0b12.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "78b99cbebefcb805066f89d97299b83c8482a3a7d0923636dee0d46efd559afb09537525c31b6a64f434982aeb2c695edf25f5b7bfc7859c4d150080782f5b57"; + sha512 = "2023f5fb0f92d3c59bb47a0a47b8013b989dbc5dfcf79d6611a5550ea4b17ac43d680a0538c615f44c4b95fc15868cbc329a8eb62df2b423c720ee5e65a3b3d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/lij/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/lij/firefox-65.0b12.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "cb5900ca93902d3e49faf6f47c60fe24f80a7dca59931686c56d84d75d86bb42ce532b660ffa5d31b8ff2cba53ff0a263a0199f9231051ff374b4132e3877bde"; + sha512 = "662c01c8eaa91743dccf1827f09e5d9b2488638931861664aeee78bbf8db4820acec77e1a64d4eedd207a7763c1773ee3e5fa3c70a229805d106e66d6d825937"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/lt/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/lt/firefox-65.0b12.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6eb5561fde3afdd01aee4de96bf09096841aa618d4e30079a7e78c169c63f17868169b63022a92bff0445597ebb0c386359c37fbfccef19781ad4d4ce86e7fde"; + sha512 = "f01f7b319a22fdeeb99b8db25b7c1a0e40cf93aff241ec5ef0f3b425200d2ede44c4a3c64a6945c3129b8321367ed5a1d262e737faae2c9d63f144875321dcfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/lv/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/lv/firefox-65.0b12.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "06794fad7072461cd58f004ba10e4cb7c0b40342062f562481d8748294da9eb1daebaceb037d9ec62a1adf35525123e69e17d1d8341c91b7a92f455a482b068a"; + sha512 = "67d006cba759e9c797d4f39667312bc35b7c97b0e65005a96efdb2255ff465443e75b557f6312f387ffff107d1666064e111945e9d0ff5bbe8317b95cc6bd49f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/mai/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/mai/firefox-65.0b12.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "3df52a9a64d3f521fe8c6e1af0d8062e74c86e8c9bcb8f11968d0e1a9278720dd87d8ffda2fd17ee1c94a8eda3dc6d3b594f37bc46b6ccc657d53cf02c071c46"; + sha512 = "21d5c357ea45a07b8d5953a42a77899ae69855b3fd2971518ffc509b75471c0893993cbf3431b8c1180e7712282e754560edc2d66655acd6dc2d5018a0dac6eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/mk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/mk/firefox-65.0b12.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "5544ec41332241d68422b558008e1ee59227cea6a6916c925cded1ceb97068020d91d745253614af799f3792254138bd62f487b788cb32b5bc2f32d4d348ce25"; + sha512 = "ae9f832fd1699fc6929d62ed77841436310514c471aa3ea1c3916caf2e6d7369de1633338f9d504032013992bfa3d9cff488af9d87abeb12df16f907b01a9aad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ml/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ml/firefox-65.0b12.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "e20f9b203e386ddb37f40ced401ac5c9b698c2ce4f128f87570aacd4b414d1bf1d7e97b485f1c475beb5004b1121521ac4e1efd31b34f231840fdc5c1f28a60a"; + sha512 = "1f003afa0d5e35bf458b8043e734b909089d6554ef671ec16e7661c841ec66a7129f17b5a6ef36855db67d97f906be47b097232c3025a10c46b8dccf53882769"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/mr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/mr/firefox-65.0b12.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e6ee72891dd64ed94f54a8d59500709cf8126e8a574c80985f7dd96eb645c299e6ea04e5e41b142451f4e8a985d456706f78841a35bb9e961f663dd255d9154a"; + sha512 = "493282c42fd361785a41997dfc248291face938d50626ddc41344eb8bc4d7a71f97e1f03ac141432ae80c90df0e0d21cd854dc5e8a31b6984ecfc71e39c0ed23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ms/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ms/firefox-65.0b12.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "9fb7b62bcaca731ae078def1c6795cd7f941198453e49ac52992818d304d7f82a06cb396ab974e69d339ca540c834fef5e66b02ed2b33a9df5548d7886969064"; + sha512 = "7dbc3227ab947d034292333afc2c607e44c81b572c8e5edbc2bef1e94e75e627a109c3e84c618111f6f0aeea0961f03e9f62edd25dcbc7f48e7e62d432db83a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/my/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/my/firefox-65.0b12.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "8b3b8658d7a491fb5f8824ace789a383a9254ae3b2da8b267e5f7e71df7b5de3518c1608e16a7f2e0c9359226e4e8b83edf7ed9a312c0d8a54f33dec1345e920"; + sha512 = "c3664d09e81d73193d4070b704526e01c8eab6b92b6706308806c4cff3abe71a9aaa12369fc74d0c5be47714e684a2c9994099ad6ce3378ad0d41b00e6279d50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/nb-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/nb-NO/firefox-65.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "94b27abe32740f2378a8740a98a48074a4944be9d513599c7dcc58992ca4d0821738865dcd94bae4386779ee65d9d00e040548d6ebdae71974695655a2890c80"; + sha512 = "df15e3e4426cd8e253cfe5ca441214ee37f8181180e3cc4cff8a7e3b88a3d3481db79fda8a249cf5b8acc5ba36404fb016095920c0adf5f9f311e261aaff0251"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ne-NP/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ne-NP/firefox-65.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "d60fd789c7a9db361c8a39e2e1d1f7320da5148fb0c89b371c434e7e8323b176aaee59178b51cc6410e283839d043440a19ea991b94bbb28585a0a16a43e50e3"; + sha512 = "cd528e44a9efdab0cde68642f86587aabfd1cfa2de14e84c34cd8614d3f85af5ec8baf7010ad6c621f296e1ee94eaf420759eb6c0e2d212f917b38720d3f7918"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/nl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/nl/firefox-65.0b12.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4d9230b5a518617fc60956e77a9cef863568e220a33fa579175662a87fdb694c1b78f158a3ddd17e250479cc9c92c8926c77144ec55db2dd70298bda2e73451e"; + sha512 = "a86d07a4aeccf51b04ef8bee55780d20f6dff561870400e0e84539e77575fa462b6e87255f580ec147b6186ed098b733c4e72a44b66c3aec631c88fae6057442"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/nn-NO/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/nn-NO/firefox-65.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "c183e0ec8b04f0f9a369397a836e8dcee964ea11aecd92d1c3e2cce4ff10c51d749b85b41233a6d7094896e45f11e81b99bcb9b91fa60184e2bf57dc16f817e4"; + sha512 = "3b4e193d6d5fec1764f78d1ab0cb70f3becfe8b738c037b7f2991e7375e72db2444d21071041799f9b9a1a1c0a7e0ebd7037bf4f86508965dee4bb6b28c5082e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/oc/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/oc/firefox-65.0b12.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9f61a0fbbe2eaae1b218a5bea57ce79a75452bec995d95d5670c59a897429a01cbe60803237457853a2bd900fd4945d76a898f853b2c87dc142a29f3c1b01d3a"; + sha512 = "999a9a520ae1546e0c53551b5c983f81650cc8410b8e1af8892d48a6ac8368f9e6dd9cd571de87e97410722b10e8c3989b692dbaabd7597f0bb274c156c84f18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/or/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/or/firefox-65.0b12.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "65cee4624566e1024a5995d66799b0c846d9f04d931b6205251f888a0e9683e7dc997f48fcfd7768b34433ee3d3fa04c513f08dd3814069c22dbf488627a406a"; + sha512 = "6fe6de7785b0e0c48386379581d2fd4ff72d45762d47aad824fa895c5ef2856cbbe36741e59dd1c986f4aeda538d50737a896e39248467c9daaad4d4ce27fd97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/pa-IN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/pa-IN/firefox-65.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "93ca34b0f1ce268cb196cef8dfbff54035b34c4fbb6e982eef87e5e51d8f99e69e40708593cd74fd3f2794be7231d73309354d878bb48900855b21d56e7a8978"; + sha512 = "64bb4b1547addde5daeb7b3be86204b9642b146b6a4a4a1f4b65a0a7a6a3648e117c0b0fc38ff3aa145246e25cc599ee95c1118c42af822e0784b34ea6f1bf70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/pl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/pl/firefox-65.0b12.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b02bd094970841311cf3aa8626d9e91badb750c762ade70d2aee92009da66ef6fc4b7b14660c3572e8bd45239e28acff3fac56999b9e5995430078736f3340c0"; + sha512 = "b9a274ce71be8f21f99c5d8014be1554e51af7ba7d7234a1a167337a715467f800332f1a5ddd0d7ab7df7e7184ec61fc414267d9259df479beb5a1343d6dad6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/pt-BR/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/pt-BR/firefox-65.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "965d775ef036393a9525eb7448ec45422479e50343ff756401fa48b3af3a57450dca729bc926ea0b1bb1503fb0a8d3332e93950adbd502c5521ab0e8456e6c5a"; + sha512 = "bc429cf61cbedd0b91b1aa563c316b6b1896f97abcd16e76beb084feee36104a9bb83cb5a4b0a90b425e6b025c655b48553ba75ad9e15716b4a4ab0b32b08157"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/pt-PT/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/pt-PT/firefox-65.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4648ba158655cf82cab4a0f4245afeafc2e0999ce972cf7119dbe19b37b407a36562ba4d95b2859bd015842bf8d4432f00b7240a1337288378d92f63f8749840"; + sha512 = "6bffe7b1e420a45d1646e09cbdb56bdbcd6e56152453ccafe10c48f36766c135a30bc09b165cb9bc456fe1521363d6c80ded2ea4fd597f71486c65b5cb1c5a9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/rm/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/rm/firefox-65.0b12.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "4894463178e1cd569b20b2d94863eb8f89517eb8f16c2650662bb822de38a5b9f07f72b413ac872bc87a83416aa917802eecb4d15fb90336169b9ac102209f65"; + sha512 = "75fe94dd75ce60a2e91c414f7d0ecc87e5373183ba94abda69741d6a8c2f499c9943fde3957440030f20e6d59c74c66a1306b10bd5547d98611c6b6fd337e3dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ro/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ro/firefox-65.0b12.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "091ea97d7ae35484dfc7b3fb26b9ba1452001a70b87aec9a5ce74d241f55653e541475a75d097d1d4524b804d6c7cfa15fad64421a639cade425f74b9501c7d6"; + sha512 = "8d1fa8f69ad0aa150a57962c68e615eb04032d9ff370d751168fb57ae4c6358b3fa77445627d03fe125da982eddd3f44ce8700aba3d4bcfebbade07624ab7ad2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ru/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ru/firefox-65.0b12.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ea88c3ae959a361dd41adbb77c37530d02a0b599612e62ee435443eb5a783c19146c97a46b2dd6a1ddd6b6b2e3b3f7b42c6cc4829facf30b0d7c586fcd06ae76"; + sha512 = "bf9a2f236aa965e0ee6566bc341d0d722bde440fa9aab1e8212a312d8e6dac3e40fa3f1e7192ec2e45385e52d33838819cb71e4e903b23406184ad187db85078"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/si/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/si/firefox-65.0b12.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ffdebba332ddc0e49b30c3b79d58f70b37945b5af37383791c6b950686d44384ad3d45a626fa67243515a315a8d91533088c121c223c1970233a10d01086339f"; + sha512 = "22f1dd062c9d5e3d27c5aab732697a49606e50f6d70b81232864dc5842cb979bc9157ff81005b8c7db829316ffe2f18e7bdf2c412886167cf403a38ef38bd89f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/sk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/sk/firefox-65.0b12.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f5210e01bc281c91ca950686d8c945cc0ba3dff131fb65e2b2e91bff4569b419f343718055cb3b7ac831bcbcf1fa9de4ede7c208733034e39771dc04dae1cf5d"; + sha512 = "59627ce8f57f7eb8ebc20c7293284444debbd62ed35d848fc0dbe5259d9628f843bcd4c295efaadb09fae912b456b108af18fc2512173a5a33d8d873fe1e7be9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/sl/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/sl/firefox-65.0b12.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "15e9d8b0f59b0bc81de468bf0c42c5353857d7cad3077dd9fd0814a7a788d7b6c097495707752919f85176a5efa32fc2b9d8f2d8d7b36da5f220efa3f497546b"; + sha512 = "6d146cc2ccbd610487c7c7f0d1974c85e11c3e36191f2ce3a657e66c0548401c5310a16b41ae2c9784894b55508e0318a80dfc42d2f0977c2eadd685d10cf609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/son/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/son/firefox-65.0b12.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8bfe98ab86256366329a8b4330077d8823df724a9a3156558c9685e02e7773c4a82f967e3312f1d239cf9f942f07774f4aab8a24e1e61473bc6d12d939098b7a"; + sha512 = "3d22ffa970c87865302ce7ad91d0ad43fbeb8b453558d6041321b0136a86b7e979b99565f05be5c1d25ab1a506fdd7bc4a73cdd015af6fd030da249817029d01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/sq/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/sq/firefox-65.0b12.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b64505368ef8b6950b32adb6089d648252a9e278077010eaa0cd382358aa3d56d580cde87e756aafa857679a8cdffaa3d27e7fafa4e8e232e68dde5fcfe4b18f"; + sha512 = "7d80028a8e3140d2ec67b48a113e2017eb71e77155abe800aace90e7facfe02e5f6a86c079cbb9ec3f4dfbd982f6ffd2410170bef4e9542ea634a414f4c89020"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/sr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/sr/firefox-65.0b12.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "1af64aef1cf79c57d1e445e54b7940a5dd2603542958017a17dfd63c73452ef98a27b6d0f9314146414d099b4c3fddac73f67155d9fba4cf79f2a698adaff5c5"; + sha512 = "bb3130b998e87d0d5986f3dbdc193de5796eecededbcc96f1f1e2e511b903d5d3ea6dcdb1e51f88a4fb2b0978e695c11bb1bfba8e7d67478319cec3386ddb623"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/sv-SE/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/sv-SE/firefox-65.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "5e0b5faad1ed6ffe010f5317a7e19ee27684fc6aa661426ee2a7b207a795ea557c292df12b6ddd513e49bb907a7fab61784ffa8a0e91377768782e8753d2b12e"; + sha512 = "e63fb206bd71afd26457092a921a4b14d399de76c6f896cacb0da4f313dc85b769d359a328834df4d65024cca35a6e7a3a02fa69957b1a760300df45efb41aa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ta/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ta/firefox-65.0b12.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b83d43e7c74567f9d1fc0c0d23ca257bbb395c26f89686a16a83eba864f182ee93dd10f13ce672bb00c5679133b5b19884833025edb70eeb786b484d209c25c3"; + sha512 = "67023002a661c7775ebc6e8c30a92816ee23ea14d6fd29e7dbe2960583ddc14d0bf449d88cdaba7e16228751ebd28dcad425caf7986a843fa86bdd66327c3636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/te/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/te/firefox-65.0b12.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "7b9f765b38aff82be642f54ec03762519de8ac564e5513a7cee888f030f71e022318fc3e66a014ef25c70ebf9dec0dfa8eec21395e884fa7a9db40b4a798bf1f"; + sha512 = "b539b8e6f552b4d919929221f1f272924a785688c89066b67dd657ba1874d37275d645ac18d3c40a304cda9de2d0f0caabdeae49e597b4fe79a0e706dd4848e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/th/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/th/firefox-65.0b12.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f9352dcfb9ea3e651dccc1fa523a3383837928bce05f097aacaa8e50e0211d0207d4ddebaedb686dd425becabf5c800a6f026e6914737536b5b93b1c06e6609d"; + sha512 = "9bec8f51199a6a445213cd2fad182b2acc25eed6400983eeeabd3d5d0cf7a6c7ffbd997f4c2599c473333f1d3e4353e47a40c0204d6cac5b0d2bc2850d9a24c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/tr/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/tr/firefox-65.0b12.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7bdd7c378bb506443c81cc375193d303abc6256e07b91e3f0e76103a966c29d29ae1ce8e39d246da1a2d7ae6aa4df71787512ccdb0d277c607dc1c6bc47ea436"; + sha512 = "585bd5b91929743e3def77f7575969c59b5bece671a8df3f6d59e7c90caf07bd51d3d919ba15d4407d1f9ca189fbc6abf76f83671491b17e1a9c03faf3869153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/uk/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/uk/firefox-65.0b12.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "fc83c8cad9ecf3ac052ac8a049af8eb13726fb95eb66767dde41819dc96544f4d3020ee67047ad69fa29c81f9fbae73c6669168526c845d284b43aaec0a1abfd"; + sha512 = "280b1aa6bba654417e789a53ebfae408e321f874ed69b4b723d31cb2b805e9e7e7e7ea9028c35f1e2c600a974138b463f537793286d21c0dbaae61fad9b32985"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/ur/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/ur/firefox-65.0b12.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "aa76258da31bb46ecb171bd7c29ec92a0fc0b06fdef81212416a0f7be911025c567d7edc7e3cd147e949cb2c4481e092f6c37fc6a5c041967bf5aebc7db41e9a"; + sha512 = "37f30347ca1de9478f7031d626ddf3f0524718058264f8061d8a8158d3ea1004d4c1650d0d1c16810b9081c43d2e53009f08ef0f9ab835cb3477f151f8e740c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/uz/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/uz/firefox-65.0b12.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "465df0aaba1960ac66286319de797ee45961ec4900f95315211b514ac16c2374ca297430e74f49144c0b2803f3ac759e141f53edefb22397706e13ad6775d7dd"; + sha512 = "aded0230fa15016ce2a1119933b9fc82456712e457da3fab8e2ad235ec606a9f222a79ced6585c91f65dc660675f408b0b0bb21f8cf05220acfcd85be0fb3237"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/vi/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/vi/firefox-65.0b12.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "37eeb9d604aaf9aaa07ab067004fd82722e1c38f664f9050f2dedc23825edf4c3d379bc8e6f12da30a4af8a301e0bcf50404c3961f177543432d3c302356100d"; + sha512 = "497d000ec41ac4eb8a5eae2d9498eb65ca7d1318f71b83e2e335425ef2d2b01c20a08901a79ab24365cdaf5985fc4c7152ec72aca67efbb7999fd254a2dba04e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/xh/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/xh/firefox-65.0b12.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "62a0f3e0ecd6a7155b02b7ce65b20b9dd6fdddb640bc53460b79ae4d4bbe834c9815aa5e6af23a193b6e0310526f1e31e7b1a5217013a5accde44a899bfe2a6a"; + sha512 = "c54ad480874eed1df61bb1b784ea13dd7bf3523914edc678eb3823712639fd769452b1539a4c428fd2b57fb6d6e4bb7fb7f9046c448d3aae2b2edd64a57958a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/zh-CN/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/zh-CN/firefox-65.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "71668c21909454e55c380ee1f90fe15e7496f5945c6add026f2642d98651aa08dbf6f8b0068626a2fc780921308c41f55e2355f5a1b988fcacfc49a677d8e352"; + sha512 = "c8ca8eaf1ca12d099a4feaf306585e5134a164cc21f67226a37d87293a1f76b39c408286e3e17c7d8d36f8b2002cc7b123cf8a5864ec32c4df5232796ca1e813"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b11/linux-i686/zh-TW/firefox-65.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b12/linux-i686/zh-TW/firefox-65.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8935b49adb4b1503ddc96bdbc5f8e3f2eff927839d854c7a067aac7704a0456d29cff3e2ed0d5fc1fe8191dae4cf97ddd14cd6d24da42763bb0005f8f76b59e8"; + sha512 = "3f5f92e65276e5dd2f3bfcd3624e03ffaee69a3a158e7a533d774d9c645a0aeffa7f691ffd024d654957830694087a1ffb014d781a479ecb2da5e4527681606d"; } ]; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 81553a74e9f4..b6ea06fc113f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation rec { maintainers = []; platforms = [ "x86_64-linux" ]; # Application crashed with an unhandled SIGSEGV - broken = true; + # Not on all systems, though. Video driver problem? + broken = false; }; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 251315619cfd..569a4593dfee 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,26 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking -, gsettings-desktop-schemas, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkit, gtk3, glib-networking +, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { name = "vimb-${version}"; - version = "3.1.0"; + version = "3.3.0"; - src = fetchurl { - url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"; - sha256 = "1gws028c2v1zh6r142hmjvi2m447lwqqh65m6z3dzcar2yw35z3f"; + src = fetchFromGitHub { + owner = "fanglingsu"; + repo = "vimb"; + rev = version; + sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ]; + nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + buildInputs = [ gtk3 libsoup webkit glib-networking gsettings-desktop-schemas ]; - makeFlags = [ "PREFIX=$(out)" ]; - - preFixup = '' - wrapProgram "$out/bin/vimb" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { description = "A Vim-like browser"; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index d67d9d5851cf..876630c559a5 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.14.0"; + version = "0.16.1"; goPackagePath = "github.com/docker/machine"; @@ -11,16 +11,16 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "0hd5sklmvkhhpfn318hq9w0f7x14165h1l2mdn9iv4447z1iibff"; + sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy"; }; postInstall = '' - mkdir -p $bin/share/bash-completion/completions/ - cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ - ''; + mkdir -p \ + $bin/share/bash-completion/completions/ \ + $bin/share/zsh/site-functions/ - postFixup = '' - mv $bin/bin/cmd $bin/bin/docker-machine + cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ + cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6ffe40d6a3de..c9edaae1e536 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.10.0"; + version = "1.11.0"; goPackagePath = "k8s.io/kops"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1ga83sbhvhcazran6xfwgv95sg8ygg2w59vql0yjicj8r2q01vqp"; + sha256 = "1z67jl66g79q6v5kjy9qxx2xp656ybv5hrc10h3wmzy0b0n30s4n"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 73a28325f52d..1e16cf1afca1 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.6.0"; in +let version = "0.9.1"; in buildGoPackage { name = "kubecfg-${version}"; @@ -9,7 +9,7 @@ buildGoPackage { owner = "ksonnet"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf"; + sha256 = "010k33arxa4spaq923iazsisxgsaj8c7w4z250y9yrch8xxd74bi"; }; goPackagePath = "github.com/ksonnet/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix new file mode 100644 index 000000000000..4dbd3d38d31d --- /dev/null +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, kubernetes }: + +stdenv.mkDerivation { + name = "kubectl-${kubernetes.version}"; + + # kubectl is currently part of the main distribution but will eventially be + # split out (see homepage) + src = kubernetes; + + outputs = [ "out" "man" ]; + + doBuild = false; + + installPhase = '' + mkdir -p \ + "$out/bin" \ + "$out/share/bash-completion/completions" \ + "$out/share/zsh/site-functions" \ + "$man/share/man/man1" + + cp bin/kubectl $out/bin/kubectl + + cp "${kubernetes.man}/share/man/man1"/kubectl* "$man/share/man/man1" + + $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl + $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl + ''; + + meta = kubernetes.meta // { + description = "Kubernetes CLI"; + homepage = "https://github.com/kubernetes/kubectl"; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 708b59fce243..2b39cebbbeb0 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "terraform-docs"; - version = "0.5.0"; + version = "0.6.0"; goPackagePath = "github.com/segmentio/${pname}"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg"; + sha256 = "1p6prhjf82qnhf1zwl9h92j4ds5g383a6g9pwwnqbc3wdwy5zx7d"; }; preBuild = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 3b22aa3b04d8..86787a12c6ad 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.25.0"; - sha256 = "09f0vdzkifj2mk1qccacpnlqiihbhhb2sfd21rpxbqscmj6a7vj1"; + version = "1.28.0"; + sha256 = "1clivywiv41dbdiix5cqghncf782jvpixlh02hlj4hn2cwq2j6mn"; }; archive = { @@ -39,15 +39,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.52.0"; - sha256 = "037n26spp49r4b4f6cyv6d3sgqw2d80g97fqgz1j0hcwi0am56h1"; + version = "1.56.0"; + sha256 = "1jsvkqr3l88z2lq89rjw0nrnm8dsm57nydi45mbzjl3k0j7g028m"; + }; + azuread = + { + owner = "terraform-providers"; + repo = "terraform-provider-azuread"; + version = "0.1.0"; + sha256 = "0jrsg3a9cb16jinzjhg2pfm65b1bfhdwnyhag1x3x4kffm3gm148"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.20.0"; - sha256 = "0hfq5gk4bhmw65x1rsdpwv0massgr1sczvcbyh572qlkkhvm59xd"; + version = "1.21.0"; + sha256 = "1xvw884nmr3h5ai2ijm2vms12cghas0jbkb52mqbqbaqci7273lc"; }; azurestack = { @@ -102,8 +109,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.9.0"; - sha256 = "0z11zaii99cilqcq4lgikaanb2zc457qv19sxdh6b3v88n5n8qsf"; + version = "1.11.0"; + sha256 = "14v4461bxxr5zdr11v1s89m1x9kpjxa1mff9inx2vwkdz9s02w0i"; }; cloudscale = { @@ -116,8 +123,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.1.5"; - sha256 = "139wq6rr6fczjz496fqkxh6cmscx5hfnv2hvhfwpkhvqipsnlxmq"; + version = "0.2.0"; + sha256 = "1v46da55a8a0hnw319swz3pkd62afy7hdwzybxmp48hxh1i6af74"; }; cobbler = { @@ -193,15 +200,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.4.0"; - sha256 = "1fkn9b6ibs36cmhknb3x05g31rf73w70xwx05rh9fhybrz5dd9z9"; + version = "0.5.0"; + sha256 = "08mnpf5j0pwhd38yl0phy5ipdvk9hwh8q9kcbv997y8mzpn5703g"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - version = "1.2.1"; - sha256 = "000v6fmmnwfibzfssk23s9qwrb8a9l0j1qd14x2dqsc7ql0kbnz8"; + version = "1.3.1"; + sha256 = "19jncf24hl448srk4r2vqn8sca1mx8pcql9p5nxn015q6gig510v"; }; github = { @@ -214,8 +221,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - version = "1.0.0"; - sha256 = "1kxmzdzdb6fc64i2bzch6020zfk0ygms9gh5mm1bypsyqmj4qc6r"; + version = "1.1.0"; + sha256 = "07mj69w0bvvkbzgfj17z7j34dg19db1d2m4gxwzjj81qmgmvzs3x"; }; google = { @@ -224,6 +231,13 @@ version = "1.20.0"; sha256 = "1brkq4iz140miai6gzvzxfl28qi4j8gcc22igd7cb4qzafnlbxaj"; }; + google-beta = + { + owner = "terraform-providers"; + repo = "terraform-provider-google-beta"; + version = "1.20.0"; + sha256 = "0qbzacfm1ai0lflwrq49sjy5y84n8zvaxsp6yz7ifvylqmirj1j0"; + }; grafana = { owner = "terraform-providers"; @@ -235,8 +249,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.6.0"; - sha256 = "19kax1l2l6vr8cwgy14ahhafnvlxgkw86xx2g9ajfg70d0q4zs3g"; + version = "1.7.0"; + sha256 = "10i043mlcp4vvlsd22zcdj2ma3372cxfklrx30kav7w3lfsqgcl6"; + }; + hedvig = + { + owner = "terraform-providers"; + repo = "terraform-provider-hedvig"; + version = "1.0.1"; + sha256 = "1cbvr43qb2kxvsg17cnf91lnfv6cmj0dmc1manxrq1nicsnz6v5f"; }; helm = { @@ -249,8 +270,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.7.0"; - sha256 = "0zk5w4xwbg631m7592gfmdbsmrr0r7vla5nd1p5frh6szg6psy6m"; + version = "1.7.2"; + sha256 = "0wliiks1cvxai3rca2nzy6dhc763fkrzagsl92c5xsz1zs59vy98"; }; http = { @@ -263,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - version = "1.2.0"; - sha256 = "0r05dfgpzci0lpc2ivbrj6ivib8svbks9612by3w3zakzclpv467"; + version = "1.3.0"; + sha256 = "1pm2zfss20spfwqidhn04hcq4nxxamjkn6xv8vxm3mgrky1ysvp5"; }; icinga2 = { @@ -291,8 +312,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.4.0"; - sha256 = "14bhqrpx0z4qn51xwcklafva46ipx05q6myy7xh5wf6wpjz69j9p"; + version = "1.5.0"; + sha256 = "1rzydw8bg2rmwvcvjp1h2qd4izkfs96rnmff42h0av22sfxkd7ng"; }; librato = { @@ -305,8 +326,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - version = "1.3.0"; - sha256 = "1683nkpq7wnc67pphablcmaifq2l1pz3gc9y5y9jbslllphy92v5"; + version = "1.4.0"; + sha256 = "0ak102bmi6yh7x9d3ryyvpck49vgdgwhbk958bbyhfpdr6jrvsrr"; }; local = { @@ -361,15 +382,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "1.2.0"; - sha256 = "1z3knyjn5ymbk4vaja4ka9zn57cgl7vr7hqv6ybqw0q9i2ykaici"; + version = "1.3.0"; + sha256 = "06kq0qkrgnj7z13xrgb9shid356m55mz0hkdbm4vfz3fx863mvl3"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - version = "1.0.0"; - sha256 = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5"; + version = "1.1.0"; + sha256 = "1qfzm35p6kgamm1ffdvll96br025sj496nqzhsnfh3n3hsxzf0b8"; }; nsxt = { @@ -382,8 +403,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-null"; - version = "1.0.0"; - sha256 = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha"; + version = "2.0.0"; + sha256 = "1qbb4pyzqys2010g6b4yzdzgalrf6az1s24y4sa577q2bix8x45v"; }; nutanix = { @@ -396,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.10.0"; - sha256 = "0dhz3y62dp66jkn0q4x7v2cnqw8kiq34sgyfx8mw706hg9sdqb0l"; + version = "3.12.0"; + sha256 = "00mwyangy7n665wlvvr6jmrlfbhnw5spy47q64rmm4pp66gg9brw"; }; oneandone = { @@ -410,22 +431,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.3.1"; - sha256 = "0rpkhaja6vq1y1xah136vjlp1d5v9adymq300ajssbjkqf93wzs6"; + version = "1.3.2"; + sha256 = "0fm53xwgpsmfkqavichxb0vq86bqqpsadlyzqz5jafw3aavx91cb"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.12.0"; - sha256 = "1zv5z55yiqvsh5sh26qlyw8fcc7kyw7v4p60kfnw2ds5kd0b51i1"; + version = "1.14.0"; + sha256 = "05vlcfnbfs4xwzfx8lihq63zya19gdgq2xh5ddwprzddm42v1i1z"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.4.0"; - sha256 = "0dv756npyhadzr08zlv28ghazaj1fdp3avcld7y6ri99hamncm95"; + version = "1.5.2"; + sha256 = "1zprj2k86wad9c35jgv22imld8l8f1jjgv54dj54ry56964nhkh8"; }; opsgenie = { @@ -438,8 +459,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.4.0"; - sha256 = "1hhkijxnwmm21b0w9qc3lk5vfcg0ac0sg7v4g0ffjqv68mssrz6x"; + version = "1.4.1"; + sha256 = "12jsqsyrkmrxpz8zashjwnvn6nkrd6ya06d58m116a0qija1a4s3"; }; ovh = { @@ -473,8 +494,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - version = "0.1.2"; - sha256 = "08wv03j70mych4nnamivjihwvca3aksjxgjlj8yasz5292qgl05w"; + version = "0.1.3"; + sha256 = "1jx907wrq3b9cvx0z4731d1vkp40g358czgpgmky6k8wg70mhp17"; }; powerdns = { @@ -543,8 +564,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-selvpc"; - version = "0.3.0"; - sha256 = "1s1p0qa9x007hq26i4h0gcqpyx54jnwvg8d6ya044gm7gghhviz4"; + version = "1.1.0"; + sha256 = "045mp6j5hll0lym9z035swxmdjq43mdpf881qgmk8sz8j2wgvm5f"; + }; + skytap = + { + owner = "terraform-providers"; + repo = "terraform-provider-skytap"; + version = "0.9.0"; + sha256 = "15p2rfaqw5iab8fkxcxigp7nxvs4gmgr2v8ysfyjz01mgwidd0rq"; }; softlayer = { @@ -557,8 +585,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "1.4.0"; - sha256 = "0kb09v18ksh2r4b5k9iv4rzq403zk1shpakk54pmq8s6i5jd085g"; + version = "1.5.0"; + sha256 = "15ggn37qsgzb78g0f6bj1l89zy65yqj66abs7xq5kjxsh62h9dij"; }; statuscake = { @@ -578,8 +606,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-template"; - version = "1.0.0"; - sha256 = "0jl6bp6gwg96sdk5j6s13vv1j9gxjpy2yva3barmzv9138i665mz"; + version = "2.0.0"; + sha256 = "0rn2qavvx1y0hv25iw8yd6acvrclmz17hzg2jpb161mnlh8q94r4"; }; tencentcloud = { @@ -599,8 +627,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - version = "0.5.0"; - sha256 = "1acmmsb4nj3l4d7zlzjrh97nhrkgm99wlazjrfavxwly253ck283"; + version = "0.6.0"; + sha256 = "1p8l034cjpj81vcvnz8mr2yyw3bz4zffmdg9pz9mp62s8rrrvwkw"; }; tls = { @@ -616,6 +644,13 @@ version = "0.5.1"; sha256 = "1bn5x6nmhfkrzpxhyfclls85l9qqffvzx1xsgcb3368lhwzarn2f"; }; + ucloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-ucloud"; + version = "1.1.0"; + sha256 = "0v4f7rvyiwmm64v6gwqdz3mn9sjq5y8mlhd7v9saq7rh56pfx3n2"; + }; ultradns = { owner = "terraform-providers"; @@ -641,8 +676,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.9.0"; - sha256 = "1by9klwvdw3m854jffimfnsz1lnbaixi4zcv4zzs63dc3flwy2b2"; + version = "1.9.1"; + sha256 = "07pxzy8fw0n0kq9mf43bz4cycbwxp8vy0jbl44sknszmzbn4pam7"; }; matchbox = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 702a7cb7eb1e..0922bd7b8a9f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -11,10 +11,12 @@ let inherit (data) owner repo version sha256; name = "${repo}-${version}"; goPackagePath = "github.com/${owner}/${repo}"; + subPackages = [ "." ]; src = fetchFromGitHub { inherit owner repo sha256; rev = "v${version}"; }; + # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt index d5db0b91ae25..c32d6d7b7d6a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt @@ -7,7 +7,7 @@ # <organisation>/<repo> - include only the named repository. # include all terraform-providers -terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\|skytap\\) +terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\) # include terraform-provider-matchbox coreos/terraform-provider-matchbox diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index dd0fe0a3eb1e..a9d8faf62b56 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.0-alpha2"; - sha256 = "1rnxgwfk10b1g3jnh9gv4lqrcszhxq8shaqslml30hafs3dkg71q"; + version = "0.12.0-alpha4"; + sha256 = "16cwqxxb19m91d7rx7awri1awz7d8cfnrv0rbql9rbg5qjyqxcp9"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 3a5983c2e276..6bdaf2ffaf48 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "rawdog-${version}"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://offog.org/files/${name}.tar.gz"; - sha256 = "01ircwl80xi5lamamsb22i7vmsh2ysq3chn9mbsdhqic2i32hcz0"; + sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp"; }; propagatedBuildInputs = with python2Packages; [ feedparser ]; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 3343141801eb..368b3cd2ee68 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.11"; + stableVersion = "2.1.12"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1skcb47r0wvv7l7z487b2165pwvc397b23abfq24kw79806vknzn"; - serverSrcHash = "09j2nafxvgc6plk7s3qwv5qc0cc2bi41h4fhg8g7c85ixfx5yz8a"; + guiSrcHash = "19kk1nc8h6ljczhizkgszw6xma31p0fmh6vkygpmrfwb8975d1s6"; + serverSrcHash = "1rs3l33jf33y02xri0b7chy02cjzd8v7l20ccjw2in8mw08mpc99"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 4b8670f23d43..d33761ba772e 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,60 +1,44 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook -, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg +, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else "ia32"; - - version = "4.0.4"; - - desktopItem = makeDesktopItem rec { - name = "Franz"; - exec = name; - icon = "franz"; - desktopName = name; - genericName = "Franz messenger"; - categories = "Network;"; - }; + version = "5.0.0-beta.19"; in stdenv.mkDerivation rec { name = "franz-${version}"; src = fetchurl { - url = "https://github.com/meetfranz/franz-app/releases/download/${version}/Franz-linux-${bits}-${version}.tgz"; - sha256 = if bits == "x64" then - "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else - "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; + url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; + sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy"; }; # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ]; buildInputs = (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc ]; runtimeDependencies = [ udev.lib libnotify ]; - unpackPhase = '' - tar xzf $src - ''; + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p $out/bin $out/opt/franz - cp -r * $out/opt/franz - ln -s $out/opt/franz/Franz $out/bin + mkdir -p $out/bin + cp -r opt $out + ln -s $out/opt/Franz/franz $out/bin # provide desktop item and icon - mkdir -p $out/share/applications $out/share/pixmaps - ln -s ${desktopItem}/share/applications/* $out/share/applications - ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps + cp -r usr/share $out + substituteInPlace $out/share/applications/franz.desktop \ + --replace Exec=\"/opt/Franz/franz\" Exec=franz ''; postFixup = '' - wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { @@ -62,7 +46,7 @@ in stdenv.mkDerivation rec { homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = ["x86_64-linux"]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 41e7db569c42..fdb3326803ce 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.5.0"; + version = "3.5.1"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "0zk7rbi6mvs2nnsjhv4aizl5ydiyr46ng2i3lr8r78gyb88nxmcv" - else "0nahsmcnykgchgv50jb22fin74sab1zl8gy6m6s8mjk570qlvzzm"; + then "0ygb867ff2fvi9n9hgs4hldpg4y012w4i1d9cx4f5mpli1xim6da" + else "0g1cixsldpdbfzg2vain7h3hr5j3xjdngjw66r0aqnzbx743gjzj"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1322992601aa..809c13d0757a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.5.4"; - sha256Hash = "0a52m5qkvk01yl3za3k7pccjrqkr8gbxqnj5lnhh1im1pdxqwh4m"; + version = "1.5.8"; + sha256Hash = "0sl4p4a7fyh68g01rddiy719lyr321cjar78b3c732zxfj8lxvkb"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "415526"; archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik"; @@ -14,7 +14,5 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.5.7"; - sha256Hash = "0mpnz287ahzrcr50ira6h6ry5jjhp5wqi660s3kncxpq1wllj0h6"; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch deleted file mode 100644 index 1c79840d6260..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch +++ /dev/null @@ -1,68 +0,0 @@ -Date: Tue, 17 Jul 2018 20:29:49 +0200 - ---- - Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++--- - Telegram/SourceFiles/export/export_api_wrap.cpp | 6 ++++-- - 2 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp -index f835dc2f9..e811c27e8 100644 ---- a/Telegram/SourceFiles/export/data/export_data_types.cpp -+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -221,7 +221,8 @@ Image ParseMaxImage( - result.width = data.vw.v; - result.height = data.vh.v; - result.file.location = ParseLocation(data.vlocation); -- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) { -+ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>(); -+ if constexpr (condition) { - result.file.content = data.vbytes.v; - result.file.size = result.file.content.size(); - } else { -@@ -409,7 +410,8 @@ Document ParseDocument( - result.width = data.vw.v; - result.height = data.vh.v; - result.file.location = ParseLocation(data.vlocation); -- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) { -+ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>(); -+ if constexpr (condition) { - result.file.content = data.vbytes.v; - result.file.size = result.file.content.size(); - } else { -@@ -1017,7 +1019,8 @@ Message ParseMessage( - auto result = Message(); - data.match([&](const auto &data) { - result.id = data.vid.v; -- if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) { -+ constexpr bool condition = !MTPDmessageEmpty::Is<decltype(data)>(); -+ if constexpr (condition) { - result.toId = ParsePeerId(data.vto_id); - const auto peerId = (!data.is_out() - && data.has_from_id() -diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp -index b618937f6..bb98647dd 100644 ---- a/Telegram/SourceFiles/export/export_api_wrap.cpp -+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp -@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { - Expects(_userpicsProcess != nullptr); - - result.match([&](const auto &data) { -- if constexpr (MTPDphotos_photos::Is<decltype(data)>()) { -+ constexpr bool condition = MTPDphotos_photos::Is<decltype(data)>(); -+ if constexpr (condition) { - _userpicsProcess->lastSlice = true; - } - loadUserpicsFiles(Data::ParseUserpicsSlice( -@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() { - result.match([&](const MTPDmessages_messagesNotModified &data) { - error("Unexpected messagesNotModified received."); - }, [&](const auto &data) { -- if constexpr (MTPDmessages_messages::Is<decltype(data)>()) { -+ constexpr bool condition = MTPDmessages_messages::Is<decltype(data)>(); -+ if constexpr (condition) { - _chatProcess->lastSlice = true; - } - loadMessagesFiles(Data::ParseMessagesSlice( --- -2.16.3 - diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index c20da7eeb665..c32e6b186b7a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -29,12 +29,7 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ - "${archPatches}/tdesktop.patch" - ] - # TODO: Only required to work around a compiler bug. - # This should be fixed in GCC 7.3.1 (or later?) - ++ [ ./fix-internal-compiler-error.patch ]; + patches = [ "${archPatches}/tdesktop.patch" ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 5642d254295e..b992263e215b 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -2,17 +2,17 @@ , xorg, gtk2, gnome2, nss, alsaLib, udev, libnotify }: let - version = "3.9.0"; + version = "4.0.1"; in stdenv.mkDerivation { name = "vk-messenger-${version}"; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "150qjj6ccbdp3gxs99jbzp27in1y8qkngn7jgb9za61pm4j70va3"; + sha256 = "0mgppa9qnhix64zp40dc05yc9klsc7qiwcgw7pwq2wm7m3fz3nm8"; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "04lavv614qhj17zccpdih4k6ghj21nd0s8qxbkxkqb1jb0z8dfz9"; + sha256 = "0ra0y4dfx4gfa1r3lm6v42j7c9pf7a8vh12kxv3wkg3pvijwgdsm"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 84466f7cd3d6..e2b56f3b8afd 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "notmuch-bower-${version}"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0f8djiclq4rz9isbx18bpzymbvb2q0spvjp982b149hr1my6klaf"; + sha256 = "0jpaxlfxz7mj76z3cyj8sq053p0mkp46kaw05nimzwaq5yx923fv"; }; nativeBuildInputs = [ gawk mercury pandoc ]; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index a9c828a3fb13..34b6116df788 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = - stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + [ "--sysconfdir=/etc" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' install -d $out/share/doc/${pname}/scripts diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 7f7b03f71d2d..0cfcf6408ba9 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -4,15 +4,13 @@ , gobject-introspection, glib-networking, hicolor-icon-theme }: -let +stdenv.mkDerivation rec { pname = "liferea"; - version = "1.12.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.12.6"; src = fetchurl { - url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}b.tar.bz2"; + sha256 = "sha256:03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7ece1375793a..624c5472ddcd 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { $out/share/applications/nextcloud.desktop wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]} \ + --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index e4715cce8e18..9bfaad8a5bc4 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "13.1.3026"; + version = "14.1.3399"; src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb"; - sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik"; + url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; + sha256 = "166ndijis2i3afz3l6nsnrdhs56v33w5cnjd0m7giqj0fbq43ws5"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index a778042c2ea2..442881398f63 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { name = "xorgxrdp-${version}"; - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "15idwgcjgwa9in8y1bblpj67y7w0bfngc2sa0hd9hn0dinrlifrk"; + sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -34,15 +34,15 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.9"; name = "xrdp-${version}"; src = fetchFromGitHub { owner = "volth"; repo = "xrdp"; - rev = "refs/heads/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already + rev = "refs/tags/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already fetchSubmodules = true; - sha256 = "1dw2zl9zh6win1q0kxj08n9fawpcrs1krjh5978wp0jmq8sdbn7k"; + sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 5dae3c9f85c0..a7887357cd30 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: let - version = "1.43.27"; + version = "1.44.55"; in stdenv.mkDerivation rec { name = "mytetra-${version}"; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; - sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h"; + sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; }; nativeBuildInputs = [ qmake makeWrapper ]; @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; preBuild = '' - substituteInPlace mytetra.pro \ + substituteInPlace app/app.pro \ --replace /usr/local/bin $out/bin \ --replace /usr/share $out/share - substituteInPlace src/views/mainWindow/MainWindow.cpp \ + substituteInPlace app/src/views/mainWindow/MainWindow.cpp \ --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" ''; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b070958b756b..61e84e2be430 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }: let -version = "5.0.35.1"; +version = "5.0.60"; meta = with stdenv.lib; { homepage = https://www.zotero.org; description = "Collect, organize, cite, and share your research sources"; @@ -15,7 +15,7 @@ zoteroSrc = stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "0d2imvp84svllrnja1dl4nldp634z632g5xkm2q9v7j3dwbzw1hw"; + sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; @@ -32,7 +32,7 @@ zoteroSrc = stdenv.mkDerivation rec { fhsEnv = buildFHSUserEnv { name = "zotero-fhs-env"; targetPkgs = pkgs: with pkgs; with xorg; [ - gtk3 dbus-glib + gtk3 dbus-glib glib libXt nss libX11 ]; diff --git a/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop b/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop new file mode 100755 index 000000000000..90b8ed7d20a5 --- /dev/null +++ b/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop @@ -0,0 +1,9 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Type=Application +Name=ChemAxon License Manager +Exec=@out@/bin/LicenseManager +Icon=LicenseManager +Categories=Education;Science;Chemistry; +StartupWMClass=com-install4j-runtime-launcher-UnixLauncher +Comment=License manager for ChemAxon software like MarvinSketch diff --git a/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop b/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop new file mode 100755 index 000000000000..d6e0343a78c3 --- /dev/null +++ b/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop @@ -0,0 +1,10 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Type=Application +Name=MarvinSketch +Exec=@out@/bin/msketch %f +Icon=MarvinSketch +MimeType=text/xml;text/plain;chemical/x-cml;chemical/x-mdl-molfile;chemical/x-mdl-sdfile;chemical/x-mol2;chemical/x-pdb;chemical/x-xyz;chemical/x-mdl-rdfile;chemical/x-mdl-rxnfile;chemical/x-inchi; +Categories=Education;Science;Chemistry; +StartupWMClass=com-install4j-runtime-launcher-UnixLauncher +Comment=Molecular modelling, analysis and structure drawing program diff --git a/pkgs/applications/science/chemistry/marvin/MarvinView.desktop b/pkgs/applications/science/chemistry/marvin/MarvinView.desktop new file mode 100755 index 000000000000..07a3c3c7cf33 --- /dev/null +++ b/pkgs/applications/science/chemistry/marvin/MarvinView.desktop @@ -0,0 +1,10 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Type=Application +Name=MarvinView +Exec=@out@/bin/mview %f +Icon=MarvinView +Comment=Molecule viewing program +MimeType=text/xml;text/plain;chemical/x-cml;chemical/x-mdl-molfile;chemical/x-mdl-sdfile;chemical/x-mol2;chemical/x-pdb;chemical/x-xyz;chemical/x-mdl-rdfile;chemical/x-mdl-rxnfile;chemical/x-inchi; +Categories=Education;Science;Chemistry; +StartupWMClass=com-install4j-runtime-launcher-UnixLauncher diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix new file mode 100644 index 000000000000..948aed03fe5e --- /dev/null +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "marvin"; + version = "19.1.0"; + + src = fetchurl { + name = "marvin-${version}.deb"; + url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; + sha256 = "1ccsimfvms5q4prjyk6sg5hsc3hkcjjfq3gl7jjm8dgd2173zzyc"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackPhase = '' + dpkg-deb -x $src opt + ''; + + installPhase = '' + wrapBin() { + makeWrapper $1 $out/bin/$(basename $1) \ + --set INSTALL4J_JAVA_HOME "${jre}" \ + --prefix PATH : ${makeBinPath [ coreutils gawk gnugrep gnused ]} + } + cp -r opt $out + mkdir -p $out/bin $out/share/pixmaps $out/share/applications + for name in LicenseManager MarvinSketch MarvinView; do + wrapBin $out/opt/chemaxon/marvinsuite/$name + ln -s {$out/opt/chemaxon/marvinsuite/.install4j,$out/share/pixmaps}/$name.png + done + for name in cxcalc cxtrain evaluate molconvert mview msketch; do + wrapBin $out/opt/chemaxon/marvinsuite/bin/$name + done + ${concatStrings (map (name: '' + substitute ${./. + "/${name}.desktop"} $out/share/applications/${name}.desktop --subst-var out + '') [ "LicenseManager" "MarvinSketch" "MarvinView" ])} + ''; + + meta = { + description = "A chemical modelling, analysis and structure drawing program"; + homepage = https://chemaxon.com/products/marvin; + maintainers = with maintainers; [ fusion809 ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 5fab9788a94a..0a4e1dddcae3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -25,7 +25,7 @@ let "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; - "8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8"; + "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; }."${version}"; coq-version = builtins.substring 0 3 version; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 16fdab59ea02..407244ef1830 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; rev = "v${version}"; - sha256 = "0ww8azlyy3xikhd7nh96f507sg23r53zvayij1mwv5513vmblhhw"; + sha256 = "0zpnfg6kyg120rrdr336i1lymmzz4xgcqpn96iavhzhlaanmx55l"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; - homepage = "http://leanprover.github.io"; + homepage = https://leanprover.github.io/; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix deleted file mode 100644 index 27efe865a9d9..000000000000 --- a/pkgs/applications/science/logic/sapic/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, unzip, ocaml }: - -stdenv.mkDerivation rec { - name = "sapic-${version}"; - version = "0.9"; - - src = fetchurl { - url = "http://sapic.gforge.inria.fr/${name}.zip"; - sha256 = "1ckl090lpyfh90mkjhnpcys5grs3nrl9wlbn9nfkxxnaivn2yx9y"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ ocaml ]; - patches = [ ./native.patch ]; # create a native binary, not a bytecode one - - buildPhase = "make depend && make"; - installPhase = '' - mkdir -p $out/bin - cp ./sapic $out/bin - ''; - - meta = { - description = "Stateful applied Pi Calculus for protocol verification"; - homepage = http://sapic.gforge.inria.fr/; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/applications/science/logic/sapic/native.patch b/pkgs/applications/science/logic/sapic/native.patch deleted file mode 100644 index 6e0b98113df2..000000000000 --- a/pkgs/applications/science/logic/sapic/native.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Makefile b/Makefile -index a1de94d..f9e2eb8 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,8 @@ - TARGET = sapic --OBJS=lexer.cmo apip.cmo firsttranslation.cmo main.cmo #secondtranslation.cmo thirdtranslation.cmo main.cmo -+OBJS=lexer.cmx apip.cmx firsttranslation.cmx main.cmx - - sapic: $(OBJS) -- ocamlc -o $@ $(OBJS) -+ ocamlopt.opt -o $@ $(OBJS) - - depend: - ocamldep *.ml *.mli > .depend -@@ -13,17 +13,17 @@ clean: - rm -rf *.cmi *.cmo $(TARGET) - rm -rf apip.ml apip.mli lexer.ml lexer.mli - --.SUFFIXES: .ml .mli .mll .mly .cmo .cmi -+.SUFFIXES: .ml .mli .mll .mly .cmo .cmi .cmx - --.ml.cmo: -- ocamlc -c $< -+.ml.cmx: -+ ocamlopt.opt -c $< - .mli.cmi: -- ocamlc -c $< -+ ocamlopt.opt -c $< - .mll.ml: - ocamllex $< - .mly.ml: - ocamlyacc $< - .ml.mli: -- ocamlc -i $< > $@ -+ ocamlopt.opt -i $< > $@ - - -include .depend diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 9056eab71ea3..40378f8c04d5 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,15 +1,15 @@ { haskellPackages, mkDerivation, fetchFromGitHub, lib # the following are non-haskell dependencies -, makeWrapper, which, maude, graphviz, sapic +, makeWrapper, which, maude, graphviz, ocaml }: let - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; - rev = "7ced07a69f8e93178f9a95797479277a736ae572"; - sha256 = "02pyw22h90228g6qybjpdvpcm9d5lh96f5qwmy2hv2bylz05z3nn"; + rev = "d2e1c57311ce4ed0ef46d0372c4995b8fdc25323"; + sha256 = "1bf2qvb646jg3qxd6jgp9ja3wlr888wchxi9mfr3kg7hfn63vxbq"; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -32,7 +32,6 @@ let tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // { postPatch = replaceSymlinks; - patches = [ ./ghc-8.4-support-utils.patch ]; libraryHaskellDepends = with haskellPackages; [ base base64-bytestring binary blaze-builder bytestring containers deepseq dlist fclabels mtl pretty safe SHA syb time transformers @@ -41,7 +40,6 @@ let tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // { postPatch = replaceSymlinks; - patches = [ ./ghc-8.4-support-term.patch ]; libraryHaskellDepends = (with haskellPackages; [ attoparsec base binary bytestring containers deepseq dlist HUnit mtl process safe @@ -50,7 +48,6 @@ let tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // { postPatch = replaceSymlinks; - patches = [ ./ghc-8.4-support-theory.patch ]; doHaddock = false; # broken libraryHaskellDepends = (with haskellPackages; [ aeson aeson-pretty base binary bytestring containers deepseq dlist @@ -75,20 +72,28 @@ mkDerivation (common "tamarin-prover" src // { sed -ie 's~\( *, \)mtl~&\ \1monad-control~' tamarin-prover.cabal + + patch -p1 < ${./sapic-native.patch} + ''; + + postBuild = '' + cd plugins/sapic && make sapic && cd ../.. ''; # wrap the prover to be sure it can find maude, sapic, etc - executableToolDepends = [ makeWrapper which maude graphviz sapic ]; + executableToolDepends = [ makeWrapper which maude graphviz ]; postInstall = '' wrapProgram $out/bin/tamarin-prover \ - --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} + --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} # so that the package can be used as a vim plugin to install syntax coloration install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim + install -m0755 ./plugins/sapic/sapic $out/bin/sapic ''; checkPhase = "./dist/build/tamarin-prover/tamarin-prover test"; + executableSystemDepends = [ ocaml ]; executableHaskellDepends = (with haskellPackages; [ base binary binary-orphans blaze-builder blaze-html bytestring cmdargs conduit containers monad-control deepseq directory fclabels file-embed diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch deleted file mode 100644 index f93919faf54e..000000000000 --- a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch +++ /dev/null @@ -1,109 +0,0 @@ -From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonmars@archlinux.org> -Date: Fri, 18 May 2018 16:24:41 +0800 -Subject: [PATCH] GHC 8.4 support - ---- - src/Term/Maude/Signature.hs | 8 ++-- - src/Term/Rewriting/Definitions.hs | 23 ++++++---- - src/Term/Unification.hs | 4 +- - 11 files changed, 79 insertions(+), 48 deletions(-) - -diff --git a/src/Term/Maude/Signature.hs b/src/Term/Maude/Signature.hs -index 98c25d9f..1a4ce82f 100644 ---- a/src/Term/Maude/Signature.hs -+++ b/src/Term/Maude/Signature.hs -@@ -104,9 +104,9 @@ maudeSig msig@(MaudeSig {enableDH,enableBP,enableMSet,enableXor,enableDiff=_,stF - `S.union` dhReducibleFunSig `S.union` bpReducibleFunSig `S.union` xorReducibleFunSig - - -- | A monoid instance to combine maude signatures. --instance Monoid MaudeSig where -- (MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _) `mappend` -- (MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _) = -+instance Semigroup MaudeSig where -+ MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _ <> -+ MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _ = - maudeSig (mempty {enableDH=dh1||dh2 - ,enableBP=bp1||bp2 - ,enableMSet=mset1||mset2 -@@ -114,6 +114,8 @@ instance Monoid MaudeSig where - ,enableDiff=diff1||diff2 - ,stFunSyms=S.union stFunSyms1 stFunSyms2 - ,stRules=S.union stRules1 stRules2}) -+ -+instance Monoid MaudeSig where - mempty = MaudeSig False False False False False S.empty S.empty S.empty S.empty - - -- | Non-AC function symbols. -diff --git a/src/Term/Rewriting/Definitions.hs b/src/Term/Rewriting/Definitions.hs -index bd942b6a..18562e4e 100644 ---- a/src/Term/Rewriting/Definitions.hs -+++ b/src/Term/Rewriting/Definitions.hs -@@ -44,10 +44,12 @@ evalEqual (Equal l r) = l == r - instance Functor Equal where - fmap f (Equal lhs rhs) = Equal (f lhs) (f rhs) - -+instance Semigroup a => Semigroup (Equal a) where -+ (Equal l1 r1) <> (Equal l2 r2) = -+ Equal (l1 <> l2) (r1 <> r2) -+ - instance Monoid a => Monoid (Equal a) where - mempty = Equal mempty mempty -- (Equal l1 r1) `mappend` (Equal l2 r2) = -- Equal (l1 `mappend` l2) (r1 `mappend` r2) - - instance Foldable Equal where - foldMap f (Equal l r) = f l `mappend` f r -@@ -104,14 +106,15 @@ instance Functor Match where - fmap _ NoMatch = NoMatch - fmap f (DelayedMatches ms) = DelayedMatches (fmap (f *** f) ms) - -+instance Semigroup (Match a) where -+ NoMatch <> _ = NoMatch -+ _ <> NoMatch = NoMatch -+ DelayedMatches ms1 <> DelayedMatches ms2 = -+ DelayedMatches (ms1 <> ms2) -+ - instance Monoid (Match a) where - mempty = DelayedMatches [] - -- NoMatch `mappend` _ = NoMatch -- _ `mappend` NoMatch = NoMatch -- DelayedMatches ms1 `mappend` DelayedMatches ms2 = -- DelayedMatches (ms1 `mappend` ms2) -- - - instance Foldable Match where - foldMap _ NoMatch = mempty -@@ -136,10 +139,12 @@ data RRule a = RRule a a - instance Functor RRule where - fmap f (RRule lhs rhs) = RRule (f lhs) (f rhs) - -+instance Monoid a => Semigroup (RRule a) where -+ (RRule l1 r1) <> (RRule l2 r2) = -+ RRule (l1 <> l2) (r1 <> r2) -+ - instance Monoid a => Monoid (RRule a) where - mempty = RRule mempty mempty -- (RRule l1 r1) `mappend` (RRule l2 r2) = -- RRule (l1 `mappend` l2) (r1 `mappend` r2) - - instance Foldable RRule where - foldMap f (RRule l r) = f l `mappend` f r -diff --git a/src/Term/Unification.hs b/src/Term/Unification.hs -index e1de0163..7ce6bb41 100644 ---- a/src/Term/Unification.hs -+++ b/src/Term/Unification.hs -@@ -265,9 +265,11 @@ unifyRaw l0 r0 = do - - data MatchFailure = NoMatcher | ACProblem - -+instance Semigroup MatchFailure where -+ _ <> _ = NoMatcher -+ - instance Monoid MatchFailure where - mempty = NoMatcher -- mappend _ _ = NoMatcher - - -- | Ensure that the computed substitution @sigma@ satisfies - -- @t ==_AC apply sigma p@ after the delayed equations are solved. diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch deleted file mode 100644 index f7393e37f1b2..000000000000 --- a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch +++ /dev/null @@ -1,130 +0,0 @@ -From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonmars@archlinux.org> -Date: Fri, 18 May 2018 16:24:41 +0800 -Subject: [PATCH] GHC 8.4 support - ---- - src/Theory/Proof.hs | 43 +++++++++++-------- - 11 files changed, 79 insertions(+), 48 deletions(-) - -diff --git a/src/Theory/Constraint/Solver/Reduction.hs b/src/Theory/Constraint/Solver/Reduction.hs -index ddbc965a..6daadd0d 100644 ---- a/src/Theory/Constraint/Solver/Reduction.hs -+++ b/src/Theory/Constraint/Solver/Reduction.hs -@@ -139,13 +139,14 @@ execReduction m ctxt se fs = - data ChangeIndicator = Unchanged | Changed - deriving( Eq, Ord, Show ) - -+instance Semigroup ChangeIndicator where -+ Changed <> _ = Changed -+ _ <> Changed = Changed -+ Unchanged <> Unchanged = Unchanged -+ - instance Monoid ChangeIndicator where - mempty = Unchanged - -- Changed `mappend` _ = Changed -- _ `mappend` Changed = Changed -- Unchanged `mappend` Unchanged = Unchanged -- - -- | Return 'True' iff there was a change. - wasChanged :: ChangeIndicator -> Bool - wasChanged Changed = True -diff --git a/src/Theory/Constraint/System/Guarded.hs b/src/Theory/Constraint/System/Guarded.hs -index f98fc7c2..2aac8ce2 100644 ---- a/src/Theory/Constraint/System/Guarded.hs -+++ b/src/Theory/Constraint/System/Guarded.hs -@@ -435,7 +435,7 @@ gall ss atos gf = GGuarded All ss atos gf - - -- | Local newtype to avoid orphan instance. - newtype ErrorDoc d = ErrorDoc { unErrorDoc :: d } -- deriving( Monoid, NFData, Document, HighlightDocument ) -+ deriving( Monoid, Semigroup, NFData, Document, HighlightDocument ) - - -- | @formulaToGuarded fm@ returns a guarded formula @gf@ that is - -- equivalent to @fm@ under the assumption that this is possible. -diff --git a/src/Theory/Proof.hs b/src/Theory/Proof.hs -index 74fb77b1..7971b9fc 100644 ---- a/src/Theory/Proof.hs -+++ b/src/Theory/Proof.hs -@@ -388,17 +388,19 @@ data ProofStatus = - | TraceFound -- ^ There is an annotated solved step - deriving ( Show, Generic, NFData, Binary ) - -+instance Semigroup ProofStatus where -+ TraceFound <> _ = TraceFound -+ _ <> TraceFound = TraceFound -+ IncompleteProof <> _ = IncompleteProof -+ _ <> IncompleteProof = IncompleteProof -+ _ <> CompleteProof = CompleteProof -+ CompleteProof <> _ = CompleteProof -+ UndeterminedProof <> UndeterminedProof = UndeterminedProof -+ -+ - instance Monoid ProofStatus where - mempty = CompleteProof - -- mappend TraceFound _ = TraceFound -- mappend _ TraceFound = TraceFound -- mappend IncompleteProof _ = IncompleteProof -- mappend _ IncompleteProof = IncompleteProof -- mappend _ CompleteProof = CompleteProof -- mappend CompleteProof _ = CompleteProof -- mappend UndeterminedProof UndeterminedProof = UndeterminedProof -- - -- | The status of a 'ProofStep'. - proofStepStatus :: ProofStep (Maybe a) -> ProofStatus - proofStepStatus (ProofStep _ Nothing ) = UndeterminedProof -@@ -560,10 +562,12 @@ newtype Prover = Prover - -> Maybe IncrementalProof -- resulting proof - } - -+instance Semigroup Prover where -+ p1 <> p2 = Prover $ \ctxt d se -> -+ runProver p1 ctxt d se >=> runProver p2 ctxt d se -+ - instance Monoid Prover where - mempty = Prover $ \_ _ _ -> Just -- p1 `mappend` p2 = Prover $ \ctxt d se -> -- runProver p1 ctxt d se >=> runProver p2 ctxt d se - - -- | Provers whose sequencing is handled via the 'Monoid' instance. - -- -@@ -579,10 +583,12 @@ newtype DiffProver = DiffProver - -> Maybe IncrementalDiffProof -- resulting proof - } - -+instance Semigroup DiffProver where -+ p1 <> p2 = DiffProver $ \ctxt d se -> -+ runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se -+ - instance Monoid DiffProver where - mempty = DiffProver $ \_ _ _ -> Just -- p1 `mappend` p2 = DiffProver $ \ctxt d se -> -- runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se - - -- | Map the proof generated by the prover. - mapProverProof :: (IncrementalProof -> IncrementalProof) -> Prover -> Prover -@@ -784,15 +790,16 @@ runAutoDiffProver (AutoProver heuristic bound cut) = - -- | The result of one pass of iterative deepening. - data IterDeepRes = NoSolution | MaybeNoSolution | Solution ProofPath - -+instance Semigroup IterDeepRes where -+ x@(Solution _) <> _ = x -+ _ <> y@(Solution _) = y -+ MaybeNoSolution <> _ = MaybeNoSolution -+ _ <> MaybeNoSolution = MaybeNoSolution -+ NoSolution <> NoSolution = NoSolution -+ - instance Monoid IterDeepRes where - mempty = NoSolution - -- x@(Solution _) `mappend` _ = x -- _ `mappend` y@(Solution _) = y -- MaybeNoSolution `mappend` _ = MaybeNoSolution -- _ `mappend` MaybeNoSolution = MaybeNoSolution -- NoSolution `mappend` NoSolution = NoSolution -- - -- | @cutOnSolvedDFS prf@ removes all other cases if an attack is found. The - -- attack search is performed using a parallel DFS traversal with iterative - -- deepening. diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch deleted file mode 100644 index d6cd6d73f99e..000000000000 --- a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch +++ /dev/null @@ -1,140 +0,0 @@ -From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonmars@archlinux.org> -Date: Fri, 18 May 2018 16:24:41 +0800 -Subject: [PATCH] GHC 8.4 support - ---- - src/Extension/Data/Bounded.hs | 10 ++++- - src/Extension/Data/Monoid.hs | 14 +++--- - src/Logic/Connectives.hs | 4 +- - src/Text/PrettyPrint/Class.hs | 4 +- - src/Text/PrettyPrint/Html.hs | 6 ++- - 11 files changed, 79 insertions(+), 48 deletions(-) - - -diff --git a/src/Extension/Data/Bounded.hs b/src/Extension/Data/Bounded.hs -index 5f166006..f416a44c 100644 ---- a/src/Extension/Data/Bounded.hs -+++ b/src/Extension/Data/Bounded.hs -@@ -11,19 +11,25 @@ module Extension.Data.Bounded ( - ) where - - -- import Data.Monoid -+import Data.Semigroup - - -- | A newtype wrapper for a monoid of the maximum of a bounded type. - newtype BoundedMax a = BoundedMax {getBoundedMax :: a} - deriving( Eq, Ord, Show ) - -+instance (Ord a, Bounded a) => Semigroup (BoundedMax a) where -+ BoundedMax x <> BoundedMax y = BoundedMax (max x y) -+ - instance (Ord a, Bounded a) => Monoid (BoundedMax a) where - mempty = BoundedMax minBound -- (BoundedMax x) `mappend` (BoundedMax y) = BoundedMax (max x y) -+ mappend = (<>) - - -- | A newtype wrapper for a monoid of the minimum of a bounded type. - newtype BoundedMin a = BoundedMin {getBoundedMin :: a} - deriving( Eq, Ord, Show ) - -+instance (Ord a, Bounded a) => Semigroup (BoundedMin a) where -+ BoundedMin x <> BoundedMin y = BoundedMin (min x y) -+ - instance (Ord a, Bounded a) => Monoid (BoundedMin a) where - mempty = BoundedMin maxBound -- (BoundedMin x) `mappend` (BoundedMin y) = BoundedMin (min x y) -\ No newline at end of file -diff --git a/src/Extension/Data/Monoid.hs b/src/Extension/Data/Monoid.hs -index 83655c34..9ce2f91b 100644 ---- a/src/Extension/Data/Monoid.hs -+++ b/src/Extension/Data/Monoid.hs -@@ -18,6 +18,7 @@ module Extension.Data.Monoid ( - ) where - - import Data.Monoid -+import Data.Semigroup - - #if __GLASGOW_HASKELL__ < 704 - -@@ -38,10 +39,13 @@ newtype MinMax a = MinMax { getMinMax :: Maybe (a, a) } - minMaxSingleton :: a -> MinMax a - minMaxSingleton x = MinMax (Just (x, x)) - -+instance Ord a => Semigroup (MinMax a) where -+ MinMax Nothing <> y = y -+ x <> MinMax Nothing = x -+ MinMax (Just (xMin, xMax)) <> MinMax (Just (yMin, yMax)) = -+ MinMax (Just (min xMin yMin, max xMax yMax)) -+ -+ - instance Ord a => Monoid (MinMax a) where - mempty = MinMax Nothing -- -- MinMax Nothing `mappend` y = y -- x `mappend` MinMax Nothing = x -- MinMax (Just (xMin, xMax)) `mappend` MinMax (Just (yMin, yMax)) = -- MinMax (Just (min xMin yMin, max xMax yMax)) -+ mappend = (<>) -diff --git a/src/Logic/Connectives.hs b/src/Logic/Connectives.hs -index 2e441172..7206cc2c 100644 ---- a/src/Logic/Connectives.hs -+++ b/src/Logic/Connectives.hs -@@ -23,12 +23,12 @@ import Control.DeepSeq - - -- | A conjunction of atoms of type a. - newtype Conj a = Conj { getConj :: [a] } -- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary, -+ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary, - Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData) - - -- | A disjunction of atoms of type a. - newtype Disj a = Disj { getDisj :: [a] } -- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary, -+ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary, - Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData) - - instance MonadDisj Disj where -diff --git a/src/Text/PrettyPrint/Class.hs b/src/Text/PrettyPrint/Class.hs -index f5eb42fe..13be6515 100644 ---- a/src/Text/PrettyPrint/Class.hs -+++ b/src/Text/PrettyPrint/Class.hs -@@ -187,9 +187,11 @@ instance Document Doc where - nest i (Doc d) = Doc $ P.nest i d - caseEmptyDoc yes no (Doc d) = if P.isEmpty d then yes else no - -+instance Semigroup Doc where -+ Doc d1 <> Doc d2 = Doc $ (P.<>) d1 d2 -+ - instance Monoid Doc where - mempty = Doc $ P.empty -- mappend (Doc d1) (Doc d2) = Doc $ (P.<>) d1 d2 - - ------------------------------------------------------------------------------ - -- Additional combinators -diff --git a/src/Text/PrettyPrint/Html.hs b/src/Text/PrettyPrint/Html.hs -index 3de5e307..10103eb7 100644 ---- a/src/Text/PrettyPrint/Html.hs -+++ b/src/Text/PrettyPrint/Html.hs -@@ -90,7 +90,7 @@ attribute (key,value) = " " ++ key ++ "=\"" ++ escapeHtmlEntities value ++ "\"" - - -- | A 'Document' transformer that adds proper HTML escaping. - newtype HtmlDoc d = HtmlDoc { getHtmlDoc :: d } -- deriving( Monoid ) -+ deriving( Monoid, Semigroup ) - - -- | Wrap a document such that HTML markup can be added without disturbing the - -- layout. -@@ -182,9 +182,11 @@ getNoHtmlDoc = runIdentity . unNoHtmlDoc - instance NFData d => NFData (NoHtmlDoc d) where - rnf = rnf . getNoHtmlDoc - -+instance Semigroup d => Semigroup (NoHtmlDoc d) where -+ (<>) = liftA2 (<>) -+ - instance Monoid d => Monoid (NoHtmlDoc d) where - mempty = pure mempty -- mappend = liftA2 mappend - - instance Document d => Document (NoHtmlDoc d) where - char = pure . char diff --git a/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch b/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch new file mode 100644 index 000000000000..6ab7e4e7594f --- /dev/null +++ b/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch @@ -0,0 +1,77 @@ +diff --git a/plugins/sapic/Makefile b/plugins/sapic/Makefile +index 8f1b1866..678accbe 100644 +--- a/plugins/sapic/Makefile ++++ b/plugins/sapic/Makefile +@@ -1,18 +1,18 @@ + TARGET = sapic +-OBJS= color.cmo exceptions.cmo btree.cmo position.cmo positionplusinit.cmo var.cmo term.cmo fact.cmo atomformulaaction.cmo action.cmo atom.cmo formula.cmo tamarin.cmo sapicterm.cmo sapicvar.cmo sapicaction.cmo lexer.cmo sapic.cmo annotatedsapicaction.cmo annotatedsapictree.cmo progressfunction.cmo restrictions.cmo annotatedrule.cmo translationhelper.cmo basetranslation.cmo firsttranslation.cmo main.cmo ++OBJS= color.cmx exceptions.cmx btree.cmx position.cmx positionplusinit.cmx var.cmx term.cmx fact.cmx atomformulaaction.cmx action.cmx atom.cmx formula.cmx tamarin.cmx sapicterm.cmx sapicvar.cmx sapicaction.cmx lexer.cmx sapic.cmx annotatedsapicaction.cmx annotatedsapictree.cmx progressfunction.cmx restrictions.cmx annotatedrule.cmx translationhelper.cmx basetranslation.cmx firsttranslation.cmx main.cmx + FLAGS=-g + +-OCAMLC := $(shell command -v ocamlc 2> /dev/null) ++OCAMLOPT := $(shell command -v ocamlopt 2> /dev/null) + OCAMLLEX := $(shell command -v ocamllex 2> /dev/null) + OCAMLYACC := $(shell command -v ocamlyacc 2> /dev/null) + OCAMLDEP := $(shell command -v ocamldep 2> /dev/null) +-OCAMLC_GTEQ_402 := $(shell expr `ocamlc -version | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40200) ++OCAMLC_GTEQ_402 := $(shell expr `ocamlopt -version | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40200) + + default: sapic + + sapic: +-ifdef OCAMLC +- @echo "Found ocamlc." ++ifdef OCAMLOPT ++ @echo "Found ocamlopt." + ifdef OCAMLLEX + @echo "Found ocamllex." + ifdef OCAMLYACC +@@ -22,9 +22,9 @@ ifdef OCAMLDEP + ifeq "$(OCAMLC_GTEQ_402)" "1" + @echo "Building SAPIC." + $(MAKE) $(OBJS) +- ocamlc $(FLAGS) -o $@ str.cma $(OBJS) +- @echo "Installing SAPIC into ~/.local/bin/" +- cp sapic ~/.local/bin ++ ocamlopt $(FLAGS) -o $@ str.cmxa $(OBJS) ++# @echo "Installing SAPIC into ~/.local/bin/" ++# cp sapic ~/.local/bin + else + @echo "Found OCAML version < 4.02. SAPIC will not be installed." + endif +@@ -38,7 +38,7 @@ else + @echo "ocamllex not found. SAPIC will not be installed." + endif + else +- @echo "ocamlc not found. SAPIC will not be installed." ++ @echo "ocamlopt not found. SAPIC will not be installed." + endif + + depend: +@@ -48,20 +48,20 @@ lexer.ml: sapic.cmi + + .PHONY: clean + clean: +- rm -rf *.cmi *.cmo $(TARGET) ++ rm -rf *.cmi **.cmx $(TARGET) + rm -rf sapic.ml sapic.mli lexer.ml lexer.mli + +-.SUFFIXES: .ml .mli .mll .mly .cmo .cmi ++.SUFFIXES: .ml .mli .mll .mly .cmx .cmi + +-.ml.cmo: +- ocamlc $(FLAGS) -c $< ++.ml.cmx: ++ ocamlopt $(FLAGS) -c $< + .mli.cmi: +- ocamlc $(FLAGS) -c $< ++ ocamlopt $(FLAGS) -c $< + .mll.ml: + ocamllex $< + .mly.ml: + ocamlyacc $< + .ml.mli: +- ocamlc -i $< > $@ ++ ocamlopt -i $< > $@ + + -include .depend diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix new file mode 100644 index 000000000000..34449542abb2 --- /dev/null +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -0,0 +1,31 @@ +{stdenv, z3, cmake}: +stdenv.mkDerivation rec { + pname = "z3-tptp"; + version = z3.version; + + src = z3.src; + + sourceRoot = "source/examples/tptp"; + + nativeBuildInputs = [cmake]; + buildInputs = [z3]; + + preConfigure = '' + echo 'set(Z3_LIBRARIES "-lz3")' >> CMakeLists.new + cat CMakeLists.txt | grep -E 'add_executable|project|link_libraries' >> CMakeLists.new + mv CMakeLists.new CMakeLists.txt + ''; + + installPhase = '' + mkdir -p "$out/bin" + cp "z3_tptp5" "$out/bin/" + ln -s "z3_tptp5" "$out/bin/z3-tptp" + ''; + + meta = { + inherit version; + inherit (z3.meta) license homepage platforms; + description = ''TPTP wrapper for Z3 prover''; + maintainers = [stdenv.lib.maintainers.raskin]; + }; +} diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 2158021c7548..065360a112d8 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -5,10 +5,10 @@ with lib; l10ns = flip map [ { - version = "11.2.0"; + version = "11.3.0"; lang = "en"; language = "English"; - sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9"; + sha256 = "0fcfe208c1eac8448e7be3af0bdb84370b17bd9c5d066c013928c8ee95aed10e"; } { version = "11.2.0"; diff --git a/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch b/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch new file mode 100644 index 000000000000..6056416c3a28 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch @@ -0,0 +1,19 @@ +diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py +index 02e18e67e7..2ebf6eb35f 100644 +--- a/src/sage/doctest/forker.py ++++ b/src/sage/doctest/forker.py +@@ -1075,6 +1075,14 @@ class SageDocTestRunner(doctest.DocTestRunner, object): + sage: set(ex2.predecessors) == set([ex0,ex1]) + True + """ ++ ++ # Fix ECL dir race conditions by using a separate dir for each process ++ # (https://trac.sagemath.org/ticket/26968) ++ os.environ['MAXIMA_USERDIR'] = "{}/sage-maxima-{}".format( ++ tempfile.gettempdir(), ++ os.getpid() ++ ) ++ + if isinstance(globs, RecordingDict): + globs.start() + example.sequence_number = len(self.history) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index c4760764a437..5bdd53b37e4f 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation rec { # tests) are also run. That is necessary to test dochtml individually. See # https://trac.sagemath.org/ticket/26110 for an upstream discussion. ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch + + # Fixes a potential race condition which can lead to transient doctest failures. + ./patches/fix-ecl-race.patch ]; # Patches needed because of package updates. We could just pin the versions of diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 833370f81443..ae5307f155bd 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { }; patches = [ - ./calling_convention.patch + ./undefined_behavior.patch ]; + CXXFLAGS = "-Werror=return-type"; + preConfigure = # Fix F77LD to workaround for a following build error: # diff --git a/pkgs/applications/science/physics/xfitter/calling_convention.patch b/pkgs/applications/science/physics/xfitter/undefined_behavior.patch index 5b216b6e0928..53278527a807 100644 --- a/pkgs/applications/science/physics/xfitter/calling_convention.patch +++ b/pkgs/applications/science/physics/xfitter/undefined_behavior.patch @@ -1,5 +1,4 @@ diff --git a/DY/src/finterface.cc b/DY/src/finterface.cc -index 0405786..eb171d0 100644 --- a/DY/src/finterface.cc +++ b/DY/src/finterface.cc @@ -14,17 +14,17 @@ @@ -18,8 +17,9 @@ index 0405786..eb171d0 100644 - int dy_get_res_(const int *ds_id, double *calc_res); + void dy_get_res_(const int *ds_id, double *calc_res); - int dy_release_(); +- int dy_release_(); - int dy_set_ewpars_(); ++ void dy_release_(); + void dy_set_ewpars_(); } @@ -48,7 +48,7 @@ index 0405786..eb171d0 100644 { // evolve convolutions vector<PDFconv*>::iterator ipc = gPDFconvs.begin(); -@@ -118,24 +116,20 @@ int dy_do_calc_() +@@ -118,28 +116,24 @@ int dy_do_calc_() if ( true != idc->second->Integrate() ) { cout << "Something is wrong with DY integration for " << idc->first << " data set." << endl; @@ -76,6 +76,11 @@ index 0405786..eb171d0 100644 PhysPar::setPhysPar(); } +-int dy_release_() ++void dy_release_() + { + vector<PDFconv*>::iterator ipc = gPDFconvs.begin(); + for (; ipc!=gPDFconvs.end(); ipc++){ @@ -155,6 +149,4 @@ int dy_release_() for (; idc != gCalcs.end() ; idc++){ delete (idc->second); @@ -83,8 +88,18 @@ index 0405786..eb171d0 100644 - - return 1; } +diff --git a/DiffDIS/include/DataTable.h b/DiffDIS/include/DataTable.h +--- a/DiffDIS/include/DataTable.h ++++ b/DiffDIS/include/DataTable.h +@@ -307,6 +307,7 @@ class DataTable_t { + for(ic=0; ic < GetNcols(); ic++) { + for(ir=0; ir < npt; ir++) Data[ic][ir] = A.Data[ic][ir]; + } ++ return *this; + } + + //@} diff --git a/FastNLO/src/FastNLOInterface.cc b/FastNLO/src/FastNLOInterface.cc -index 20f8a75..a6dac79 100644 --- a/FastNLO/src/FastNLOInterface.cc +++ b/FastNLO/src/FastNLOInterface.cc @@ -39,14 +39,14 @@ void gauleg(double x1,double x2,double *x,double *w, int n); @@ -197,7 +212,6 @@ index 20f8a75..a6dac79 100644 int CreateUsedPointsArray(int idataset, int npoints) { diff --git a/Hathor/src/HathorInterface.cc b/Hathor/src/HathorInterface.cc -index 7da88b1..96576a3 100644 --- a/Hathor/src/HathorInterface.cc +++ b/Hathor/src/HathorInterface.cc @@ -6,9 +6,9 @@ @@ -239,8 +253,82 @@ index 7da88b1..96576a3 100644 rlxd_reset(rndStore); std::map<int, Hathor*>::const_iterator hathorIter = hathor_array.find(*idataset); +diff --git a/src/TheorEval.cc b/src/TheorEval.cc +--- a/src/TheorEval.cc ++++ b/src/TheorEval.cc +@@ -62,6 +62,7 @@ TheorEval::initTheory() + list<tToken> sl; + this->assignTokens(sl); + this->convertToRPN(sl); ++ return 0; + } + + int +@@ -167,6 +168,7 @@ TheorEval::assignTokens(list<tToken> &sl) + sl.push_back(t); + } + } ++ return 0; + } + + int +@@ -217,6 +219,7 @@ TheorEval::convertToRPN(list<tToken> &sl) + cout << endl; + */ + ++ return 0; + } + + int +@@ -236,6 +239,7 @@ TheorEval::initTerm(int iterm, valarray<double> *val) + hf_errlog_(id, text, textlen); + return -1; + } ++ return 0; + } + + int +@@ -348,6 +352,7 @@ TheorEval::initGridTerm(int iterm, valarray<double> *val) + + // associate grid and valarray pointers in token + _mapGridToken[g] = val; ++ return 0; + } + + int +@@ -430,6 +435,7 @@ TheorEval::initKfTerm(int iterm, valarray<double> *val) + + // write k-factor array to the token valarray + *val = valarray<double>(vkf.data(), vkf.size()); ++ return 0; + } + + int +@@ -465,6 +471,7 @@ TheorEval::setCKM(const vector<double> &v_ckm) + int textlen = strlen(text); + hf_errlog_(id, text, textlen); + #endif ++ return 0; + } + + int +@@ -531,6 +538,7 @@ TheorEval::Evaluate(valarray<double> &vte ) + } + //vte /= _units; + } ++ return 0; + } + + int +@@ -555,6 +563,7 @@ TheorEval::getGridValues() + + + } ++ return 0; + } + + int diff --git a/src/ftheor_eval.cc b/src/ftheor_eval.cc -index 1dd4e8b..8bc7991 100644 --- a/src/ftheor_eval.cc +++ b/src/ftheor_eval.cc @@ -19,15 +19,15 @@ @@ -341,7 +429,6 @@ index 1dd4e8b..8bc7991 100644 tTEmap::iterator it = gTEmap.begin(); for (; it!= gTEmap.end(); it++){ diff --git a/src/lhapdf6_output.c b/src/lhapdf6_output.c -index 4b20b68..549c521 100644 --- a/src/lhapdf6_output.c +++ b/src/lhapdf6_output.c @@ -64,7 +64,7 @@ extern double bvalij_(int *,int *,int *,int *,int *); @@ -353,3 +440,15 @@ index 4b20b68..549c521 100644 extern int getcbt_(int *, double *, double *, double *); extern void getpdfunctype_heraf_(int *mc, int *asymh, int *symh, char *name, size_t size); extern void hf_errlog_(int *, char *, size_t); +diff --git a/tools/draw/include/FileOpener.h b/tools/draw/include/FileOpener.h +--- a/tools/draw/include/FileOpener.h ++++ b/tools/draw/include/FileOpener.h +@@ -61,7 +61,7 @@ class InFileOpener_t { + string GetPath() const {return ind < 0 ? "" : Flist[ind];} + + // ================================== +- int Add(const string& fname) { ++ void Add(const string& fname) { + Flist.push_back(fname); + } + diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 11fa892f135d..b629c8fe9109 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python ]; - # TODO: Cleanup patchPhase = '' - CA_PATH="$(echo '${cacert}/etc/ssl/certs/ca-bundle.crt' | sed 's/\//\\\//g')" # / -> \/ - sed -i -E 's/urlopen\(url\)/urlopen(url, cafile="'$CA_PATH'")/' repo + substituteInPlace repo --replace \ + 'urllib.request.urlopen(url)' \ + 'urllib.request.urlopen(url, cafile="${cacert}/etc/ssl/certs/ca-bundle.crt")' ''; installPhase = '' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index f5e586ec2ba1..689cf8d8de91 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "09h8nbzsxm34rlfnvbsf4cs02igids806927xpxf7g563cdapcnl"; + sha256 = "1mbr7pnzn8x05wc288855vqaf86qk2f1py5zh8s63l048bn0fld6"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index dfc2484b1a51..664ef62be549 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.1.1"; + version = "4.2.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "188k6vaafv6szzhslsfabnnn68ispsv54d98rcm3m0bmp8kg5p7f"; + sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 93a8d2070542..34efffc21d72 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchurl, jre, unzip }: +{ stdenv, fetchurl, makeWrapper, jre }: -stdenv.mkDerivation { - name = "mediathekview-9"; +stdenv.mkDerivation rec { + version = "13.2.1"; + name = "mediathekview-${version}"; src = fetchurl { - url = "mirror://sourceforge/zdfmediathk/MediathekView_9.zip"; - sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4"; + url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz"; + sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a"; }; - unpackPhase = "true"; - buildInputs = [ unzip ]; - - # Could use some more love - # Maybe we can also preconfigure locations for vlc and the others. + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - mkdir -p $out/bin - mkdir -p $out/opt/mediathekview - cd $out/opt/mediathekview - unzip $src - find . -iname '*.exe' -delete - sed -i -e 's, java, ${jre}/bin/java,' MediathekView__Linux.sh - ln -s $out/opt/mediathekview/MediathekView__Linux.sh $out/bin/mediathekview - ''; + mkdir -p $out/{lib,bin,share/mediathekview} + + install -m644 MediathekView.jar $out/ + install -m644 -t $out/lib lib/* + install -m755 bin/flv.sh $out/share/mediathekview + + makeWrapper ${jre}/bin/java $out/bin/mediathek \ + --add-flags "-cp '$out/lib/*' -jar $out/MediathekView.jar" + ''; meta = with stdenv.lib; { - homepage = http://zdfmediathk.sourceforge.net/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ maintainers.chaoflow ]; - platforms = platforms.linux; # also macOS and cygwin, but not investigated, yet + description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; + homepage = https://mediathekview.de/; + license = licenses.gpl3; + maintainers = with maintainers; [ chaoflow moredread ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 62a517e80ea6..4e4c623ca607 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 -, freefont_ttf, freetype, libass, libpthreadstubs +, freefont_ttf, freetype, libass, libpthreadstubs, mujs , lua, luasocket, libuchardet, libiconv ? null, darwin , waylandSupport ? false @@ -19,6 +19,11 @@ , libcdio ? null , libcdio-paranoia ? null +, vulkanSupport ? stdenv.isLinux + , shaderc ? null + , vulkan-headers ? null + , vulkan-loader ? null + , alsaSupport ? true, alsaLib ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null @@ -134,7 +139,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - lua luasocket libuchardet + lua luasocket libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray @@ -163,6 +168,7 @@ in stdenv.mkDerivation rec { ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] + ++ optionals vulkanSupport [ shaderc vulkan-headers vulkan-loader ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Cocoa CoreAudio ]); @@ -176,7 +182,7 @@ in stdenv.mkDerivation rec { ''; # Ensure youtube-dl is available in $PATH for mpv - wrapperFlags = + wrapperFlags = let getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix deleted file mode 100644 index a875daf065e9..000000000000 --- a/pkgs/applications/video/zdfmediathk/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, jre }: - -with stdenv; - -mkDerivation rec { - - version = "10"; - name = "zdfmediathk-${version}"; - src = fetchurl { - url = "https://github.com/xaverW/MediathekView/archive/Version${version}.tar.gz"; - sha256 = "12iyigqjslbn8rzym1mq1s0mvss7r97aiy6wfdrq5m0psarlcljw"; - }; - - installPhase = '' - mkdir -p $out/{lib,bin,share/{doc,licenses}} - cd dist/ - install -m644 MediathekView.jar $out/ - install -m644 -t $out/lib lib/* - install -m755 bin/flv.sh $out/bin/ - install -m644 -t $out/share/doc Anleitung/*.pdf - install -m644 -t $out/share/licenses Copyright/{*.*,_copyright} - bin="$out/bin/mediathek" - cat >> "$bin" << EOF - #!/bin/sh - exec ${jre}/bin/java -cp "$out/lib/*" -Xms128M -Xmx1G -jar "$out/MediathekView.jar" "\$@" - EOF - chmod +x "$bin" - ''; - - meta = with stdenv.lib; { - description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; - homepage = https://github.com/xaverW/MediathekView/; - license = licenses.gpl3; - maintainers = [ maintainers.flosse ]; - platforms = platforms.all; - }; - -} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 28c43debcabe..f616ca429830 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -199,13 +199,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = dockerGen rec { - version = "18.09.0"; - rev = "4d60db472b2bde6931072ca6467f2667c2590dff"; # git commit - sha256 = "0py944f5k71c1cf6ci96vnqk43d5979w7r82cngaxk1g6za6k5yj"; - runcRev = "69663f0bd4b60df09991c08812a60108003fa340"; - runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq"; - containerdRev = "468a545b9edcd5932818eb9de8e72413e616e86e"; - containerdSha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v"; + version = "18.09.1"; + rev = "4c52b901c6cb019f7552cd93055f9688c6538be4"; # git commit + sha256 = "0q2789afx07pkisgp9iqrbac5k7xca54w1an4mf5mw34xn8yc4xc"; + runcRev = "96ec2177ae841256168fcf76954f7177af9446eb"; + runcSha256 = "1qr9msx6vs37jr0rk3r8x2q51fsk50c78a3999kd0snjy9bxmfhd"; + containerdRev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce"; + containerdSha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 8b590cff9640..4499fff4dc8b 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "1jrwvrpl61rqbjjphv8v7ryhdwfjrpps76dbvkpl43hpn5hqqis2"; + sha256 = "0x63m37vjyp57900x09gfvw02cwg85b33918x7fjj9x37wgmi5qf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix new file mode 100644 index 000000000000..42907bc84ba8 --- /dev/null +++ b/pkgs/applications/virtualization/podman/conmon.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, glib }: + +with lib; + +stdenv.mkDerivation rec { + name = "conmon-${version}"; + version = "unstable-2018-11-28"; + rev = "8fba206232c249a8fc4e2fac1469fb2fddbf5cf7"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "conmon"; + sha256 = "07ar0dk9i072b14f6il51yqahxp5c4fkf5jzar8rxcpvymkdy8zq"; + inherit rev; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + glib + ]; + + installPhase = '' + install -D -m 555 bin/conmon $out/bin/conmon + ''; + + meta = { + homepage = https://github.com/containers/conmon; + description = "An OCI container runtime monitor"; + license = licenses.asl20; + maintainers = with maintainers; [ vdemeester ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix new file mode 100644 index 000000000000..753fada5e7d3 --- /dev/null +++ b/pkgs/applications/virtualization/podman/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp +}: + +buildGoPackage rec { + name = "podman-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "libpod"; + rev = "v${version}"; + sha256 = "1py6vbmpm25j1gb51dn973pckvgjl9q63y9qyzszvc3q3wsxsqhw"; + }; + + goPackagePath = "github.com/containers/libpod"; + + # Optimizations break compilation of libseccomp c bindings + hardeningDisable = [ "fortify" ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + btrfs-progs libseccomp gpgme lvm2 + ]; + + buildPhase = '' + pushd $NIX_BUILD_TOP/go/src/${goPackagePath} + patchShebangs . + make binaries + ''; + + installPhase = '' + install -Dm555 bin/podman $bin/bin/podman + ''; + + meta = with stdenv.lib; { + homepage = https://podman.io/; + description = "A program for managing pods, containers and container images"; + license = licenses.asl20; + maintainers = with maintainers; [ vdemeester ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 6743c8491891..8777f7cc2db2 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0dajc9fg57gj915h5dxavbia4wx10frn4xc61pv0l8r5zp7xvqal"; + sha256 = "1bbdnf13vp35ddfmk4pn167vfxgmdw0fd8bqg51wd8dd4cj8y3wp"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index cbdecb322882..746c45beccfa 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + # Required for USB redirection PolicyKit rules file + propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index e28a9cf75be8..a0e46c108b7d 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,31 +3,32 @@ }: stdenv.mkDerivation rec { - rev = "3734fba160166006521e513f5734eb76ac6aa48f"; - name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}"; + rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; + name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl"; + sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; }; patchPhase = '' - sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock - sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock - sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock - sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock - sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock - sed -i -e "s| awk | ${gawk}/bin/awk |" lock - sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" lock - sed -i -e 's|icon="$scriptpath/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock - sed -i -e 's|icon="$scriptpath/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' lock - sed -i -e "s|getopt |${getopt}/bin/getopt |" lock - sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock - sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" lock + sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy + sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy + sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy + sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy + sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy + sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy + sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy + sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy + sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy + sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" i3lock-fancy + rm Makefile ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons - cp lock $out/bin/i3lock-fancy + cp i3lock-fancy $out/bin/i3lock-fancy cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b3a4b774b121..83ff846db7ab 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -544,14 +544,19 @@ rec { buildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; - imageTag = if tag == null then "" else lib.toLower tag; baseJson = configJson; + passthru.imageTag = + if tag == null + then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result))) + else lib.toLower tag; } '' - ${lib.optionalString (tag == null) '' + ${if (tag == null) then '' outName="$(basename "$out")" outHash=$(echo "$outName" | cut -d - -f 1) imageTag=$outHash + '' else '' + imageTag="${tag}" ''} find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 9fccc27ef632..256c86748d28 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -19,6 +19,7 @@ in , # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. postFetch ? "" +, preferLocalBuild ? true }: /* NOTE: @@ -66,5 +67,5 @@ stdenvNoCC.mkDerivation { "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; - preferLocalBuild = true; + inherit preferLocalBuild; } diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 40ead021cdbf..41eff1f9c0c5 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,11 @@ -{stdenvNoCC, mercurial}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: +{ stdenvNoCC, mercurial }: +{ name ? null +, url +, rev ? null +, md5 ? null +, sha256 ? null +, fetchSubrepos ? false +, preferLocalBuild ? true }: if md5 != null then throw "fetchhg does not support md5 anymore, please use sha256" @@ -18,5 +25,5 @@ stdenvNoCC.mkDerivation { outputHash = sha256; inherit url rev; - preferLocalBuild = true; + inherit preferLocalBuild; } diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index dc8949794221..7a66999ec569 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -14,6 +14,7 @@ , meta ? {} , port ? "8080" , postFetch ? "" +, preferLocalBuild ? true }: assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; @@ -42,11 +43,10 @@ if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" els postFetch ipfs url - port; + port + meta; # Doing the download on a remote machine just duplicates network # traffic, so don't do that. - preferLocalBuild = true; - - inherit meta; + inherit preferLocalBuild; } diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index da57d581dadd..194ce3b39b1d 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,6 +1,7 @@ {stdenvNoCC, subversion, glibcLocales, sshSupport ? false, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", - ignoreExternals ? false, ignoreKeywords ? false, name ? null}: +{url, rev ? "HEAD", md5 ? "", sha256 ? "" +, ignoreExternals ? false, ignoreKeywords ? false, name ? null +, preferLocalBuild ? true }: let repoName = with stdenvNoCC.lib; @@ -40,5 +41,5 @@ stdenvNoCC.mkDerivation { inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; - preferLocalBuild = true; + inherit preferLocalBuild; } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 5f0c1384c79e..3ce90cbeab3a 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -87,6 +87,9 @@ in # Passthru information, if any. , passthru ? {} + # Doing the download on a remote machine just duplicates network + # traffic, so don't do that by default +, preferLocalBuild ? true }: assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; @@ -135,9 +138,7 @@ stdenvNoCC.mkDerivation { nixpkgsVersion = lib.trivial.release; - # Doing the download on a remote machine just duplicates network - # traffic, so don't do that. - preferLocalBuild = true; + inherit preferLocalBuild; postHook = if netrcPhase == null then null else '' ${netrcPhase} diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/pkgs/build-support/prefer-remote-fetch/default.nix new file mode 100644 index 000000000000..2e55e3707421 --- /dev/null +++ b/pkgs/build-support/prefer-remote-fetch/default.nix @@ -0,0 +1,19 @@ +# An overlay that download sources on remote builder. +# This is useful when the evaluating machine has a slow +# upload while the builder can fetch faster directly from the source. +# Usage: Put the following snippet in your usual overlay definition: +# +# self: super: +# (super.prefer-remote-fetch self super) +# Full configuration example for your own account: +# +# $ mkdir ~/.config/nixpkgs/overlays/ +# $ echo 'self: super: super.prefer-remote-fetch self super' > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix +# +self: super: { + fetchurl = args: super.fetchurl (args // { preferLocalBuild = false; }); + fetchgit = args: super.fetchgit (args // { preferLocalBuild = false; }); + fetchhg = args: super.fetchhg (args // { preferLocalBuild = false; }); + fetchsvn = args: super.fetchsvn (args // { preferLocalBuild = false; }); + fetchipfs = args: super.fetchipfs (args // { preferLocalBuild = false; }); +} diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix new file mode 100644 index 000000000000..6aabf4f485da --- /dev/null +++ b/pkgs/data/fonts/agave/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "agave-${version}"; + version = "008"; + + src = fetchurl { + url = "https://github.com/agarick/agave/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0g50mqpffn4dq761vibaf8dwfkbcl5da1cc89qz6pq35ircipbns"; + }; + + sourceRoot = "."; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "truetype monospaced typeface designed for X environments"; + homepage = https://b.agaric.net/page/agave; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix new file mode 100644 index 000000000000..08a46628e65e --- /dev/null +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip }: + +let version = "1.100"; in +fetchzip rec { + name = "ankacoder-condensed-${version}"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; + + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + sha256 = "0i80zpr2y9368rg2i6x8jv0g7d03kdyr5h7w9yz7pjd7i9xd8439"; + + meta = with stdenv.lib; { + description = "Anka/Coder Condensed font"; + homepage = https://code.google.com/archive/p/anka-coder-fonts; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix new file mode 100644 index 000000000000..32270607028c --- /dev/null +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip }: + +let version = "1.100"; in +fetchzip rec { + name = "ankacoder-${version}"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; + + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85"; + + meta = with stdenv.lib; { + description = "Anka/Coder fonts"; + homepage = https://code.google.com/archive/p/anka-coder-fonts; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix new file mode 100644 index 000000000000..b7b79f2e2ca1 --- /dev/null +++ b/pkgs/data/fonts/b612/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchzip, lib }: + +let + version = "1.003"; + pname = "b612"; +in + +fetchzip rec { + name = "${pname}-font-${version}"; + url = "http://git.polarsys.org/c/${pname}/${pname}.git/snapshot/${pname}-bd14fde2544566e620eab106eb8d6f2b7fb1347e.zip"; + sha256 = "07gadk9b975k69pgw9gj54qx8d5xvxphid7wrmv4cna52jyy4464"; + postFetch = '' + mkdir -p $out/share/fonts/truetype/${pname} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname} + ''; + + meta = with stdenv.lib; { + homepage = http://b612-font.com/; + description = "Highly legible font family for use on aircraft cockpit screens"; + longDescription = '' + B612 is the result of a research project initiated by Airbus. The font + was designed by Nicolas Chauveau and Thomas Paillot (intactile DESIGN) with the + support of Jean‑Luc Vinot (ENAC). Prior research by Jean‑Luc Vinot (DGAC/DSNA) + and Sylvie Athènes (Université de Toulouse III). The challenge for the + "Aeronautical Font" was to improve the display of information on the cockpit + screens, in particular in terms of legibility and comfort of reading, and to + optimize the overall homogeneity of the cockpit. + + Intactile DESIGN was hired to work on the design of eight typographic + variants of the font. This one, baptized B612 in reference to the + imaginary asteroid of the aviator Saint‑Exupéry, benefited from a complete + hinting on all the characters. + ''; + license = with licenses; [ ofl epl10 bsd3 ] ; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix new file mode 100644 index 000000000000..c798c7a8ac0c --- /dev/null +++ b/pkgs/data/fonts/cherry/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, bdftopcf }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "cherry"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "turquoise-hexagon"; + repo = pname; + rev = version; + sha256 = "1sfajzndv78v8hb156876i2rw3zw8xys6qi8zr4yi0isgsqj5yx5"; + }; + + nativeBuildInputs = [ bdftopcf ]; + + buildPhase = '' + patchShebangs make.sh + ./make.sh + ''; + + installPhase = '' + mkdir -p $out/share/fonts/misc + cp *.pcf $out/share/fonts/misc + ''; + + meta = with stdenv.lib; { + description = "cherry font"; + homepage = https://github.com/turquoise-hexagon/cherry; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix new file mode 100644 index 000000000000..c247ad155438 --- /dev/null +++ b/pkgs/data/fonts/hermit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "hermit"; + version = "2.0"; + + src = fetchurl { + url = "https://pcaro.es/d/otf-${pname}-${version}.tar.gz"; + sha256 = "09rmy3sbf1j1hr8zidighjgqc8kp0wsra115y27vrnlf10ml6jy0"; + }; + + sourceRoot = "."; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp *.otf $out/share/fonts/opentype/ + ''; + + meta = with stdenv.lib; { + description = "monospace font designed to be clear, pragmatic and very readable"; + homepage = https://pcaro.es/p/hermit; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix new file mode 100644 index 000000000000..fe733359f3a8 --- /dev/null +++ b/pkgs/data/fonts/luculent/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchzip }: + +let version = "2.0.0"; in +fetchzip rec { + name = "luculent-${version}"; + url = http://www.eastfarthing.com/luculent/luculent.tar.xz; + + postFetch = '' + tar -xJf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + sha256 = "1m3g64galwna1xjxb1fczmfplm6c1fn3ra1ln7f0vkm0ah5m4lbv"; + + meta = with lib; { + description = "luculent font"; + homepage = http://www.eastfarthing.com/luculent/; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 45618972c348..10d4678de059 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { fontforge (pythonFull.withPackages (ps: [ ps.jinja2 - ps."3to2" + ps.py3to2 ps.fonttools ])) ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index ebda6d4428c1..4ad036278700 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - version = "18.09.19"; - - package-name = "numix-icon-theme-circle"; - - name = "${package-name}-${version}"; + pname = "numix-icon-theme-circle"; + version = "19.01.24"; src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = version; - sha256 = "1a1ack4kpngnb3c281pssmp3snn2idcn2c5cv3l38a0dl5g5w8nq"; + sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 03c1ba0f827a..967c629324c2 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "numix-icon-theme-square"; - version = "18.09.19"; + pname = "numix-icon-theme-square"; + version = "19.01.24"; src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = version; - sha256 = "0q5p901qj3gyzgpy5kk9q5sqb13ka5cfg6wvazlfch1k3kaqksz1"; + sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/themes/ant-theme/default.nix b/pkgs/data/themes/ant-theme/default.nix index 8c4c865ef4ae..8ff869bc7aaa 100644 --- a/pkgs/data/themes/ant-theme/default.nix +++ b/pkgs/data/themes/ant-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ant-theme"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar"; - sha256 = "15751pnb94g2wi6y932l3d7ksaz18402zbzp3l7ryy0lqwjnqvkj"; + sha256 = "1r795v96ywzcb4dq08q2fdbmfia32g36cc512mhy41s8fb1a47dz"; }; propagatedUserEnvPkgs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1fzy7bq5v9fzjpfxplvk0nwjgamcva83462gkz01lhr1mipb92h1"; + outputHash = "1gpacrmi5y87shp39jgy78n0ca2xdpvbqfh0mgldlxx99ca9rvvy"; meta = with stdenv.lib; { description = "A flat and light theme with a modern look"; diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix index 305f59529479..af1ccd0a5829 100644 --- a/pkgs/data/themes/nordic-polar/default.nix +++ b/pkgs/data/themes/nordic-polar/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "nordic-polar-${version}"; - version = "1.3.0"; + version = "1.4.0"; srcs = [ (fetchurl { url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz"; - sha256 = "1c5zgymkwd89fr680c49siwbkhfbay56iq9vlyqkj1dp0xnc528s"; + sha256 = "0sw4m1njnxal1kkiipsvfg9ndzxsf9rxfba5vhwswyzk388264xa"; }) (fetchurl { url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz"; - sha256 = "0nxzcgqzc42qvnhafranz6rwanqb4wzf9ychm5m4yrlp3ngw38p4"; + sha256 = "0ix0x0pnhfd1lrfj7a7n8xfg8vvzg7m0dzrsj8gzpav6wvwlypiy"; }) ]; diff --git a/pkgs/misc/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index ac24e35c66f7..93df3c723dd5 100644 --- a/pkgs/misc/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,16 +2,24 @@ stdenv.mkDerivation rec { name = "nordic-${version}"; - version = "1.3.0"; + version = "1.5.4"; srcs = [ (fetchurl { url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz"; - sha256 = "04axs2yldppcx159nwj70g4cyw0hbbzk5250677i9ny8b0w3gr9x"; + sha256 = "0m00hwr6ms9fzlpl97d972wvgq5l0m11mpn213248a8sqbh2zz9g"; + }) + (fetchurl { + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz"; + sha256 = "05k1m9f0q4mfaqp2as3ymjsqmyz0bs5cd576srd5v952dzxmmbm2"; }) (fetchurl { url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz"; - sha256 = "1h0690cijaipidb5if2bxhvvkrx5src3akyxvfywxg4bf8x7jxs5"; + sha256 = "1qps13fpp8y83c25c51w7kyds266gmks8c7kjp23iybij2lkny1m"; + }) + (fetchurl { + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz"; + sha256 = "1c0j6qsxa6zahrl9ad0q6pczgbmm8qn9qsd7k41yk2ndh9iqzr5y"; }) ]; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 956fec1ddf15..1f4af86ffeb6 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -13,5 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk python gettext ]; + NIX_LDFLAGS = "-lgmodule-2.0"; + propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 14795064cb49..d744fc6c87c7 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -46,6 +46,14 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate + + # make .desktop Exec absolute + patch -p0 <<END_PATCH + +++ src/tracker-store/tracker-store.desktop.in.in + @@ -4 +4 @@ + -Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 + +Exec=${glib.dev}/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 + END_PATCH ''; postInstall = '' diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 8d75797516d3..7c028656faec 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -288,8 +288,6 @@ lib.makeScope pkgs.newScope (self: with self; { devhelp = callPackage ./devtools/devhelp { }; - gdl = callPackage ./devtools/gdl { }; - gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; nemiver = callPackage ./devtools/nemiver { }; @@ -348,6 +346,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-panel = callPackage ./misc/gnome-panel { }; + gnome-screensaver = callPackage ./misc/gnome-screensaver { }; + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 7dee751314f5..dcf0bd439420 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + gdl, libgda, gtksourceview, itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { @@ -22,8 +23,8 @@ stdenv.mkDerivation rec { ncurses ]; buildInputs = [ - flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview + flex bison gtk3 libxml2 gnome3.gjs gdl + libgda gtksourceview gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index fe5345f1a6e2..716988252d54 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -6,6 +6,7 @@ , glib , gnome-bluetooth , gnome-desktop +, gnome-panel , gnome-session , gnome3 , gsettings-desktop-schemas @@ -16,77 +17,154 @@ , libpulseaudio , libxkbfile , libxml2 -, metacity , pkgconfig , polkit , substituteAll , upower -, xkeyboard_config }: +, wrapGAppsHook +, writeTextFile +, writeShellScriptBin +, xkeyboard_config +}: let pname = "gnome-flashback"; version = "3.30.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; + gnome-flashback = stdenv.mkDerivation rec { + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18rwql2pi78155l9zp1i50xfi5z8xz2l08m9d81x6qqbfr1nyy57"; - }; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "18rwql2pi78155l9zp1i50xfi5z8xz2l08m9d81x6qqbfr1nyy57"; + }; + + patches =[ + # overrides do not respect gsettingsschemasdir + # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/9 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/a55530f58ccd600414a5420b287868ab7d219705.patch; + sha256 = "1la94lhhb9zlw7bnbpl6hl26zv3kxbsvgx996mhph720wxg426mh"; + }) + ]; + + # make .desktop Execs absolute + postPatch = '' + patch -p0 <<END_PATCH + +++ data/applications/gnome-flashback-init.desktop.in + @@ -4 +4 @@ + -Exec=gnome-flashback --initialize + +Exec=$out/bin/gnome-flashback --initialize + +++ data/applications/gnome-flashback.desktop.in + @@ -4 +4 @@ + -Exec=gnome-flashback + +Exec=$out/bin/gnome-flashback + END_PATCH + ''; + + postInstall = '' + # Check that our expected RequiredComponents match the stock session files, but then don't install them. + # They can be installed using mkSessionForWm. + grep '${requiredComponents "metacity"}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false) + + rm -r $out/share/gnome-session + rm -r $out/share/xsessions + rm -r $out/libexec + ''; + + nativeBuildInputs = [ + autoreconfHook + gettext + libxml2 + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + glib + gnome-bluetooth + gnome-desktop + gsettings-desktop-schemas + gtk + ibus + libcanberra-gtk3 + libpulseaudio + libxkbfile + polkit + upower + xkeyboard_config + ]; + + doCheck = true; - patches =[ - (substituteAll { - src = ./fix-paths.patch; - inherit metacity; - gnomeSession = gnome-session; - }) - - # overrides do not respect gsettingsschemasdir - # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/9 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/a55530f58ccd600414a5420b287868ab7d219705.patch; - sha256 = "1la94lhhb9zlw7bnbpl6hl26zv3kxbsvgx996mhph720wxg426mh"; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - gettext - libxml2 - pkgconfig - ]; - - buildInputs = [ - glib - gnome-bluetooth - gnome-desktop - gsettings-desktop-schemas - gtk - ibus - libcanberra-gtk3 - libpulseaudio - libxkbfile - polkit - upower - xkeyboard_config - ]; - - doCheck = true; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + + mkSessionForWm = { wmName, wmLabel, wmCommand }: + let + wmApplication = writeTextFile { + name = "gnome-flashback-${wmName}-wm"; + destination = "/share/applications/${wmName}.desktop"; + text = '' + [Desktop Entry] + Type=Application + Encoding=UTF-8 + Name=${wmLabel} + Exec=${wmCommand} + NoDisplay=true + X-GNOME-WMName=${wmLabel} + X-GNOME-Autostart-Phase=WindowManager + X-GNOME-Provides=windowmanager + X-GNOME-Autostart-Notify=false + ''; + }; + + gnomeSession = writeTextFile { + name = "gnome-flashback-${wmName}-gnome-session"; + destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session"; + text = '' + [GNOME Session] + Name=GNOME Flashback (${wmLabel}) + ${requiredComponents wmName} + ''; + }; + + executable = writeShellScriptBin "gnome-flashback-${wmName}" '' + if [ -z $XDG_CURRENT_DESKTOP ]; then + export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME" + fi + + export XDG_DATA_DIRS=${wmApplication}/share:${gnomeSession}/share:${gnome-flashback}/share:${gnome-panel}/share:$XDG_DATA_DIRS + + exec ${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@" + ''; + + in writeTextFile { + name = "gnome-flashback-${wmName}-xsession"; + destination = "/share/xsessions/gnome-flashback-${wmName}.desktop"; + text = '' + [Desktop Entry] + Name=GNOME Flashback (${wmLabel}) + Comment=This session logs you into GNOME Flashback with ${wmLabel} + Exec=${executable}/bin/gnome-flashback-${wmName} + TryExec=${wmCommand} + Type=Application + DesktopNames=GNOME-Flashback;GNOME; + ''; + }; }; - }; - meta = with stdenv.lib; { - description = "GNOME 2.x-like session for GNOME 3"; - homepage = https://wiki.gnome.org/Projects/GnomeFlashback; - license = licenses.gpl2; - maintainers = gnome3.maintainers; - platforms = platforms.linux; + meta = with stdenv.lib; { + description = "GNOME 2.x-like session for GNOME 3"; + homepage = https://wiki.gnome.org/Projects/GnomeFlashback; + license = licenses.gpl2; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; }; -} + in gnome-flashback diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch b/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch deleted file mode 100644 index 9d5add233d61..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -22,7 +22,7 @@ - echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \ - echo ' export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \ - echo 'fi' && echo '' && \ -- echo 'exec gnome-session --session=gnome-flashback-compiz "$$@"') > $@ -+ echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-compiz "$$@"') > $@ - $(AM_V_at) chmod a+x $@ - - gnome-flashback-metacity: Makefile -@@ -30,7 +30,7 @@ - echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \ - echo ' export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \ - echo 'fi' && echo '' && \ -- echo 'exec gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@ -+ echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@ - $(AM_V_at) chmod a+x $@ - - CLEANFILES = \ ---- a/data/xsessions/gnome-flashback-metacity.desktop.in.in -+++ b/data/xsessions/gnome-flashback-metacity.desktop.in.in -@@ -2,6 +2,6 @@ - Name=GNOME Flashback (Metacity) - Comment=This session logs you into GNOME Flashback with Metacity - Exec=@libexecdir@/gnome-flashback-metacity --TryExec=metacity -+TryExec=@metacity@/bin/metacity - Type=Application - DesktopNames=GNOME-Flashback;GNOME; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index b9522e1e3f40..f9cc0a8aa4f9 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -8,6 +8,7 @@ , gettext , glib , gnome-desktop +, gnome-flashback , gnome-menus , gnome3 , gtk @@ -43,6 +44,23 @@ in stdenv.mkDerivation rec { }) ]; + # make .desktop Exec absolute + postPatch = '' + patch -p0 <<END_PATCH + +++ gnome-panel/gnome-panel.desktop.in + @@ -7 +7 @@ + -Exec=gnome-panel + +Exec=$out/bin/gnome-panel + END_PATCH + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome-menus}/share:${gnome-flashback}/share" + --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg:${gnome-flashback}/etc/xdg" + ) + ''; + nativeBuildInputs = [ autoreconfHook gettext diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix new file mode 100644 index 000000000000..be8ab81457ea --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, fetchgit +, fetchurl +, autoreconfHook +, dbus-glib +, glib +, gnome-common +, gnome-desktop +, gnome3 +, gtk +, gsettings-desktop-schemas +, pkgconfig +, intltool +, pam +, systemd +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-screensaver"; + version = "3.6.1"; + + # the original package is deprecated and the Ubuntu version has a number of useful patches + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/gnome-screensaver"; + rev = "4f7b666131dec060a5aac9117f395ac522a627b4"; + sha256 = "15xqgcpm825cy3rm8pj00qlblq66svmh06lcw8qi74a3g0xcir87"; + }; + + # from debian/patches/series + patches = map (patch: "debian/patches/${patch}") [ + "00git_logind_check.patch" + "01_no_autostart.patch" + "03_fix_ltsp-fading.patch" + "05_dbus_service.patch" + "10_legacy_scrsvr_inhibit.patch" + "13_nvidia_gamma_fade_fallback.patch" + "14_no_fade_on_user_switch.patch" + "15_dont_crash_on_no_fade.patch" + "16_dont_crash_in_kvm.patch" + "17_remove_top_panel.patch" + "18_unity_dialog_layout.patch" + "24_use_user_settings.patch" + "25_fix_lock_command.patch" + "27_lightdm_switch_user.patch" + "28_blocking_return.patch" + "29_handle_expired_creds.patch" + # these two patches are ubuntu-specific + # "30_ubuntu-lock-on-suspend_gsetting.patch" + # "31_lock_screen_on_suspend.patch" + "32_input_sources_switcher.patch" + "move-not-nuke.patch" + "allow-replacement" + "libsystemd.patch" + "0001-gs-lock-plug-Disconnect-signal-handler-from-right-ob.patch" + "33_budgie_support.patch" + ] ++ [ ./fix-dbus-service-dir.patch ]; + + nativeBuildInputs = [ + autoreconfHook + intltool + wrapGAppsHook + gnome-common + pkgconfig + ]; + + buildInputs = [ + glib + gtk + gnome-desktop + dbus-glib + pam + systemd + ]; + + configureFlags = [ "--enable-locking" "--with-systemd=yes" ]; + + enableParallelBuilding = true; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Component of Gnome Flashback that provides screen locking"; + homepage = https://wiki.gnome.org/Projects/GnomeScreensaver; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch b/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch new file mode 100644 index 000000000000..81e037ee690d --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2019-01-20 20:28:01.309231507 +0100 ++++ b/configure.ac 2019-01-20 20:31:54.927978927 +0100 +@@ -137,7 +137,7 @@ + + # Find out where the session service file goes + # The sad sed hack is recomended by section 27.10 of the automake manual. +-DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g'` ++DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 --define-variable 'datadir=${datadir}'` + AC_SUBST(DBUS_SESSION_SERVICE_DIR) + + dnl --------------------------------------------------------------------------- \ No newline at end of file diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index ed162229d9af..54ea8dcf4875 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -8,13 +8,13 @@ , libXmu }: let - version = "0.26.2"; + version = "0.27.0"; in gsmakeDerivation { name = "gnustep-back-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; + sha256 = "0j400892ysxygh50i3918nn87vkxh15h892jwvphmkd34j8wdn9f"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index 399bad2581f6..72d109b69796 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,12 +1,12 @@ { gsmakeDerivation, fetchurl, base }: let - version = "0.26.2"; + version = "0.27.0"; in gsmakeDerivation { name = "gnustep-gui-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; - sha256 = "1dsbkifnjha3ghq8xx55bpsbbng0cjsni3yz71r7342ax2ixcvxc"; + sha256 = "1m6k3fa2ndxv0kl2fazi76mwa27gn5jyp24q0rk96f2djhsy94br"; }; buildInputs = [ base ]; patches = [ ./fixup-all.patch ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 05b9d966fc43..57f721f49a28 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; - version = "1.20.0"; + version = "1.20.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1639jxcdhcn5wvb4gj9xncdj5d5c3rnyydwwsgqj66cmfmb53l1n"; + sha256 = "00vrqyfk370fdhlfv3m6n0l6hnx30hrsrcg1xja03957cgvcvnvr"; }; nativeBuildInputs = [ @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 + glib itstool libsecret libxml2 @@ -25,7 +26,9 @@ stdenv.mkDerivation rec { mate.mate-desktop hicolor-icon-theme ]; - + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; meta = { diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index cd47f7b62b4f..64ef0cb57f27 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "caja-extensions-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "01k7c3gw6rfd7vlch61zig22bvz40wlnalc5p3rz4d9i98fr643n"; + sha256 = "14w1xd33ggn6wdzqvcmj8rqc68w4k094lai6mqrgmv1zljifydqz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 63ad4e671254..130d44d6a1a1 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; - version = "1.21.2"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0kswpghpsz69l417ammniy1ja0dsg1hrsm2k0rx28q9mhdfdmnwq"; + sha256 = "1wlrhcvhqving3pphbz50xnbp7z57mlkf7m36lfh8mim62kfmmd0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 2becc40a46c3..1989ac8e12cc 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "engrampa-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0y79rzmv3i03la443bp8f6gsgm03vr4nd88npwrvjqlxs59lg1gw"; + sha256 = "0fj957dfagw6p7mq5545h9j2w3hv18yqnkpypnr719r4g13d3f2v"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 4f3380514494..3b830f73c76a 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "eom-${version}"; - version = "1.21.2"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "08idw219mw0v0nkaphy0jvxi67gqm4nzbbnhnwjksxbma2gmpvss"; + sha256 = "0440sfbidizn860w5avgwld08qc2fslrm0nx2659651cf3r7rw05"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 842ab5b214da..15b81a628863 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmatekbd-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0xi5ds2psbf0qb0363ljxz5m9xxh1hr2hcn8zv6ni6mdqsqnkajz"; + sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index dab73ed34991..8bf0d9bec18c 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "libmatemixer-${version}"; - version = "1.21.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1376x3rlisrc6hsz6yzi637msplmacxryyqnrsgfc580knp1nrvm"; + sha256 = "00p67mi0flsbgn15qpwq60rzf917s5islbmhirbvz6npcvv0d493"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index e6769a2e978e..9805b8d91b5a 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmateweather-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1vj2pgry6wdscdcpwwagqlsjf8rkh4id67iw7d9qk1pfbhb2sznl"; + sha256 = "1ksp1xn13m94sjnnrx2dyv7hlbgjbnbahwdyaq35r2419b366hxv"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index e2c2a54bc748..975c80b1d0cf 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marco-${version}"; - version = "1.21.0"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1vg3dl7kqhzgspa2ykyql4j3bpki59769qrkakqfdcavb9j5c877"; + sha256 = "192nlr4ylisxisk0ljabm8v0a5sapdncj4gbw39q2fpr938ifs32"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 59316039b36b..f9f0689fa65f 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-applets-${version}"; - version = "1.21.0"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0jr66xrwjrlyh4hz6h5axh96pgxm8n1xyc0rmggah2fijs940rsb"; + sha256 = "0y5501wliipxf43p2q9917r3ird7azlrbcwnj2q2q2zy00hvvk5f"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index a4d7e0a20988..d45563db8a1c 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-calc-${version}"; - version = "1.21.0"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "07mmc99wwgqbp15zrr6z7iz0frc388z19jwk28ymyzgn6bcc9cn6"; + sha256 = "0nv0q2c93rv36dhid7vf0w0rb6zdwyqaibfsmc7flj00qgsn3r5a"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index bc5a78c5a4b2..8697a150881b 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-control-center-${version}"; - version = "1.21.0"; + version = "1.20.4"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0m40jr1midh5fzk3k97sydihlqfqjvzxlgmkx8w2j30a09h7230w"; + sha256 = "1rjxndikj0w516nlvyzcss31l9qjwkzvns7ygasnjbl02bgml9a4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 124cd644467e..e6a43e6b457d 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-desktop-${version}"; - version = "1.21.0"; + version = "1.20.4"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0qd76p5zqgifiawkgv2casb9ll55j4qq4pfxgxj3j5zvjr3dgr47"; + sha256 = "073hn68f57ahif0znbx850x6ncsq50m7jg0sy1mllxjjqf3b1fxr"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index c18dd7783809..9d813e715ffd 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; - version = "1.21.0"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "170vir6h9sgsibd4kfq5qgz542qrw94q3qakqry77clls5wj6b62"; + sha256 = "10l58mjc2a69pm7srxvlav2b8b7nbzyvwjrlrk79a3gr6dd1mbk4"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 11f71d109377..643f67cd1e95 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-media-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0mgx4xjarpyvyaw0p0jnh74447y6zd93fvpi12078vyqr25dsi43"; + sha256 = "06fka82smrphzj4dz9dw1566kmdscxvxl0rchj9qxg7aidy0rmnv"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 94a7f572b16b..9a0db6107e1a 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "mate-menus-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "168f7jgm4kbnx92xh3iqvvrgpkv1q862xg27zxg40nkz5xhk95hx"; + sha256 = "18y4nka38dqqxycxpf7ig4vmrk4i05xqqjk4fxr1ghkj60xxyxz2"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - buildInputs = [ glib gobject-introspection python ]; + buildInputs = [ glib python ]; makeFlags = [ "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 748a45eda79c..e9f8b4b75b1f 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mate-notification-daemon-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0hwswgc3i6d7zvmj0as95xjjw431spxkf1d37mxwaf6j80gx0p78"; + sha256 = "0a60f67yjvlffrnviqgc64jz5l280f30h8br7wz2x415if5dmjyn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 92da012ca7da..a7d34fc85a64 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; - version = "1.21.1"; + version = "1.20.4"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0093pimqkx5db2nciksgrmq02hldg08p7hghafky3njl0kzv8l5z"; + sha256 = "02pdrwgl3plgv6l6nc45nsnmjppkxs4ybggwibd6mm777i9nb44d"; }; nativeBuildInputs = [ - pkgconfig + gobject-introspection intltool itstool + pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index b5d87acded80..5f1dfaa5ba4e 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "mate-polkit-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "05g6k5z903p9p0dbi0y61z5chip52gqrhy5zrjn6xjxv1ad29lsk"; + sha256 = "0zajisavrxiynmp4qg7zamvkpnhy9nra01czwn21h6hm2yakbayr"; }; nativeBuildInputs = [ - pkgconfig + gobject-introspection intltool + pkgconfig ]; buildInputs = [ gtk3 - gobject-introspection libappindicator-gtk3 libindicator-gtk3 polkit diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 14f5f0443730..a9c162e59122 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; - version = "1.21.0"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1l7rxv16j95w26igs4n7fdfv5hqm91b9ddc1lw5m26s42nkzzf85"; + sha256 = "17x47j5dkxxsq63bv2jwf3xgnddyy2dya4y14ryivq8q3jh5yhr5"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index b4c215339b55..089296a0b842 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; - version = "1.21.0"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1asfw2x0ha830ilkw97bjdqm2gnjbpb6dd7lb6h43aix7g3lgm7f"; + sha256 = "0kmaj4psg7261h02dzarga6k5cb7n709d60xbfrhywnf5fb9787i"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index a317b175f9bb..86cbd3a86d25 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; - version = "1.21.0"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1l84hfxz5qzipchxxi5whccq5d0kg9c8fxisar8pbckl6763b4dx"; + sha256 = "0s98qy3jkri9zh5xqffprqd00cqspaq9av0mcrcakjkl8wyfh2g6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 38881e425762..31f447861fc8 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1556kn4sk41x70m8cx200g4c9q3wndnhdxj4vp93sw262yqmk9mn"; + sha256 = "05qq07b568qf6zyy459wajhfpbx1wfrinw3hsbky7abdjfn529dy"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 4138a042856b..2be518bcc5e1 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-settings-daemon-${version}"; - version = "1.21.0"; + version = "1.20.4"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1k0xbwxpv3wfl7z3hgaf2ylzaz3aky4j7awdy8cfgxr0d6nqhp3w"; + sha256 = "10xlg2gb7fypnn5cnr14kbpjy5jdfz98ji615scz61zf5lljksxh"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index c3f29dff6319..5757f5eb9b40 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-system-monitor-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0filf6qyw4fk45br3cridbqdngwl525z49zn36r7q4agzhny4phz"; + sha256 = "0f6sh23axzmcmyv0d837gbc0dixf1afh8951zrzp1y53rdgpa9qn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index ce8f58cc99b2..9b0018e8e2fc 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "15vx7b5nbjbym22pz3l3cyqhv4dnd6vl2hb56xhwq625aw2a7chv"; + sha256 = "0fqyi0az4ax1gyk5gymd7ssq2crdcd7slmqljc1b1pa283ql7p3q"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 9992d911814d..5264c772a537 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-user-guide-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0ayg570000calzpj51dwhh5mil11s0nrhl21c0si3sxr8f5cld6q"; + sha256 = "0cbi625xd7nsifvxbixsb29kj2zj14sn0sl61wkcvasz7whg7w6r"; }; nativeBuildInputs = [ itstool intltool libxml2 ]; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index e4cd9126dfaa..17ec165f7559 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-utils-${version}"; - version = "1.21.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0q05zzxgwwk7af05yzcjixjd8hi8cqykirj43g60ikhzym009n4q"; + sha256 = "0w7hw192jzhad8jab8mjms4x6k2xijvb3rhlbxb6z5n5880xgfqf"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 387df5d45b3d..f2419f7f5e80 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate, pythonPackages }: +{ stdenv, python, fetchurl, pkgconfig, intltool, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: -stdenv.mkDerivation rec { - name = "mozo-${version}"; - version = "1.20.1"; +python.pkgs.buildPythonApplication rec { + pname = "mozo"; + version = "1.20.2"; + + format = "other"; + doCheck = false; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "16rkwbq385i2acll0kcsnp4ghdyljylhp06bjdsvbwv6bjspyyrp"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${pname}-${version}.tar.xz"; + sha256 = "1q4hqhigimxav2a8xxyd53lq8q80szsphcv37y2jhm6g6wvdmvhd"; }; - - pythonPath = [ mate.mate-menus pythonPackages.pygobject3 ]; - nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; + nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; - buildInputs = [ pythonPackages.python ] ++ pythonPath; + propagatedBuildInputs = [ mate.mate-menus python.pkgs.pygobject3 ]; - preFixup = "wrapPythonPrograms"; + buildInputs = [ gtk3 glib ]; meta = with stdenv.lib; { description = "MATE Desktop menu editor"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 9dd992c4699f..abb1b8c28a1b 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pluma-${version}"; - version = "1.21.1"; + version = "1.20.4"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0sc69bz0h3f4cpgkyda9fnpjfkvbc20ldh6v3jj8fd3n460bc8ai"; + sha256 = "0qdbm5y6q8lbabd81mg3rnls5bdvbmfii82f6syqw1cw6381mzgz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 1659ebaae656..0470086f865f 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "python-caja-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "16y9xri92x7a40db2qakf20c80a6vqy21nwnjhwrki5rqk7nwbgx"; + sha256 = "16r8mz1b44qgs19d14zadwzshzrdc5sdwgjp9f9av3fa6g09yd7b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index bf0dd5229c68..a4d5b3382426 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -44,14 +44,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "3.6.2"; + version = "3.6.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1558adr73d7mgp0z92q9vzbgarddimadyk4467z8i3yp4g8k5irk"; + sha256 = "1c1y099xvpdh35n8fln642psa4xsaaqly2i2jgkvhrb9yl77x5aj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 66e1abd05e90..40b690048eba 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -38,21 +38,15 @@ def generate_sources(release, assets): type_map = out.setdefault(asset["os"], {}) impl_map = type_map.setdefault(asset["binary_type"], {}) arch_map = impl_map.setdefault(asset["openjdk_impl"], { - "version": version, - "build": build, "packageType": asset["binary_type"], "vmType": asset["openjdk_impl"], }) - if arch_map["version"] != version or arch_map["build"] != build: - print("error: architectures have different latest versions ({}+{} vs {}+{})".format( - arch_map["version"], arch_map["build"], version, build - ), file=sys.stderr) - sys.exit(1) - arch_map[arch_to_nixos[asset["architecture"]]] = { "url": asset["binary_link"], "sha256": get_sha256(asset["checksum_link"]), + "version": version, + "build": build, } return out diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 958f36d39284..7b16d6ad9dbc 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -5,13 +5,14 @@ sourcePerArch: , fetchurl }: -let result = stdenv.mkDerivation rec { +let cpuName = stdenv.hostPlatform.parsed.cpu.name; + result = stdenv.mkDerivation rec { name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; src = fetchurl { - inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; + inherit (sourcePerArch.${cpuName}) url sha256; }; # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 531cf3a80517..8c6db5ecd8c9 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -42,15 +42,17 @@ let xorg.libXrender stdenv.cc.cc ]); + + cpuName = stdenv.hostPlatform.parsed.cpu.name; in let result = stdenv.mkDerivation rec { name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; src = fetchurl { - inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; + inherit (sourcePerArch.${cpuName}) url sha256; }; nativeBuildInputs = [ file ]; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index bacb468c0ece..391ea9abca92 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,52 +4,56 @@ "jdk": { "hotspot": { "aarch64": { + "build": "13", "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz", + "version": "11.0.1" }, - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "hotspot", "x86_64": { - "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz" + "build": "7", + "sha256": "d89304a971e5186e80b6a48a9415e49583b7a5a9315ba5552d373be7782fc528", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz", + "version": "11.0.2" } }, "openj9": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "openj9", "x86_64": { + "build": "13", "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz", + "version": "11.0.1" } } }, "jre": { "hotspot": { "aarch64": { + "build": "28", "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz", + "version": "11" }, - "build": "28", "packageType": "jre", - "version": "11", "vmType": "hotspot", "x86_64": { - "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz" + "build": "7", + "sha256": "59c34373eec16b53798aedac73776b19e43f396fdff8a2879e66dc4b0cfd73cc", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_7.tar.gz", + "version": "11.0.2" } }, "openj9": { - "build": "28", "packageType": "jre", - "version": "11", "vmType": "openj9", "x86_64": { + "build": "28", "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz", + "version": "11" } } } @@ -57,35 +61,35 @@ "mac": { "jdk": { "hotspot": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "hotspot", "x86_64": { + "build": "13", "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz", + "version": "11.0.1" } }, "openj9": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "openj9", "x86_64": { - "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + "build": "13", + "sha256": "b8960753a66190fa81982682357a2449b4183f3e23c20a5e3b4cf01e2989846b", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz", + "version": "11.0.1" } } }, "jre": { "hotspot": { - "build": "28", "packageType": "jre", - "version": "11", "vmType": "hotspot", "x86_64": { + "build": "28", "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz", + "version": "11" } } } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 875472a2fb6d..3ab25c3a830b 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -98,8 +98,6 @@ let cd .. ''; - extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; - dontStrip = true; installPhase = '' @@ -120,7 +118,7 @@ let cd ../phobos mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib + cp generated/${osname}/release/${bits}/libphobos2.* $out/lib cp -r std $out/include/d2 cp -r etc $out/include/d2 diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 09ef27fc3015..9cc60003201c 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchpatch, flex, bison, pkgconfig, python2, swig, which }: stdenv.mkDerivation rec { - name = "dtc-${version}"; + pname = "dtc"; version = "1.4.7"; src = fetchgit { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index aa8d9da9faaf..bfaf24cd9872 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -14,6 +14,12 @@ let elmPackages = (import ./packages/elm-srcs.nix); versionsDat = ./versions.dat; }; + patches = [ + (fetchpatch { + url = "https://github.com/elm/compiler/pull/1886/commits/39d86a735e28da514be185d4c3256142c37c2a8a.patch"; + sha256 = "0nni5qx1523rjz1ja42z6z9pijxvi3fgbw1dhq5qi11mh1nb9ay7"; + }) + ]; buildTools = drv.buildTools or [] ++ [ makeWrapper ]; jailbreak = true; postInstall = '' diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 945649b29781..82edf0e33cfa 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; dontPatchELF = true; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index c22683dae03a..39fc3c517f81 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; dontPatchELF = true; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 4e0caf183610..a26131cb0536 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; dontPatchELF = true; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 039b5a9ce362..350eed2fedd0 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -pv $out cp -r ./* $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index ab4c7e6ae63e..ae682f8b8f87 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +, mailcap , buildPackages, targetPackages }: let @@ -56,6 +57,10 @@ stdenv.mkDerivation rec { substituteInPlace misc/cgo/testcarchive/carchive_test.go \ --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + # Patch the mimetype database location which is missing on NixOS. + substituteInPlace src/mime/type_unix.go \ + --replace '/etc/mime.types' '${mailcap}/etc/mime.types' + # Disabling the 'os/http/net' tests (they want files not available in # chroot builds) rm src/net/{listen,parse}_test.go diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index a5d6247ffdc7..2657ee6633b7 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -3,7 +3,7 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n }: stdenv.mkDerivation rec { - version = "1.9.2"; + version = "1.10.0"; rev = "v${version}"; inherit testedTargets; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry"; + sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b"; }; # there are missing dependencies in the Makefile, causing sporadic build failures @@ -32,14 +32,7 @@ stdenv.mkDerivation rec { llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; - patches = [ - (fetchpatch { - url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch; - sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s"; - }) - ]; - - postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; + postPatch = "sed -i -e 's,/bin/,,g' -e 's/-lcurses/-lncurses/g' Makefile"; # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real # errors diff --git a/pkgs/development/compilers/llvm/common.nix b/pkgs/development/compilers/llvm/common.nix index 27f48ff3f113..df0cd29ad5b7 100644 --- a/pkgs/development/compilers/llvm/common.nix +++ b/pkgs/development/compilers/llvm/common.nix @@ -12,6 +12,8 @@ rec { "ARM" else if platform.parsed.cpu.family == "mips" then "Mips" + else if platform.parsed.cpu.family == "power" then + "PowerPC" else throw "Unsupported system"; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 19b16921e329..35575f1052e3 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,41 +21,41 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "192"; - build = "26"; + update = "202"; + build = "ga"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = "jdk8u${update}-b${build}"; + repover = "jdk8u${update}-${build}"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1hx5sfsglc101aqs9n7cz7rh447d6rxfxkbw03crvzbvy9n6ag2d"; + sha256 = "0asx7qkhmrlfmhrljck5gb3yp4v0aa8k35y4xfcph41x0m0mvrdb"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0vq6nlzs85agjkilpr53v7kjrd99kq770zipqghjmlfzyiy9xk4q"; + sha256 = "07q6l3slmi5fgwjnsk6bd8miv8glmw15w5f6yyvp8nlp2d54l33n"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0q5z2glfiip0lsisp1zy1zcw91hi1kznphm7w3iagq8s7550wbvh"; + sha256 = "01k4pwhn3nmkzdhdj1v58dgir4iwsj9mm2ml1541z31s53g037cq"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1mgg82066c9wjsj9ciqv4lrn1av5cb86hq00lkpsffdqbwx3vrm3"; + sha256 = "0v39kl2iiyh74p3cp6bjhshkwxpgbffza9abzjgp7cpdfhcc73p0"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1s87a49hl4h21kf2yh1w67wgb179j0f5v62cxbrvvd5lk2h5jyvf"; + sha256 = "0z1cy6aq09j25jyryj47rms15h5175p2h23fg5pv035zapf8nb1b"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "05alcixcxcdms373byh21d2brsky6kj14b3h80cs9bi1gfnbqilq"; + sha256 = "0y0mk4sra9d29kgx842m5y4bz9gczc9ypkajv6m5igjv7sizzsv7"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1r3fqnl5jqmxzsjqjrka35f8hwqqap9jg8zwqk2vv9qikrm7frhl"; + sha256 = "07ssrjhffkdncxxhsbid21hlg51y7js3x7sb4g474vmmi3qj6vmb"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0lzwi35lp4a477jkmfa53kxy3g9lzcmh56wprg805gbv4sjnkjk1"; + sha256 = "0r0b8ra0ibzbdpxz6nv6i2zrzh2j5sxgprpnl6gf4d9h0i29ickj"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 1e333e052b64..4d88f3b97729 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -199,4 +199,4 @@ let result = stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms }; -}; in result +}; in stdenv.lib.trivial.warn "Public updates for Oracle Java SE 8 released after January 2019 will not be available for business, commercial or production use without a commercial license. See https://java.com/en/download/release_notice.jsp for more information." result diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 51ff77758a5b..81f4ef3c7dba 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -6,8 +6,8 @@ import ./jdk-linux-base.nix { buildVersion = "09"; sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac"; sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b"; - sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz"; - sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k"; + sha256.armv7l-linux = "0y6bvq93lsf21v6ca536dpfhkk5ljsj7c6di0qzkban37bivj0si"; + sha256.aarch64-linux = "1bybysgg9llqzllsmdszmmb73v5az2l1shxn6lxwv3wwiazpf47q"; releaseToken = "42970487e3af4f5aa5bca3f542482c60"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 51ff77758a5b..0263bdde8d28 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -2,12 +2,12 @@ # jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "201"; + patchVersion = "202"; buildVersion = "09"; - sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac"; - sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b"; - sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz"; - sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k"; + sha256.i686-linux = "19np392dwdqdq39lmm10607w2h042lrm5953fnsfh1bb9jli1pgj"; + sha256.x86_64-linux = "1q4l8pymjvsvxfwaw0rdcnhryh1la2bvg5f4d4my41ka390k4p4s"; + sha256.armv7l-linux = "06aljl7dqmmhmp7xswgvkcgh9mam71wnqydg9yb3hkcc443cm581"; + sha256.aarch64-linux = "12v9ndv7a2c9zqq6ai2vsgwad0lzmf4c6jxy4p9miapmhjzx5vii"; releaseToken = "42970487e3af4f5aa5bca3f542482c60"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 7a4928d2662c..ddfd5d0a3fdf 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.9.10"; + version = "1.10.2"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.9.10"; - sha256 = "1iaw3pgh0h53gxk3bl148n1lfr54cx2yv0gnx2rjp2m5599acbz4"; + rev = "Release-1.10.2"; + sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 3ec08a82d017..1c82e71dd1dc 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -166,6 +166,8 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/30181 # enableParallelBuilding = false; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with stdenv.lib; { homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 1176d348d9d3..7ce7f9cefe51 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -8,30 +8,32 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "32d3ec319909fcad0b2b308fe1635198773e8316"; - sha256 = "1kmgjv5kbrjy6azpgwnjcn3cj8vg5i8hnyk3m969sc0gq2j1rbjj"; + rev = "712cd6618df2c77e126d68042ad7a81a69ee4a6f"; + sha256 = "0wncdj6q1hn40lc7cnz97mx5qjvb8p13mhxilnncgcmf0crsvblz"; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c"; - sha256 = "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x"; + rev = "df5bd2d05ac1fd3ec3024439f885ec21cc949b22"; + sha256 = "0l8ds4nn2qcfi8535ai8891i3547x35hscs2jxwwq6qjgw1sgkax"; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "3ce3e49d73b8abbf2ffe33f829f941fb2a40f552"; - sha256 = "0yk4bzqifdqpmdxkhvrxbdqhf5ngkga0ig1yyz7khr7rklqfz7wp"; + rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; + sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; }; in stdenv.mkDerivation rec { - name = "shaderc-git-${version}"; - version = "2018-06-01"; + name = "shaderc-${version}"; + version = "2018.0"; + + outputs = [ "out" "lib" "bin" "dev" "static" ]; src = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "be8e0879750303a1de09385465d6b20ecb8b380d"; - sha256 = "16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd"; + rev = "v${version}"; + sha256 = "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl"; }; patchPhase = '' @@ -40,7 +42,14 @@ in stdenv.mkDerivation rec { ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - buildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python ]; + + postInstall = '' + moveToOutput "lib/*.a" $static + ''; + + preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"''; + enableParallelBuilding = true; cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; @@ -48,5 +57,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation."; + license = [ licenses.asl20 ]; }; } diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index ff7385a9222e..6c0be377bc0b 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,17 +1,31 @@ -{stdenv, bash, which, autoconf, automake, fetchurl, coq}: +{ stdenv, bash, which, autoconf, automake, fetchurl, coq }: + +let params = + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { + version = "3.0.0"; + uid = "37477"; + sha256 = "1h05ji5cmyqyv2i1l83xgkm7vfvcnl8r1dzvbp5yncm1jr9kf6nn"; + } else { + version = "2.6.1"; + uid = "37454"; + sha256 = "06msp1fwpqv6p98a3i1nnkj7ch9rcq3rm916yxq8dxf51lkghrin"; + } +; in stdenv.mkDerivation rec { name = "coq${coq.coq-version}-flocq-${version}"; - version = "2.6.0"; + inherit (params) version; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37054/flocq-2.6.0.tar.gz; - sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3"; + url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/flocq-${version}.tar.gz"; + inherit (params) sha256; }; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 bash which autoconf automake ]; - propagatedBuildInputs = [ coq ]; + nativeBuildInputs = [ bash which autoconf automake ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ + ocaml camlp5 + ]); buildPhase = '' ${bash}/bin/bash autogen.sh @@ -31,4 +45,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 96486ffd925f..bff993a0e69f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,7 +85,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0wczijw80pw31k6h3a65m76aq9i02aarr2zxl7k5m7p0l6rn82vd"; + sha256 = "0vww2qf94a6dg46mynkgpk0lh3x12vvfby3flqymi4wfrx1fif1k"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -720,9 +720,15 @@ self: super: { ''; }); + # A simple MonadFail patch would do too, but not doing the tests is easier + megaparsec_6_5_0 = dontCheck super.megaparsec_6_5_0; + # The standard libraries are compiled separately idris = generateOptparseApplicativeCompletion "idris" ( - doJailbreak (dontCheck super.idris) + doJailbreak (dontCheck (super.idris.override { + # Needed for versions <= 1.3.1 https://github.com/idris-lang/Idris-dev/pull/4610 + megaparsec = self.megaparsec_6_5_0; + })) ); # https://github.com/bos/math-functions/issues/25 @@ -915,15 +921,6 @@ self: super: { language-puppet = dontHaddock super.language-puppet; filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); - # Missing FlexibleContexts in testsuite - # https://github.com/EduardSergeev/monad-memo/pull/4 - monad-memo = - let patch = pkgs.fetchpatch - { url = https://github.com/EduardSergeev/monad-memo/pull/4.patch; - sha256 = "14mf9940arilg6v54w9bc4z567rfbmm7gknsklv965fr7jpinxxj"; - }; - in appendPatch super.monad-memo patch; - # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bb49a31c0eed..979e89655ac3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -68,7 +68,4 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; - # Fix build with ghc 8.6.x. - git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch; - } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 27bee9ae2316..b35f03a96345 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.2 + # LTS Haskell 13.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -346,7 +346,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 - Cabal ==2.4.1.0 - - cabal2spec ==2.2.2 + - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.6 - cache ==0.1.1.1 @@ -368,7 +368,7 @@ default-package-overrides: - cayley-client ==0.4.8 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 - - cereal ==0.5.7.0 + - cereal ==0.5.8.0 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-time ==0.1.0.0 @@ -443,7 +443,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.3.1 - - conduit-algorithms ==0.0.8.2 + - conduit-algorithms ==0.0.9.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 @@ -490,7 +490,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.1.1.4 + - crypto-enigma ==0.1.1.5 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -567,7 +567,7 @@ default-package-overrides: - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - deferred-folds ==0.9.10 - - dejafu ==1.11.0.4 + - dejafu ==1.11.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 @@ -671,7 +671,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.2.0 + - eventstore ==1.2.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.5.0.1 @@ -788,7 +788,7 @@ default-package-overrides: - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 - genvalidity-containers ==0.5.1.1 - - genvalidity-hspec ==0.6.2.1 + - genvalidity-hspec ==0.6.2.2 - genvalidity-hspec-aeson ==0.3.0.1 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 @@ -831,8 +831,8 @@ default-package-overrides: - gingersnap ==0.3.1.0 - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 - - githash ==0.1.3.0 - - github-release ==1.2.3 + - githash ==0.1.3.1 + - github-release ==1.2.4 - github-types ==0.2.1 - github-webhooks ==0.10.0 - gitrev ==1.3.1 @@ -880,16 +880,17 @@ default-package-overrides: - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.3.8.0 + - hapistrano ==0.3.9.0 - happy ==1.19.9 + - hasbolt ==0.1.3.2 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - hashtables ==1.2.3.1 - - haskeline ==0.7.4.3 + - haskeline ==0.7.5.0 - haskell-gi ==0.21.5 - - haskell-gi-base ==0.21.4 + - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - haskell-lsp ==0.8.0.1 @@ -905,7 +906,7 @@ default-package-overrides: - haskoin-core ==0.8.4 - hasql ==1.3.0.3 - hasql-optparse-applicative ==0.3.0.3 - - hasql-pool ==0.5 + - hasql-pool ==0.5.0.1 - hasql-transaction ==0.7 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 @@ -921,8 +922,10 @@ default-package-overrides: - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 + - hedn ==0.2.0.0 - here ==1.2.13 - heredoc ==0.2.0.0 + - heterocephalus ==1.0.5.3 - hex ==0.1.2 - hexml ==0.3.4 - hexml-lens ==0.2.1 @@ -1002,7 +1005,7 @@ default-package-overrides: - hspec-leancheck ==0.0.3 - hspec-megaparsec ==2.0.0 - hspec-meta ==2.6.0 - - hspec-need-env ==0.1.0.2 + - hspec-need-env ==0.1.0.3 - hspec-pg-transact ==0.1.0.2 - hspec-smallcheck ==0.5.2 - hspec-wai ==0.9.2 @@ -1075,7 +1078,7 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.2 - hyphenation ==0.7.1 - - hyraxAbif ==0.2.3.10 + - hyraxAbif ==0.2.3.15 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1094,7 +1097,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.4 - - influxdb ==1.6.1 + - influxdb ==1.6.1.1 - ini ==0.3.6 - inline-c ==0.7.0.1 - inline-c-cpp ==0.3.0.1 @@ -1146,7 +1149,7 @@ default-package-overrides: - js-jquery ==3.3.1 - json ==0.9.3 - json-alt ==1.0.0 - - json-feed ==1.0.5 + - json-feed ==1.0.6 - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.5 @@ -1172,7 +1175,7 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.7 + - lackey ==1.0.8 - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 @@ -1191,7 +1194,7 @@ default-package-overrides: - lazyio ==0.1.0.4 - lca ==0.3.1 - leancheck ==0.8.0 - - leancheck-instances ==0.0.1 + - leancheck-instances ==0.0.2 - leapseconds-announced ==2017.1.0.1 - lens ==4.17 - lens-action ==0.2.3 @@ -1203,7 +1206,7 @@ default-package-overrides: - lens-labels ==0.3.0.1 - lens-misc ==0.0.2.0 - lens-properties ==4.11.1 - - lens-regex ==0.1.0 + - lens-regex ==0.1.1 - lens-simple ==0.1.0.9 - lens-typelevel ==0.1.1.0 - lenz ==0.3.0.0 @@ -1225,7 +1228,7 @@ default-package-overrides: - List ==0.6.2 - ListLike ==4.6 - listsafe ==0.1.0.1 - - list-t ==1.0.2 + - list-t ==1.0.3 - ListTree ==0.2.3 - llvm-hs-pure ==7.0.0 - lmdb ==0.2.5 @@ -1275,14 +1278,14 @@ default-package-overrides: - mbox ==0.3.4 - mbox-utility ==0.0.1 - mbtiles ==0.6.0.0 - - mbug ==1.3 + - mbug ==1.3.2 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - megaparsec ==7.0.4 - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 - - mercury-api ==0.1.0.1 + - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 - metrics ==0.4.1.1 @@ -1371,7 +1374,7 @@ default-package-overrides: - mwc-probability ==2.0.4 - mwc-probability-transition ==0.4 - mwc-random ==0.14.0.0 - - mysql ==0.1.6 + - mysql ==0.1.7 - mysql-haskell ==0.8.4.1 - mysql-haskell-nem ==0.1.0.0 - mysql-simple ==0.4.5 @@ -1451,7 +1454,7 @@ default-package-overrides: - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.2.2 - - OpenGLRaw ==3.3.1.0 + - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 - openssl-streams ==1.2.1.3 @@ -1511,7 +1514,7 @@ default-package-overrides: - persist ==0.1.1.1 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.9.0 + - persistent ==2.9.1 - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.1 @@ -1558,6 +1561,7 @@ default-package-overrides: - postgresql-libpq ==0.9.4.2 - postgresql-schema ==0.1.14 - postgresql-simple ==0.6 + - postgresql-simple-migration ==0.1.14.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 @@ -1611,15 +1615,15 @@ default-package-overrides: - protolude ==0.2.3 - proxied ==0.3 - psql-helpers ==0.1.0.0 - - psqueues ==0.2.7.0 + - psqueues ==0.2.7.1 - pureMD5 ==2.1.3 - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.4 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.6 + - pusher-http-haskell ==1.5.1.7 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qnap-decrypt ==0.3.3 + - qnap-decrypt ==0.3.4 - quadratic-irrational ==0.0.6 - QuasiText ==0.1.2.6 - quickbench ==1.0 @@ -1649,8 +1653,8 @@ default-package-overrides: - rank2classes ==1.2 - Rasterific ==0.7.4.2 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.7 - - ratel-wai ==1.0.4 + - ratel ==1.0.8 + - ratel-wai ==1.0.5 - rattletrap ==6.0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1730,7 +1734,7 @@ default-package-overrides: - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - - salak ==0.1.4 + - salak ==0.1.7 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1738,14 +1742,14 @@ default-package-overrides: - sampling ==0.3.3 - sandman ==0.2.0.1 - say ==0.1.0.1 - - sbp ==2.4.6 + - sbp ==2.4.7 - sbv ==7.13 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanf ==0.1.0.0 - scanner ==0.3 - scientific ==0.3.6.2 - - scotty ==0.11.2 + - scotty ==0.11.3 - scrypt ==0.5.0 - sdl2 ==2.4.1.0 - sdl2-gfx ==0.2 @@ -1771,7 +1775,7 @@ default-package-overrides: - servant-auth ==0.3.2.0 - servant-auth-client ==0.3.3.0 - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.2.0 + - servant-auth-server ==0.4.3.0 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.8 - servant-cassava ==0.10 @@ -1815,11 +1819,11 @@ default-package-overrides: - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 - - shelly ==1.8.1 + - shelly ==1.8.0 - shikensu ==0.3.11 - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - - show-combinators ==0.1.0.0 + - show-combinators ==0.1.1.0 - show-prettyprint ==0.2.2 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 @@ -1828,7 +1832,7 @@ default-package-overrides: - simple-log ==0.9.10 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - - simple-vec3 ==0.4.0.9 + - simple-vec3 ==0.4.0.10 - since ==0.0.0 - singleton-bool ==0.1.4 - singleton-nats ==0.4.2 @@ -1875,6 +1879,7 @@ default-package-overrides: - sql-words ==0.1.6.2 - srcloc ==0.5.1.2 - stache ==2.0.1 + - stack2nix ==0.2.2 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 @@ -1898,7 +1903,7 @@ default-package-overrides: - store ==0.5.0.1 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - - stratosphere ==0.29.0 + - stratosphere ==0.29.1 - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 @@ -1918,8 +1923,9 @@ default-package-overrides: - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.0 - - strive ==5.0.7 + - strive ==5.0.8 - structs ==0.1.1 + - stylish-haskell ==0.9.2.1 - summoner ==1.2.0 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 @@ -1952,7 +1958,7 @@ default-package-overrides: - tao ==1.0.0 - tao-example ==1.0.0 - tar ==0.5.1.0 - - tar-conduit ==0.3.1 + - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - tasty ==1.2 - tasty-ant-xml ==1.1.5 @@ -1980,7 +1986,7 @@ default-package-overrides: - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - - tensors ==0.1.1 + - tensors ==0.1.2 - termbox ==0.1.0 - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 @@ -2007,6 +2013,7 @@ default-package-overrides: - text-printer ==0.5 - text-region ==0.3.1.0 - text-short ==0.1.2 + - text-show ==3.7.5 - tfp ==1.0.1.1 - tf-random ==0.5 - th-abstraction ==0.2.10.0 @@ -2028,7 +2035,7 @@ default-package-overrides: - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - - th-utilities ==0.2.0.1 + - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 - tile ==0.3.0.0 - time-compat ==0.1.0.3 @@ -2074,7 +2081,7 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.13 - - typed-process ==0.2.3.0 + - typed-process ==0.2.4.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2200,7 +2207,7 @@ default-package-overrides: - warp-tls-uid ==0.2.0.5 - wave ==0.1.5 - wcwidth ==0.0.2 - - web3 ==0.8.2.1 + - web3 ==0.8.3.0 - webdriver ==0.8.5 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 @@ -2265,6 +2272,7 @@ default-package-overrides: - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0 + - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-isogen ==0.3.0 - xml-lens ==0.1.6.3 @@ -2277,6 +2285,8 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 + - yam ==0.5.11 + - yam-datasource ==0.5.11 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 @@ -2285,7 +2295,7 @@ default-package-overrides: - yesod-alerts ==0.1.2.0 - yesod-auth ==1.6.5 - yesod-auth-hashdb ==1.7.1 - - yesod-auth-oauth2 ==0.6.0.0 + - yesod-auth-oauth2 ==0.6.1.0 - yesod-bin ==1.6.0.3 - yesod-core ==1.6.9 - yesod-csp ==0.2.4.0 @@ -2302,7 +2312,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.5.1 + - yesod-test ==1.6.6 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 @@ -2366,6 +2376,7 @@ extra-packages: - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors - mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0 + - megaparsec < 7.0 # required for idris <= 1.3.1: https://github.com/idris-lang/Idris-dev/pull/4610 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -5436,7 +5447,6 @@ dont-distribute-packages: hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaTeX: [ i686-linux, x86_64-linux, x86_64-darwin ] hats: [ i686-linux, x86_64-linux, x86_64-darwin ] hatt: [ i686-linux, x86_64-linux, x86_64-darwin ] haven: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8984,7 +8994,6 @@ dont-distribute-packages: stack-run: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-type: [ i686-linux, x86_64-linux, x86_64-darwin ] stack2cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index fc2c008be0c8..77bde5c85b72 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -78,6 +78,7 @@ in # same package in the (recursive) dependencies of the package being # built. Will delay failures, if any, to compile time. allowInconsistentDependencies ? false +, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 } @ args: assert editedCabalFile != null -> revision != null; @@ -250,6 +251,7 @@ stdenv.mkDerivation ({ '' + postPatch; setupCompilerEnvironmentPhase = '' + NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) runHook preSetupCompilerEnvironment echo "Build with ${ghc}." diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2ac7481cfd75..16a413a03f19 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8927,7 +8927,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -9181,17 +9180,17 @@ self: { }) {}; "HasCacBDD" = callPackage - ({ mkDerivation, base, Cabal, CacBDD, directory, process + ({ mkDerivation, base, Cabal, CacBDD, directory, hspec, process , QuickCheck }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.0"; - sha256 = "1dp4glfvd3ihaq2k3y40h7yz29c5lh76mjdzjcqb0ixvkh13d7dy"; + version = "0.1.0.1"; + sha256 = "0mvhhwgz2k46d2adrrs5bhc4x2yx3zr5fwi2nnxzrjhm1ki9b8zb"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "Haskell bindings for CacBDD"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -9326,8 +9325,8 @@ self: { }: mkDerivation { pname = "HaskellNet-SSL"; - version = "0.3.4.0"; - sha256 = "03q48g4gzmhjl4a5wwn0q3man8s44pn028a0fidjpmfmgxa95bl3"; + version = "0.3.4.1"; + sha256 = "0j36zcx5vfg4jzc7vvfj4ifcvcgyy2sn9rxnxj3vg2cw77idqyp1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring connection data-default HaskellNet network tls @@ -9967,6 +9966,8 @@ self: { pname = "HsOpenSSL"; version = "0.11.4.15"; sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff"; + revision = "1"; + editedCabalFile = "0bkcw2pjfgv1bhgkrpncvwq9czfr7cr4ak14n0v8c2y33i33wk5z"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -9975,6 +9976,23 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_16" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.16"; + sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19"; + revision = "1"; + editedCabalFile = "0hc113g6jp7ci5gxx2chhp1h64nzx47c4ahwisyqgs3f6prm6dqr"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -10288,6 +10306,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.1.2"; + sha256 = "0zpjji441ys2x6zmndyg7203w3j4j8flhwrl4593a6bz6vqzkwwb"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -13123,20 +13160,20 @@ self: { }) {inherit (pkgs) net_snmp;}; "Network-NineP" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, convertible - , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl - , network, NineP, regex-posix, stateref, transformers + ({ mkDerivation, async, base, binary, bytestring, containers + , convertible, exceptions, hslogger, monad-loops, monad-peel + , mstate, mtl, network, NineP, regex-posix, stateref, transformers }: mkDerivation { pname = "Network-NineP"; - version = "0.4.4"; - sha256 = "119v9iimpgd5cym5q7az0gg70irja9034r2mhvq2k4ygmmz0lazy"; + version = "0.4.5"; + sha256 = "1s11idqg8bvimhal86569wlw746cyyq67dxvvabnbn3q23mjkflh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers convertible exceptions hslogger - monad-loops monad-peel mstate mtl network NineP regex-posix - stateref transformers + async base binary bytestring containers convertible exceptions + hslogger monad-loops monad-peel mstate mtl network NineP + regex-posix stateref transformers ]; description = "High-level abstraction over 9P protocol"; license = "unknown"; @@ -13839,22 +13876,6 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.1.0"; - sha256 = "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ libGL ]; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL;}; - - "OpenGLRaw_3_3_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, libGL - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; version = "3.3.2.0"; sha256 = "1qy41qpqmksvgy7j73b46ksvm00mh6amgy9n9wkal4czkaj26kpj"; libraryHaskellDepends = [ @@ -13863,7 +13884,6 @@ self: { librarySystemDepends = [ libGL ]; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage @@ -15101,6 +15121,8 @@ self: { pname = "QuickCheck"; version = "2.12.6.1"; sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; + revision = "1"; + editedCabalFile = "0w5gygp6pmyjzjjx5irfflcbx586zfnqidq669ssqqfsadf944xv"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -17319,14 +17341,14 @@ self: { }) {}; "Stack" = callPackage - ({ mkDerivation, base, nats, stm }: + ({ mkDerivation, base, deepseq, nats, stm }: mkDerivation { pname = "Stack"; - version = "0.3.2"; - sha256 = "1rap4xyldzwj26r8mbvzkyy9021q8h06pz8cyd061vyslrl7p89b"; - revision = "1"; - editedCabalFile = "1ngyrylqmc2fc088d49pn41nlps3mqjimh0y8wc6nmpkay5pj0m8"; - libraryHaskellDepends = [ base nats stm ]; + version = "0.4.0"; + sha256 = "0i8frm923gkk9h8z38jijrd43dfsj9rwzxhwj6xv57rq7l3nq583"; + revision = "2"; + editedCabalFile = "1n4zyl9iagzjx3i3zb5w24mf5x51nwwnnzrrc1rgkflvxlirm9md"; + libraryHaskellDepends = [ base deepseq nats stm ]; description = "Stack data structure"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -18581,25 +18603,29 @@ self: { "VKHS" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, clock, containers, data-default-class - , directory, filepath, http-client, http-client-tls, http-types - , mtl, network-uri, optparse-applicative, parsec, pipes, pipes-http - , pretty-show, regexpr, scientific, split, tagsoup, text, time + , directory, filepath, flippers, hashable, http-client + , http-client-tls, http-types, mtl, network-uri + , optparse-applicative, parsec, pipes, pipes-http, pretty-show + , process, regexpr, scientific, split, tagsoup, text, time , utf8-string, vector }: mkDerivation { pname = "VKHS"; - version = "1.9.1"; - sha256 = "1jhllxylsclshs027vinx5p3rql3964dy4p37q916g4g58ml83j6"; + version = "1.9.2"; + sha256 = "0axipbapshpdybzaiklcyyzly1awnfmpg7q2hqf3sy97rw72blbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive clock - containers data-default-class directory filepath http-client - http-client-tls http-types mtl network-uri optparse-applicative - parsec pipes pipes-http pretty-show scientific split tagsoup time - utf8-string vector + containers data-default-class directory filepath flippers hashable + http-client http-client-tls http-types mtl network-uri + optparse-applicative parsec pipes pipes-http pretty-show process + regexpr scientific split tagsoup text time utf8-string vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath mtl optparse-applicative parsec + regexpr text ]; - executableHaskellDepends = [ regexpr text ]; description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -20657,6 +20683,8 @@ self: { pname = "acid-state"; version = "0.14.3"; sha256 = "1d8hq8cj6h4crfnkmds6mhrhhg7r1b1byb8fybaj8khfa99sj0nm"; + revision = "1"; + editedCabalFile = "1sff496w6wpvs88jjk8306zvf0z1169g9n0y99sglqgzb03bw6gp"; libraryHaskellDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -20760,6 +20788,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-circular-containers" = callPackage + ({ mkDerivation, base, containers, doctest, doctest-discover + , graph-wrapper + }: + mkDerivation { + pname = "acme-circular-containers"; + version = "0.1.0.0"; + sha256 = "1xngqlx0avn84qx696hjm8cdqqs9p0ls90kklkz5rs48fbcma3pr"; + libraryHaskellDepends = [ base containers graph-wrapper ]; + testHaskellDepends = [ + base containers doctest doctest-discover graph-wrapper + ]; + description = "Spineless containers which are fast to read but inefficient to update"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "acme-cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -22030,6 +22074,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-gadt-th" = callPackage + ({ mkDerivation, aeson, base, dependent-sum, template-haskell }: + mkDerivation { + pname = "aeson-gadt-th"; + version = "0.1.1.0"; + sha256 = "1s3458ijiigkf1id53w24p1q71flpcd7acnqj4zb03fw6qm60f1v"; + libraryHaskellDepends = [ + aeson base dependent-sum template-haskell + ]; + description = "Derivation of Aeson instances for GADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-generic-compat" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -22437,18 +22494,17 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, bytestring, foldl - , json-pointer, json-pointer-aeson, mtl-prelude, scientific, text - , transformers, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, foldl, json-pointer + , json-pointer-aeson, mtl, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.12.4"; - sha256 = "0ya2gbyf2gg1psbmm1cz7qbv9m9kp3lls9rzzkmadhxnqr1wfn2f"; + version = "0.13"; + sha256 = "0iindqkzlfjdhns7nj8dpmsiq91pm19nd8cr3if1qf0zvjj0nx5q"; libraryHaskellDepends = [ - aeson base-prelude bytestring foldl json-pointer json-pointer-aeson - mtl-prelude scientific text transformers unordered-containers - vector + aeson base bytestring foldl json-pointer json-pointer-aeson mtl + scientific text transformers unordered-containers vector ]; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; @@ -29019,15 +29075,15 @@ self: { pname = "armor"; version = "0.1"; sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; - revision = "1"; - editedCabalFile = "075nxkch0azmf4fkrnckwsr9s7bmxpm38xbwkj9kak3lsfaml4sk"; + revision = "3"; + editedCabalFile = "1aksr6s5hcvxjjxd95z4n0xadhdpvz8l75906v5f18p7gkk6sjm7"; libraryHaskellDepends = [ base bytestring containers directory filepath HUnit lens ]; testHaskellDepends = [ aeson base bytestring containers directory hspec HUnit lens text ]; - description = "Armor data structures against serialization backwards compatibility problems"; + description = "Prevent serialization backwards compatibility problems using golden tests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -31357,6 +31413,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "automata" = callPackage + ({ mkDerivation, base, bytestring, containers, contiguous + , enum-types, HUnit, leancheck, leancheck-enum-instances, primitive + , primitive-containers, QuickCheck, quickcheck-classes + , quickcheck-enum-instances, semirings, tasty, tasty-hunit + , tasty-leancheck, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "automata"; + version = "0.1.0.0"; + sha256 = "1xb0rqnkykazg7m50dsxa5pxfd2096wmqbwli01j7wxw8lrqcy9i"; + libraryHaskellDepends = [ + base bytestring containers contiguous primitive + primitive-containers semirings transformers + ]; + testHaskellDepends = [ + base containers enum-types HUnit leancheck leancheck-enum-instances + primitive QuickCheck quickcheck-classes quickcheck-enum-instances + tasty tasty-hunit tasty-leancheck tasty-quickcheck + ]; + description = "automata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "automitive-cse" = callPackage ({ mkDerivation, base, bytestring, cereal, cryptonite, memory , quickcheck-simple @@ -31506,8 +31586,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "28"; - editedCabalFile = "1x653r0x4frpp78jncvr91kc7g41i9c3s561cizyh518318lvsnr"; + revision = "29"; + editedCabalFile = "07vc32yn5d954higzxg3c94l3wzgc38b7y2xq8c5rkxwqz8xf97s"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -32646,8 +32726,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.51"; - sha256 = "1mjylfxw7ivmxma7kskjs7plcd9wxknfd9slxb7zjgawzksdv3bq"; + version = "0.5.61"; + sha256 = "0yr29ynxiwc2qr000c5h1w3k373qvbr5p8z451r3q24i4c6rcrid"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36696,8 +36776,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.0.0"; - sha256 = "11f1lf19a78795id30hdxa6h52jwcmjq4jbmm1qaw6lgjfkzfg6a"; + version = "0.1.0.1"; + sha256 = "1xnv6zg9rc8klsjvaqf524pvplhizydjdrfybxnfjsi4d3kp612g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36739,6 +36819,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bisc" = callPackage + ({ mkDerivation, base, directory, filepath, selda, selda-sqlite + , text, xdg-basedir + }: + mkDerivation { + pname = "bisc"; + version = "0.1.0.0"; + sha256 = "16gjnqjp1rhsi59nxhx24zxwabzk75wiz97163pd657j02a5mwl0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath selda selda-sqlite text xdg-basedir + ]; + description = "A small tool that clears qutebrowser cookies"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "bisect-binary" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hashable , haskeline, integer-logarithms, optparse-applicative, process @@ -37726,8 +37823,8 @@ self: { }: mkDerivation { pname = "blas-carray"; - version = "0.0.1.1"; - sha256 = "0ijzcdrbfb9w3vs4g96p30h7ilh9s05ij8n0prinmr1ngmvipbdx"; + version = "0.1.0.1"; + sha256 = "1aqphwgzcryzfzjzsv6ph4kcmswqd7mgs65dj8lsjzkhfc6izggl"; libraryHaskellDepends = [ base blas-ffi carray netlib-carray netlib-ffi storable-complex transformers @@ -37737,6 +37834,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blas-comfort-array" = callPackage + ({ mkDerivation, base, blas-ffi, comfort-array + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "blas-comfort-array"; + version = "0.0.0.1"; + sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb"; + libraryHaskellDepends = [ + base blas-ffi comfort-array netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran BLAS via comfort-array"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blas-ffi" = callPackage ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { @@ -39389,8 +39502,8 @@ self: { ({ mkDerivation, base, directory, process }: mkDerivation { pname = "brainfuck-monad"; - version = "0.5.0"; - sha256 = "0dr371scgb6hc43vdj2fbic9z1aw4bfhnc910y22a9y26kcldp2g"; + version = "0.5.1"; + sha256 = "1y0dz80q2rniz23b0m2dircyl244id9888pblaqj8d4zcapsnsww"; libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; license = stdenv.lib.licenses.bsd3; @@ -39536,6 +39649,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick-filetree" = callPackage + ({ mkDerivation, base, brick, comonad, containers, directory + , directory-tree, filepath, free, vector, vty + }: + mkDerivation { + pname = "brick-filetree"; + version = "0.1.0.2"; + sha256 = "0ppc2y407db7kx8hzrjbx3qhd4w39d5p4zra3bxsc99ny9aqbrmk"; + libraryHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + testHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty @@ -42450,8 +42582,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.2.2"; - sha256 = "1rb7z4lslqsf8ipsyy7nc3mz4ixz5f5cv5jn5nidj0pc5rl16sxw"; + version = "2.2.2.1"; + sha256 = "0jv335b6vz1y6jp381hhrb2miniyqzkn18ansc67as04yf3ngmay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -44915,25 +45047,6 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.7.0"; - sha256 = "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cereal_0_5_8_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; version = "0.5.8.0"; sha256 = "10j205g4w311ypk24ds2nmv1816s8645788s6a1vrfippa56dlrp"; libraryHaskellDepends = [ @@ -44945,7 +45058,6 @@ self: { ]; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -48519,6 +48631,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "clumpiness_0_17_0_2" = callPackage + ({ mkDerivation, base, containers, tree-fun }: + mkDerivation { + pname = "clumpiness"; + version = "0.17.0.2"; + sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc"; + libraryHaskellDepends = [ base containers tree-fun ]; + description = "Calculate the clumpiness of leaf properties in a tree"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cluss" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -50078,8 +50202,8 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.2"; - sha256 = "0h8qn36ivxd2bc7cmqgyfa54jlwcfwr3rwpfp02p0yxqb4q03z45"; + version = "0.3"; + sha256 = "0vwp11vcw6h9shrafqgpiqbdm2ni9ad18z2r644hspxcrs24r4d6"; libraryHaskellDepends = [ base deepseq guarded-allocation non-empty primitive QuickCheck storable-record transformers utility-ht @@ -51761,41 +51885,6 @@ self: { "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit - , conduit-combinators, conduit-extra, containers, criterion - , deepseq, directory, exceptions, HUnit, lzma-conduit - , monad-control, mtl, pqueue, resourcet, stm, stm-conduit - , streaming-commons, test-framework, test-framework-hunit - , test-framework-th, transformers, unliftio-core, vector - }: - mkDerivation { - pname = "conduit-algorithms"; - version = "0.0.8.2"; - sha256 = "1s423n2hybxdsady7spi4iy9s5lm07dsl0rjxn400y09faizm5x8"; - libraryHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq exceptions lzma-conduit - monad-control mtl pqueue resourcet stm stm-conduit - streaming-commons transformers unliftio-core vector - ]; - testHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory exceptions HUnit - lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit - streaming-commons test-framework test-framework-hunit - test-framework-th transformers unliftio-core vector - ]; - benchmarkHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers criterion deepseq exceptions lzma-conduit - monad-control mtl pqueue resourcet stm stm-conduit - streaming-commons transformers unliftio-core vector - ]; - description = "Conduit-based algorithms"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-algorithms_0_0_9_0" = callPackage - ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit , monad-control, mtl, pqueue, resourcet, stm, stm-conduit @@ -51827,7 +51916,6 @@ self: { ]; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -52710,6 +52798,8 @@ self: { pname = "connection"; version = "0.2.8"; sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; + revision = "1"; + editedCabalFile = "15qdwqqjv60w14m319a58yjmhzr39dydsnk6r26ydkwxwh23rk73"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -52997,12 +53087,19 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, base, constraints, template-haskell }: + ({ mkDerivation, aeson, base, constraints, markdown-unlit + , template-haskell + }: mkDerivation { pname = "constraints-extras"; - version = "0.2.1.0"; - sha256 = "17rz4j5xgh4qn8ngd4b2814zdp1c59mcksg9jxbln6nvzvw7q0ng"; + version = "0.2.3.0"; + sha256 = "09qa30zgh6w7k5nl1gvr18nhl5cfnnrzzlmafn9hvp8hms6837ic"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; + executableHaskellDepends = [ + aeson base constraints markdown-unlit + ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -55791,25 +55888,6 @@ self: { }: mkDerivation { pname = "crypto-enigma"; - version = "0.1.1.4"; - sha256 = "17bggc1wz1qp0midriwwackm86w148r6y8ph3x0nsxblqzw8021z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers split text ]; - executableHaskellDepends = [ - ansi-terminal base containers optparse-applicative split text - ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_1_1_5" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, HUnit - , optparse-applicative, QuickCheck, split, text - }: - mkDerivation { - pname = "crypto-enigma"; version = "0.1.1.5"; sha256 = "001kl84ngfwr644v7dyk5shkqfw606bpza8b61bv4p4lqyfk96l2"; isLibrary = true; @@ -55821,7 +55899,6 @@ self: { testHaskellDepends = [ base HUnit QuickCheck ]; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -56272,6 +56349,8 @@ self: { pname = "cryptol"; version = "2.6.0"; sha256 = "0hlgff177s8lhv3s90cmqc3x2xr60g3vxvc7p1mhzb354zxbp2jz"; + revision = "1"; + editedCabalFile = "1smkc0gxbj1vl626iiy56aarx6rcnjzqprqzh443222samrrzr25"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -56448,8 +56527,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.5"; - sha256 = "12zwf2xiqiq4snwqhwvk1k3fl1bzlfbcd2vc2hsnv6v61ci6shq9"; + version = "0.1.0.6"; + sha256 = "0i4sr9qf78fs841j8d9rkdd73dm9i34rj6sp0475r3pnj7czqcq6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59387,6 +59466,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-ref_0_0_2" = callPackage + ({ mkDerivation, base, data-accessor, stm, transformers }: + mkDerivation { + pname = "data-ref"; + version = "0.0.2"; + sha256 = "0xqgzcpp9b0y2w5h1nln529dizdplhpfl41vxvbhxxcdkng3j53v"; + libraryHaskellDepends = [ base data-accessor stm transformers ]; + description = "Unify STRef and IORef in plain Haskell 98"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-reify" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -60266,8 +60357,8 @@ self: { pname = "dbus"; version = "0.10.15"; sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4"; - revision = "1"; - editedCabalFile = "04fy208xlvdyi2ms9c2l2xd7jwi6vd0wzpv2v2s0bc2icha79rih"; + revision = "2"; + editedCabalFile = "0v9k4yrpzpkk3k33gp3z8qmv0q6kf0d6xps3ar4d3xs9ybrwvg0c"; libraryHaskellDepends = [ base bytestring cereal containers deepseq libxml-sax network parsec random text transformers unix vector xml-types @@ -60296,6 +60387,8 @@ self: { pname = "dbus"; version = "1.2.1"; sha256 = "1mxijj32lvl6dxkpz95mxywq2hrj7krc9r8q41zbyqqx0hvc3n4r"; + revision = "1"; + editedCabalFile = "1n725klx5p6z63gxi18q4q4k4q0x03pxw54f22n7mbqd2i1nsg9c"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -60312,6 +60405,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_3" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.3"; + sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -60848,8 +60969,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.93.3"; - sha256 = "0wjkk6dnps837pnsh75cf1093587r6yxg8fhjz8jrw06y2g85fzn"; + version = "3.93.5"; + sha256 = "0nncxa65lhdvypnx1j7v179v4pk2jfglxzs88p9cka2nr095hs55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61487,8 +61608,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "1.11.0.4"; - sha256 = "0zks4mqdndlyg8mqa1gshwahcqn45zawksgp738crls3yafgh9dg"; + version = "1.11.0.5"; + sha256 = "18pcjk60r1q798qba285g20fh8v5q2qphgpx3r0a0yy7p1qnjwv2"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -61497,6 +61618,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_1_12_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "1.12.0.0"; + sha256 = "1nkpqd7alnw383lkhbfqxfj2apks2gw84bk59f2agmiry5pbcs3p"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -62008,8 +62146,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.4"; - sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis"; + version = "2.6.5"; + sha256 = "1rfh7pahrksjzypdkrs8wcijybdwnv2wlkiqax7svn11wgnym3c1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62191,6 +62329,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_4" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.4"; + sha256 = "0kd76zvaj84391k9847q3zdvw5hlkdw3qwncysfbsvsh4g9glqwr"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -64576,8 +64738,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "0.7.0"; - sha256 = "0zq9aaarh34c24ih49ap5bblswpzc1nwcp8rw8bw1j4agp2ndpy0"; + version = "0.7.1"; + sha256 = "0cl40ph5qwpxa05q7jr67syq9dijxyzvmqzgw53wfri4800qxphn"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default http-client iso8601-time JuicyPixels MonadRandom req @@ -65885,6 +66047,8 @@ self: { pname = "dns"; version = "3.0.4"; sha256 = "1aa4zb9zkk244rndimrq8maxj9qrmz3rb13v9n8jblmp6ssk6d3v"; + revision = "1"; + editedCabalFile = "15jafrm919w4p23m7kpmyc1yvzpy88jcccycc00dza69d119zjdr"; libraryHaskellDepends = [ async attoparsec auto-update base base64-bytestring binary bytestring containers cryptonite iproute mtl network psqueues safe @@ -68028,8 +68192,8 @@ self: { }: mkDerivation { pname = "dynamic-graphs"; - version = "0.1.0.2"; - sha256 = "0fy64gfkg6vhhyzay0wh2dis423j8xbcdjzfl06h8hbrb0gb8p7r"; + version = "0.1.0.3"; + sha256 = "1zwrvpg8nxc4lx3mc5jaj1fcbg1hhk4b52ng4qh5r57xkhqj6xg5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68038,8 +68202,9 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers deepseq hashable mwc-random - primitive QuickCheck test-framework test-framework-quickcheck2 - test-framework-th text unordered-containers + primitive QuickCheck semigroups test-framework + test-framework-quickcheck2 test-framework-th text + unordered-containers ]; benchmarkHaskellDepends = [ base criterion primitive ]; description = "Dynamic graph algorithms"; @@ -70238,6 +70403,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_10" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.10"; + sha256 = "0wfk5dkpaw0gk4p0vwdpb24c6kz4gjx0z4am79v5c3k38gmb3rak"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -72239,6 +72421,8 @@ self: { pname = "euler-tour-tree"; version = "0.1.1.0"; sha256 = "166gbinlf0ay8y2clzjzf5b2x489hcr1gzj8w5qk341z01f8pckh"; + revision = "1"; + editedCabalFile = "0rix7nslzfdds5hz2hvam8dydndhv04xg10wazf7l37q88gk880w"; libraryHaskellDepends = [ base containers fingertree mtl parser-combinators transformers Unique @@ -72691,42 +72875,6 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.2.0"; - sha256 = "03ckizx7phz6jykj10s1vj7wfc454qzjq04jrmqhxsbrrqilhyk3"; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base machines - monad-control monad-logger mono-traversable mtl protobuf random - safe safe-exceptions semigroups stm stm-chans streaming text time - transformers-base unordered-containers uuid - ]; - testHaskellDepends = [ - aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger hashable lifted-async - lifted-base monad-control mono-traversable protobuf safe - safe-exceptions semigroups stm stm-chans streaming tasty - tasty-hspec tasty-hunit text time transformers-base - unordered-containers uuid - ]; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_1_2_1" = callPackage - ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring - , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, hashable, http-client - , interpolate, lifted-async, lifted-base, machines, monad-control - , monad-logger, mono-traversable, mtl, protobuf, random, safe - , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty - , tasty-hspec, tasty-hunit, text, time, transformers-base - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; version = "1.2.1"; sha256 = "1yya52bk3sgfgrarf88a3n7i0jdwr1hd615a17ixxbb1vc9v44y8"; libraryHaskellDepends = [ @@ -73728,25 +73876,26 @@ self: { "expresso" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable , haskeline, mtl, parsec, tasty, tasty-hunit, template-haskell - , terminfo, text, unordered-containers, wl-pprint + , text, unordered-containers, wl-pprint }: mkDerivation { pname = "expresso"; - version = "0.1.1.0"; - sha256 = "1c0mibbgwdxz36qr02nc31mpg6d3l9mgjfqwy174ib2kv3wndivh"; + version = "0.1.2.0"; + sha256 = "15s4gpf7pv6wv13q5i1cff7s93nx5vb8gyjfm4ifz76ki3xafgcn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - template-haskell terminfo text unordered-containers wl-pprint + template-haskell text unordered-containers wl-pprint ]; executableHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - terminfo text unordered-containers wl-pprint + text unordered-containers wl-pprint ]; testHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - tasty tasty-hunit terminfo text unordered-containers wl-pprint + tasty tasty-hunit text unordered-containers wl-pprint ]; description = "A simple expressions language based on row types"; license = stdenv.lib.licenses.bsd3; @@ -74253,8 +74402,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; - version = "0.1.0.3"; - sha256 = "1kmp5xgsj5yv4h9q3h1r73z6pb9cj6kb4i458rb322l6w88ci0rf"; + version = "0.1.1.0"; + sha256 = "0wg4jhilnyqxs6kqikbli1ia6xl4hi4hipdc1pp1f2d2gxgg0afb"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -74847,8 +74996,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.1"; - sha256 = "05z8dyw1yf2bh42mrrk1d9rxqdz1p6gn8sjnpk66s2k76xrg4vm2"; + version = "0.24.0.2"; + sha256 = "00qm6n8ali6inqmm64mrcz414iwiin8zwpavq5w1hnrmvzlbazg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75403,6 +75552,8 @@ self: { pname = "feed"; version = "1.0.1.0"; sha256 = "076krkyvbh24s50chdw3nz6w2svwchys65ppjzlm8gy42ddhbgc7"; + revision = "1"; + editedCabalFile = "10xjd3syr70g3blnjy7xvd6s21y68vxsi69f6bmizpsylbfb0245"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -76532,8 +76683,8 @@ self: { }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.3.1"; - sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8"; + version = "0.2.3.2"; + sha256 = "1qid4dinkydpikw1a7q4zj3cx3bh7mzz7bfd8l1mz7fykdi8lwac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78216,8 +78367,8 @@ self: { pname = "fmt"; version = "0.6.1.1"; sha256 = "1bfj94ahc06xj6x5v5gmjzgw30cgxsc1vjygajqiqnanimbhn8i6"; - revision = "1"; - editedCabalFile = "13ypmyg0axadzhycfl0g1s73bk9a2myshf38y8dslf3hlg76wbmv"; + revision = "2"; + editedCabalFile = "1prdnb8a8n338clkvjx0c8hmbkiy8x2c9j87b94302bq6x7rmf9d"; libraryHaskellDepends = [ base base64-bytestring bytestring call-stack containers formatting microlens text time time-locale-compat @@ -79097,14 +79248,17 @@ self: { }) {}; "forsyde-shallow" = callPackage - ({ mkDerivation, base, directory, hspec, old-time, process, random + ({ mkDerivation, base, directory, doctest, hspec, old-time, process + , QuickCheck, random }: mkDerivation { pname = "forsyde-shallow"; - version = "3.3.3.0"; - sha256 = "0avpy9h0x30c6zbzfrf248k2il4w0hk5rnkcqaday7rgsf70cfc0"; + version = "3.4.0.0"; + sha256 = "0czrgfx22j94xp56mf4cwrz2rdw2id77va89xpjxxrhdzwzfsvcn"; libraryHaskellDepends = [ base directory old-time process random ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ + base directory doctest hspec old-time process QuickCheck random + ]; description = "ForSyDe's Haskell-embedded Domain Specific Language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79151,17 +79305,15 @@ self: { }) {}; "fortytwo" = callPackage - ({ mkDerivation, ansi-terminal, async, base, doctest, hspec - , process, text - }: + ({ mkDerivation, ansi-terminal, base, doctest, hspec, text }: mkDerivation { pname = "fortytwo"; - version = "1.0.4"; - sha256 = "0gbvhlsyhfslxrwkdldn15adj8f371rhx5qxfapcpqfa6pwbjsfd"; + version = "1.0.5"; + sha256 = "1jmvj3h70h31a906b8wvycqwl1spfqgdmwhzf5x84aykih5xlcfs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; - testHaskellDepends = [ async base doctest hspec process ]; + testHaskellDepends = [ base doctest hspec ]; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -81015,6 +81167,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "function-builder" = callPackage + ({ mkDerivation, base, tagged }: + mkDerivation { + pname = "function-builder"; + version = "0.1.0.4"; + sha256 = "1iiz1fx8m152wg55k6vgv8sf3zf9wvc9zmx2wca8yc38bki43h61"; + libraryHaskellDepends = [ base tagged ]; + description = "Create poly variadic functions for monoidal results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "function-combine" = callPackage ({ mkDerivation, base, data-type }: mkDerivation { @@ -83247,27 +83410,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.2.1"; - sha256 = "100mjmbjfzy431a52yqkq2rja0mb5zw8dbkpfbfy17rdkwwx2yn1"; - libraryHaskellDepends = [ - base genvalidity genvalidity-property hspec hspec-core QuickCheck - transformers validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-property hspec hspec-core - QuickCheck validity - ]; - description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "genvalidity-hspec_0_6_2_2" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-property - , hspec, hspec-core, QuickCheck, transformers, validity - }: - mkDerivation { - pname = "genvalidity-hspec"; version = "0.6.2.2"; sha256 = "1npy88slf7immafk1vgl6w9gp526xdlvhr96qnrc8phf7b7bfkrf"; libraryHaskellDepends = [ @@ -86448,8 +86590,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20181211"; - sha256 = "05zvi2z4fs2sprzgm31m6y1rhvwkhmjilvmgvyajzs12vzsaik6x"; + version = "7.20190122"; + sha256 = "0z5a5sskmjmayh1w9m48v7b81s1ybcglglry2jy1awdbn2l4mxk5"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" @@ -86852,25 +86994,6 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.3.0"; - sha256 = "0rnp5ljrb05kd127fy2s5jlxjvjfs50dar92pahb36w2qw2clnp7"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "githash_0_1_3_1" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, unliftio - }: - mkDerivation { - pname = "githash"; version = "0.1.3.1"; sha256 = "0vpwzbhnr0xwc7vkg3l5qy4awgsr1fkxj58lz6m56jayaad6hn7a"; libraryHaskellDepends = [ @@ -86882,7 +87005,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github" = callPackage @@ -86991,8 +87113,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.2.3"; - sha256 = "14jb82gybm2zwri05bqxsibwr29lhghcaj3n0171nbndqs0dyl0y"; + version = "1.2.4"; + sha256 = "1s4vmqrzq7w35kfij9pyxm9b672khhx03whi4adz6l51xij6a3yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87538,6 +87660,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_1_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "1.0.1"; + sha256 = "11s7fhlv3aq80h20jf2l447bmxy95dy7dqvzqfp0myy4hgsasks3"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -87833,8 +87976,8 @@ self: { pname = "glirc"; version = "2.29"; sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; - revision = "1"; - editedCabalFile = "0kjari98vcx5d1nfvxk8f6nx557hpy6njw7fj5p1lfdals81qifz"; + revision = "2"; + editedCabalFile = "0s37m39c3vnwskvbsiziysm9ck7l30bfkp2jg0l49dhi8v01q6cs"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -88234,13 +88377,14 @@ self: { "glue-common" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec - , lifted-base, monad-control, QuickCheck, quickcheck-instances - , text, time, transformers, transformers-base, unordered-containers + , hspec-discover, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "glue-common"; - version = "0.5"; - sha256 = "0wza8cmschfh6kk21wm2bz12ly3in7kf0cv6jma0a78fiphdwg2q"; + version = "0.6.1"; + sha256 = "1s4fm4cf88n4fw7alqb4jigw1pjh242jr7a8d9p52qcgkqn9qnwy"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -88250,6 +88394,7 @@ self: { QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88257,14 +88402,14 @@ self: { "glue-core" = callPackage ({ mkDerivation, async, base, ekg-core, glue-common, hashable - , hspec, lifted-base, monad-control, QuickCheck + , hspec, hspec-discover, lifted-base, monad-control, QuickCheck , quickcheck-instances, text, time, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "glue-core"; - version = "0.5"; - sha256 = "0x89h04j8z58nd1cx6rxn0hgjgb24kdzgl21m2xrlj7h1fp9fwfi"; + version = "0.6.1"; + sha256 = "0fmqir0wcyhgl154rzg93qxdmxzfpi05mckzg7mihkh57fsy4pk0"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -88274,6 +88419,7 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88281,14 +88427,14 @@ self: { "glue-ekg" = callPackage ({ mkDerivation, async, base, ekg-core, glue-common, hashable - , hspec, lifted-base, monad-control, QuickCheck + , hspec, hspec-discover, lifted-base, monad-control, QuickCheck , quickcheck-instances, text, time, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "glue-ekg"; - version = "0.5"; - sha256 = "0ckbmjizfclpdyzrc85l9hh79yl82rmbkim5gq543qnppi1pn4h6"; + version = "0.6.1"; + sha256 = "1pigh4s546mv4l2bnwrr6y8473bss0s8ydymr929bz2svrfyhlmz"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -88298,6 +88444,7 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88310,8 +88457,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.5"; - sha256 = "10nw8bzxbcghyy9xyb69ka3a3w66fysczhhgrshy462ihpw8p8bw"; + version = "0.6.1"; + sha256 = "1na0rnl0ac666man17xi4f5rg0zrw7f7ky44nfn2cag6398b109i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91935,15 +92082,23 @@ self: { }) {}; "grids" = callPackage - ({ mkDerivation, adjunctions, base, distributive, finite-typelits - , lens, vector + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , gauge, hspec, singletons, vector }: mkDerivation { pname = "grids"; - version = "0.1.1.0"; - sha256 = "048k7r9x7d6vfyhsspqawzjrabk30igf3049hjnji27xhpghr90k"; + version = "0.3.0.0"; + sha256 = "01i6izwlgkv4pc6sfywn8fg2s01x15q0lwxag3kzzhb63nm20kli"; libraryHaskellDepends = [ - adjunctions base distributive finite-typelits lens vector + adjunctions base comonad deepseq distributive singletons vector + ]; + testHaskellDepends = [ + adjunctions base comonad deepseq distributive hspec singletons + vector + ]; + benchmarkHaskellDepends = [ + adjunctions base comonad deepseq distributive gauge singletons + vector ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93066,6 +93221,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "guarded-allocation_0_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "guarded-allocation"; + version = "0.0.1"; + sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c"; + libraryHaskellDepends = [ base ]; + description = "Memory allocation with added stress tests and integrity checks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: mkDerivation { @@ -95629,20 +95796,21 @@ self: { }) {}; "hakyll-images" = callPackage - ({ mkDerivation, base, bytestring, hakyll, HUnit-approx - , JuicyPixels, JuicyPixels-extra, tasty, tasty-hunit + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hakyll, HUnit-approx, JuicyPixels, JuicyPixels-extra, tasty + , tasty-hunit }: mkDerivation { pname = "hakyll-images"; - version = "0.1.0"; - sha256 = "1l135gmlm2ydqj3d27gfarykcg6k1g204cysm3bk163f499b8w50"; + version = "0.4.2"; + sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring hakyll JuicyPixels JuicyPixels-extra + base binary bytestring hakyll JuicyPixels JuicyPixels-extra ]; testHaskellDepends = [ - base bytestring hakyll HUnit-approx JuicyPixels JuicyPixels-extra - tasty tasty-hunit + base binary bytestring directory filepath hakyll HUnit-approx + JuicyPixels JuicyPixels-extra tasty tasty-hunit ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; @@ -96383,8 +96551,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.8.0"; - sha256 = "1kkasqfx7k8sl22sklysxl76d5ljcm7p96hgcak7qgwwbj7igj56"; + version = "0.3.9.0"; + sha256 = "11b4aq2qpjnsvzcir9sldv4qpccipfffvcf4q8z6ji84hyf3zb3y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -96404,7 +96572,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hapistrano_0_3_9_0" = callPackage + "hapistrano_0_3_9_1" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path , path-io, process, QuickCheck, silently, stm, temporary, time @@ -96412,8 +96580,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.9.0"; - sha256 = "11b4aq2qpjnsvzcir9sldv4qpccipfffvcf4q8z6ji84hyf3zb3y"; + version = "0.3.9.1"; + sha256 = "0s2xhisyjx3d9rgzqcc09l2x3a8fkc5d7rdcrrcrgwz6vxcdv0pv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97505,8 +97673,8 @@ self: { pname = "hasbolt"; version = "0.1.3.2"; sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i"; - revision = "1"; - editedCabalFile = "127j24130d412ccn9zc71lxjfr6w0srbc8ir67s3zbmzs6g1l9j8"; + revision = "2"; + editedCabalFile = "1i6i3ykglq43aa63s39q31fhmn0r8qjr5v9x98q18xzfbxc30232"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default network text transformers @@ -98215,14 +98383,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_3" = callPackage + "haskeline_0_7_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.3"; - sha256 = "0ydnsr1nhh7mfgvbpclidcfbgzf7j8g5vnwxrnkmgg1dphq0jv84"; + version = "0.7.5.0"; + sha256 = "1inyq7qwih0hnqlm6gy769vsxzjpvqx9ry390dmcvvql9520hrfj"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -98718,19 +98886,18 @@ self: { }) {}; "haskell-gettext" = callPackage - ({ mkDerivation, base, binary, bytestring, bytestring-trie - , containers, filepath, haskell-src-exts, mtl, old-locale, parsec - , text, time, transformers, uniplate + ({ mkDerivation, base, binary, bytestring, containers, filepath + , haskell-src-exts, mtl, old-locale, parsec, text, time + , transformers, uniplate }: mkDerivation { pname = "haskell-gettext"; - version = "0.1.1.0"; - sha256 = "1kfqrm90my0h15f1x6n4fzzf9fvyicg87fqwbal37hj888jb0gv8"; + version = "0.1.2.0"; + sha256 = "1j7f8bcqqidgz3zbnlpy5v9adbp6yr9mla6b1a3m0gam9c7zlgin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bytestring-trie containers mtl parsec text - time transformers + base binary bytestring containers mtl parsec text time transformers ]; executableHaskellDepends = [ base filepath haskell-src-exts old-locale time uniplate @@ -98766,25 +98933,12 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.21.4"; - sha256 = "0vrl0cqws1l0ba7avf16c9zyfsvq7gd8wv4sjzd7rjk6jmg38vds"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_21_5" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; version = "0.21.5"; sha256 = "1pxnwljicxyxr83c7d8xvla7zbp2krv1n6fp4i2zh8bqwln3fkgh"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading_0_0" = callPackage @@ -101922,12 +102076,13 @@ self: { }) {}; "hasql-pool" = callPackage - ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.5"; - sha256 = "0bsxh9yf5p2iknrnssrif563n42ih14cj95qmy9z2lz2kbycscrs"; + version = "0.5.0.1"; + sha256 = "1isnn3klvqcr13wvq6fsj3b5sysjs6xlll9s3ysihd1x4v87zii8"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; }) {}; @@ -102565,10 +102720,10 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11.2"; - sha256 = "0iwbdvywily6ma1a1v9l4kflvm8d8234zhvyb9imx7g7grns1kgb"; + version = "3000.11.3"; + sha256 = "1ab422ngg63w91a71j17swzzdxk0y2053fijml0illarcrd77cnj"; revision = "1"; - editedCabalFile = "1l0xrffx8xy023g89xijmm7vnaci5hsshpm1rvdchb0nbvq08cnr"; + editedCabalFile = "0h71nvlia8k7ykhywxbx79xj30g6ld0gqqmrdhyp3aip8ly6cb6y"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -104076,23 +104231,21 @@ self: { }) {}; "hedn" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, bytestring - , containers, deepseq, hspec, hspec-contrib, HUnit, mtl, QuickCheck - , scientific, stringsearch, template-haskell, text, time - , time-locale-compat, utf8-string, vector + ({ mkDerivation, base, containers, deepseq, deriving-compat + , hedgehog, megaparsec, parser-combinators, prettyprinter + , scientific, template-haskell, text, time, uuid, vector }: mkDerivation { pname = "hedn"; - version = "0.1.9.1"; - sha256 = "0ynajgg5kl37rv72408hg5jiypy6vmzazqxa58405knb49h0gvvz"; + version = "0.2.0.0"; + sha256 = "1yi7j2ikpd1lv32hzgv38v1r4wzh7ffq71js2648d4j1v9jhq1sj"; libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq mtl - scientific stringsearch text time time-locale-compat utf8-string - vector + base containers deepseq deriving-compat megaparsec + parser-combinators prettyprinter scientific template-haskell text + time uuid vector ]; testHaskellDepends = [ - base bytestring containers hspec hspec-contrib HUnit QuickCheck - template-haskell text time vector + base containers hedgehog megaparsec text time uuid vector ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; @@ -105009,8 +105162,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.21"; - sha256 = "0h3d1b2xdd59d3rl1a9ng1hz2hr3g6n1dpak0a4namjlcfxvwwhd"; + version = "0.24"; + sha256 = "0bzhswisrmlw8ajl6mr13vr3a7l0vywl394aihrc0xs6vwgyflh0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106100,23 +106253,34 @@ self: { }) {inherit (pkgs) hidapi;}; "hid-examples" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cassava, Chart - , Chart-diagrams, directory, extra, filepath, fmt, hint, mtl - , optparse-applicative, random, safe, text, time, transformers - , unix-compat + ({ mkDerivation, aeson, base, blaze-html, bytestring, cassava + , Chart, Chart-diagrams, data-default, directory, doctest, extra + , filepath, fmt, hedgehog, hint, http-client, mtl + , optparse-applicative, random, req, safe, safe-exceptions, split + , system-locale, tasty, tasty-golden, tasty-hedgehog, tasty-hspec + , text, time, transformers, unix-compat }: mkDerivation { pname = "hid-examples"; - version = "0.3"; - sha256 = "11zqnmsd07zpwmw40ynhv64zqc6fl27a281rihd6yc7n68qvpz6n"; + version = "0.4"; + sha256 = "11r2ln131axkw31afki3jnrz1md668z0qnvx915qwyppga62rk8l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base hedgehog safe safe-exceptions split + ]; executableHaskellDepends = [ - base blaze-html bytestring cassava Chart Chart-diagrams directory - extra filepath fmt hint mtl optparse-applicative random safe text - time transformers unix-compat + aeson base blaze-html bytestring cassava Chart Chart-diagrams + data-default directory extra filepath fmt hedgehog hint http-client + mtl optparse-applicative random req safe safe-exceptions + system-locale text time transformers unix-compat ]; + testHaskellDepends = [ + base doctest filepath hedgehog tasty tasty-golden tasty-hedgehog + tasty-hspec + ]; + doHaddock = false; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -106221,8 +106385,8 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.2.1.0"; - sha256 = "1vgvpa9il2pmcwjq0nnq93ppbanrs5yaxdcs9skbwz1r6gx0k64y"; + version = "0.2.2.0"; + sha256 = "0c0lv9vr8srb6bipjx70m7p5mr91hfhnymv8brwj6hllq4cp576m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106890,8 +107054,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.8.2"; - sha256 = "02vm78bmmvsiz9iwma3398j91dhs3fnwfnacqg40wv3dypd3x3h1"; + version = "0.8.3"; + sha256 = "10pm7hdir81f46d081rk3pc6nnlxhpksmd7qrh1vwyvad4nf9p55"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -107930,8 +108094,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.12"; - sha256 = "1d3gbvjs7zg9n4fbj2b3c5wn5xf2idygx9cqjdbmgndk3jic9rbx"; + version = "2.1.13"; + sha256 = "1ac553qf1pc093hrc3kf8yik68619683pazmlm8r2jqqq502fgxc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -108596,8 +108760,8 @@ self: { }: mkDerivation { pname = "hmm-lapack"; - version = "0.3.0.1"; - sha256 = "150aqwg7n9i5hsdlxxbsynaxn3shgnx20drax16z5785rz0bbrjx"; + version = "0.3.0.2"; + sha256 = "1rwxp4gjk2z8k42k7l1g3sy07jl2rhc7xgypjripb3chmfkp6zvn"; libraryHaskellDepends = [ base boxes comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat @@ -109787,8 +109951,8 @@ self: { pname = "hookup"; version = "0.2.2"; sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "3"; - editedCabalFile = "0fmnfnlcc5jg0na2723ibh26sch190s62d52g14gffh9fsl9icgy"; + revision = "4"; + editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -109891,8 +110055,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.21.2"; - sha256 = "13064b3ybjsa78gw1dhykl24l1ccqxsdq773zwb95ccz3v4dy65l"; + version = "0.21.3"; + sha256 = "18y6qxb53v9dbjz4mhxvzc0b8jyk909w140y22hxcbwn41vqh48l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112152,6 +112316,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {xenctrl = null;}; + "hsakamai" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , conduit-extra, cryptonite, doctest, http-client, http-conduit + , http-types, memory, optparse-applicative, random, text, unix + , unix-time, uuid, xml-conduit, yaml + }: + mkDerivation { + pname = "hsakamai"; + version = "0.1.0.0"; + sha256 = "1wg0jw7m0hvvv6b5xz0y012kgnx4zxfms53gvryw0zk6ll841h3i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit cryptonite + http-client http-conduit http-types memory random text unix-time + uuid xml-conduit + ]; + executableHaskellDepends = [ + aeson base bytestring case-insensitive conduit conduit-extra + cryptonite http-client http-conduit http-types memory + optparse-applicative random text unix unix-time uuid xml-conduit + yaml + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive conduit cryptonite doctest + http-client http-conduit http-types memory random text unix-time + uuid xml-conduit + ]; + description = "Akamai API(Edgegrid and Netstorage)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsaml2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, cryptonite, data-default, http-types, HUnit, hxt @@ -113020,6 +113216,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsdev_0_3_3_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec + , base, bytestring, Cabal, containers, cpphs, data-default, deepseq + , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc + , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names + , haskell-src-exts, hdocs, hformat, hlint, hspec, http-client, lens + , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl + , network, network-uri, optparse-applicative, process + , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm + , syb, template-haskell, text, text-region, time, transformers + , transformers-base, uniplate, unix, unordered-containers, vector + }: + mkDerivation { + pname = "hsdev"; + version = "0.3.3.0"; + sha256 = "17pylby88xmr8hibhpiyygzdnjwznh1zss4969z6w2dk2489lkrz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array async attoparsec base bytestring Cabal + containers cpphs data-default deepseq direct-sqlite directory + exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api + haddock-library haskell-names haskell-src-exts hdocs hformat hlint + http-client lens lifted-base mmorph monad-control monad-loops mtl + network network-uri optparse-applicative process regex-pcre-builtin + scientific simple-log sqlite-simple stm syb template-haskell text + text-region time transformers transformers-base uniplate unix + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers deepseq directory + exceptions filepath monad-loops mtl network optparse-applicative + process text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson async base containers data-default deepseq directory filepath + hformat hspec lens lens-aeson mtl text + ]; + description = "Haskell development library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsdif" = callPackage ({ mkDerivation, base, bytestring, hosc }: mkDerivation { @@ -113054,6 +113293,8 @@ self: { pname = "hsdns"; version = "1.7.1"; sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; + revision = "1"; + editedCabalFile = "0w4hrmj7ph5dgarl82xpa0g77ncjdqk0wc9wp771pry98xxihzl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network ]; @@ -113063,6 +113304,22 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; + "hsdns_1_8" = callPackage + ({ mkDerivation, adns, base, containers, network }: + mkDerivation { + pname = "hsdns"; + version = "1.8"; + sha256 = "0jxnfgzsshhaf3n8ywhxy84l6ldhz5cdwaayr61v26iqgm3c3qk0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers network ]; + librarySystemDepends = [ adns ]; + description = "Asynchronous DNS Resolver"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {inherit (pkgs) adns;}; + "hsdns-cache" = callPackage ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time , unordered-containers @@ -113984,6 +114241,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_7_0" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.7.0"; + sha256 = "1qbikvd91cimbn439zwsdcrz0hsl7n2w4cl0vlcw8kbf94nm6z7z"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -114084,6 +114357,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_7_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.7.0"; + sha256 = "1y4j0ivngz7jrff1riyy2iirnb5kc9p4cr619wdrsrvrm3blgzrz"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -114140,6 +114441,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_7_0" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.7.0"; + sha256 = "1n3by0dn3x3kfy7vnyfdz0dr2wwwj82m0ijlm9s1n6aa976xddhw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -114412,8 +114733,8 @@ self: { }: mkDerivation { pname = "hspec-need-env"; - version = "0.1.0.2"; - sha256 = "0393l0faajrdfckjgclrhpvm79r0mhba8jrrsvr4rj5ifajmrfns"; + version = "0.1.0.3"; + sha256 = "164ng7ryb9dpw2v0wazi9s8xqwsx9yla83p0ln05m6zlirpp6jc6"; libraryHaskellDepends = [ base hspec-core hspec-expectations ]; testHaskellDepends = [ base hspec hspec-core setenv transformers ]; description = "Read environment variables for hspec tests"; @@ -115503,6 +115824,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hsyslog_5_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hsyslog"; + version = "5.0.2"; + sha256 = "1kkypn0dd92aqv8dr112bhkr9k9r9mchnyyvy41kvhj2zg447v1y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + description = "FFI interface to syslog(3) from POSIX.1-2001"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hsyslog-tcp" = callPackage ({ mkDerivation, base, bytestring, hsyslog, hsyslog-udp, network , text, time @@ -116238,7 +116574,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_6_0" = callPackage + "http-client_0_6_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -116247,8 +116583,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.6.0"; - sha256 = "1z38v6vgs5hzd42ljkwxdxs1j3ixwsj9klyxd2ng3pxdnb8wyvvk"; + version = "0.6.1"; + sha256 = "0ryj5far7744c297ji9aaqcm56rpm2fyma8mbghli086nq4xiryl"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -117516,6 +117852,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "human-readable-duration_0_2_1_3" = callPackage + ({ mkDerivation, base, criterion, doctest, Glob }: + mkDerivation { + pname = "human-readable-duration"; + version = "0.2.1.3"; + sha256 = "1zq85v9knc73ck9lqrn4k0w121ifpjg7j053qmhgam0605j89236"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Provide duration helper"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "human-text" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -117586,6 +117936,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_1_2_1_0" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "1.2.1.0"; + sha256 = "075xx6rz1bxyj00plkrfz04wfq1rim8nkn43xj0d7js86qhvqyrc"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -118344,21 +118706,22 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, transformers, unix + , either, hspec, monad-loops, rdkafka, text, transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.5.0"; - sha256 = "0cr3s26ivb46d14mglnr9phhnsj85h8n3b8p6lmcjk1xs4jidick"; + version = "2.6.0"; + sha256 = "1318gyl3jn3q2namzpzf0254hqpib2nn1kipf6gnfp4dvwv0wbgn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bytestring containers transformers unix + base bifunctors bytestring containers text transformers unix ]; librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bifunctors bytestring containers either hspec monad-loops + base bifunctors bytestring containers either hspec monad-loops text + transformers ]; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -118371,8 +118734,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.5.0"; - sha256 = "0n495336vhikd0r5j6i8ydrxv3xwwckbg2ympaf3flcsjv4bwc08"; + version = "2.6.0"; + sha256 = "0z3rhxzj8zni2z0mb7aka21dblyniqby0qf2y6cnnjw6gmvrkc1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119861,31 +120224,6 @@ self: { }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.3.10"; - sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b"; - revision = "2"; - editedCabalFile = "1dwkqlkjg5hbjlwl7cjxmhg1camhlqpaqjrpmkwknscj76hfckvi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring directory filepath protolude text - ]; - executableHaskellDepends = [ - base bytestring hscolour pretty-show protolude text - ]; - testHaskellDepends = [ - base binary bytestring hedgehog protolude text - ]; - description = "Modules for parsing, generating and manipulating AB1 files"; - license = "(BSD-3-Clause OR Apache-2.0)"; - }) {}; - - "hyraxAbif_0_2_3_15" = callPackage - ({ mkDerivation, base, binary, bytestring, directory, filepath - , hedgehog, hscolour, pretty-show, protolude, text - }: - mkDerivation { - pname = "hyraxAbif"; version = "0.2.3.15"; sha256 = "1wfmlqgk751ij30x0dkyc9fyc6j1a96l0s7fjj1sywdvawd8cfh1"; isLibrary = true; @@ -119901,7 +120239,6 @@ self: { ]; description = "Modules for parsing, generating and manipulating AB1 files"; license = "(BSD-3-Clause OR Apache-2.0)"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hzaif" = callPackage @@ -122238,8 +122575,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.1"; - sha256 = "1hfyp284lpvgy0rqn7rjr7c8z0ah8h0vl3xhfrff8x1z1511n2dp"; + version = "1.6.1.1"; + sha256 = "0cmhy4v00jvz1n4xfa0pcxgld7mc6idj4jl2b3n01jfhjff22ryi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -122253,7 +122590,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_1_1" = callPackage + "influxdb_1_6_1_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, QuickCheck, scientific @@ -122262,8 +122599,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.1.1"; - sha256 = "0cmhy4v00jvz1n4xfa0pcxgld7mc6idj4jl2b3n01jfhjff22ryi"; + version = "1.6.1.2"; + sha256 = "1bzy78amw6k02bi2fjm2i8vah9lwxpy2fdlq35gdsffhwrif29mg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -123375,8 +123712,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.7.1.1"; - sha256 = "1s947b71r0m3f81w8sid2cwgh9j16bxsmlpi498rzxajq32cd5yk"; + version = "0.7.2"; + sha256 = "0iv79rlgi7xi5l0a530m8vniba5jnn45hddwfrrm9yyfvpfgx1sw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -124122,6 +124459,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ipynb" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base64-bytestring + , bytestring, containers, directory, filepath, microlens + , microlens-aeson, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "ipynb"; + version = "0.1"; + sha256 = "0daadhzil4q573mqb0rpvjzm0vpkzgzqcimw480qpvlh6rhppwj5"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-diff base base64-bytestring bytestring directory + filepath microlens microlens-aeson tasty tasty-hunit text + unordered-containers vector + ]; + description = "Data structure for working with Jupyter notebooks (ipynb)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, directory, filepath, memory, mtl, process, temporary @@ -126830,8 +127190,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.5"; - sha256 = "17y8hnqp4ahg7cx6fwfd4y65pz16py1avhfkn4fcfjs06xv465qs"; + version = "1.0.6"; + sha256 = "1j5x5ibax81348m4m1fv8pz0044gbvlskgh9gpn5dn8d0cpd7vf7"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -126904,12 +127264,14 @@ self: { }) {}; "json-pointer" = callPackage - ({ mkDerivation, attoparsec, base-prelude, text }: + ({ mkDerivation, attoparsec, base, base-prelude, text }: mkDerivation { pname = "json-pointer"; - version = "0.1.2.1"; - sha256 = "1anij6svbkygz9qyssqhz9vyj43gyhsvrypb6fzjl4k5ss7aibq0"; - libraryHaskellDepends = [ attoparsec base-prelude text ]; + version = "0.1.2.2"; + sha256 = "0cwk5jxg528dipfdhrmmjpz950pfpaykncvw16rajvf35wvcnk9x"; + revision = "1"; + editedCabalFile = "0bs7fa02jjq9r7bn3vlwn4xq93yllj62h3bb5g2lsihx1svk7lkn"; + libraryHaskellDepends = [ attoparsec base base-prelude text ]; description = "JSON Pointer parsing and interpretation utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -129964,8 +130326,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.7"; - sha256 = "0n90m4dsqfp4x4bckwxasg2cmjrzxp2szrlqf43pmp2dsc8g0646"; + version = "1.0.8"; + sha256 = "0nryr2bsl7wn80nfwpvs45nyf02micq422b95dhw8ln79knpa4vm"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -131946,14 +132308,15 @@ self: { "lapack" = callPackage ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms - , comfort-array, deepseq, fixed-length, guarded-allocation - , lapack-ffi, lazyio, netlib-ffi, non-empty, QuickCheck, semigroups - , tfp, transformers, utility-ht + , comfort-array, data-ref, deepseq, fixed-length + , guarded-allocation, lapack-ffi, lazyio, netlib-ffi, non-empty + , QuickCheck, quickcheck-transformer, random, semigroups, tfp + , transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.2"; - sha256 = "173yjhf2drabx13rw7kzs6wp40pg2r5yibr7psgdyidx7543svvy"; + version = "0.2.1"; + sha256 = "1m6n36cjk69maqrb2alya8ki2kndvpfjn2nyb8p4k5333x4ka6xm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131962,8 +132325,9 @@ self: { transformers utility-ht ]; testHaskellDepends = [ - base ChasingBottoms comfort-array netlib-ffi non-empty QuickCheck - semigroups tfp transformers utility-ht + base ChasingBottoms comfort-array data-ref netlib-ffi non-empty + QuickCheck quickcheck-transformer random semigroups tfp + transformers unique-logic-tf utility-ht ]; description = "Numerical Linear Algebra using LAPACK"; license = stdenv.lib.licenses.bsd3; @@ -131976,8 +132340,8 @@ self: { }: mkDerivation { pname = "lapack-carray"; - version = "0.0.2"; - sha256 = "1dr4mbhc5y21mbnksyi530rsvckfp4mclhhig2rjhx3b06cksfna"; + version = "0.0.3"; + sha256 = "1l4dwkdk6m5ran92j7k9yxqin1spgx8sg0bi2kfn1pcs6jzgn3si"; libraryHaskellDepends = [ base carray lapack-ffi netlib-carray netlib-ffi storable-complex transformers @@ -131986,6 +132350,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lapack-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, lapack-ffi + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-comfort-array"; + version = "0.0"; + sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j"; + libraryHaskellDepends = [ + base comfort-array lapack-ffi netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran LAPACK via comfort-array"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lapack-ffi" = callPackage ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { @@ -132020,6 +132400,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lapack-ffi-tools_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers + , explicit-exception, filepath, non-empty, optparse-applicative + , parsec, pathtype, transformers, unordered-containers, utility-ht + , vector + }: + mkDerivation { + pname = "lapack-ffi-tools"; + version = "0.1.2"; + sha256 = "14wfnddya7ch8hm3wgabd7nma7ahcgv6h2innfbp1ck92isn2s0q"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring cassava containers explicit-exception filepath + non-empty optparse-applicative parsec pathtype transformers + unordered-containers utility-ht vector + ]; + description = "Generator for Haskell interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes , bytestring, cereal, containers, cryptohash, deepseq, hashable @@ -132759,6 +133162,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_9_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.9.0"; + sha256 = "12s3pwihb6i5anv5zm8xvlz6gq4bfk0nrgvkmg83my1sg5pcknl4"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leancheck-enum-instances" = callPackage ({ mkDerivation, base, enum-types, leancheck }: mkDerivation { @@ -132771,15 +133187,40 @@ self: { }) {}; "leancheck-instances" = callPackage - ({ mkDerivation, base, bytestring, leancheck, nats, text }: + ({ mkDerivation, array, base, bytestring, containers, leancheck + , nats, text, time + }: mkDerivation { pname = "leancheck-instances"; - version = "0.0.1"; - sha256 = "1p7d6z82s689l8vi1c0rq6cnzvzlcx17nmr3wzy4yj3h80g1hnlq"; - libraryHaskellDepends = [ base bytestring leancheck nats text ]; - testHaskellDepends = [ base bytestring leancheck nats text ]; + version = "0.0.2"; + sha256 = "1p8ip47v4jc5rkqj456dmsh2scl19lvh9zimkr844lvyhbxifgbb"; + libraryHaskellDepends = [ + array base bytestring containers leancheck nats text time + ]; + testHaskellDepends = [ + base bytestring containers leancheck nats text + ]; + description = "Common LeanCheck instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "leancheck-instances_0_0_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, leancheck + , nats, text, time + }: + mkDerivation { + pname = "leancheck-instances"; + version = "0.0.3"; + sha256 = "1h6aw2fvdcjaz9r90l3c9znykn0y9gvg74ycvkrqw823sd9ywwd6"; + libraryHaskellDepends = [ + array base bytestring containers leancheck nats text time + ]; + testHaskellDepends = [ + base bytestring containers leancheck nats text + ]; description = "Common LeanCheck instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leankit-api" = callPackage @@ -133324,26 +133765,6 @@ self: { }: mkDerivation { pname = "lens-regex"; - version = "0.1.0"; - sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base lens regex-base template-haskell - ]; - testHaskellDepends = [ - base directory doctest filepath regex-posix - ]; - description = "Lens powered regular expression"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-regex_0_1_1" = callPackage - ({ mkDerivation, array, base, directory, doctest, filepath, lens - , regex-base, regex-posix, template-haskell - }: - mkDerivation { - pname = "lens-regex"; version = "0.1.1"; sha256 = "0c673v6k6y7dng6qmi4jbh3jlx803mg5g1911bz54r785fm6p50d"; isLibrary = true; @@ -133356,7 +133777,6 @@ self: { ]; description = "Lens powered regular expression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-simple" = callPackage @@ -134648,6 +135068,8 @@ self: { pname = "libzfs"; version = "0.2.0.0"; sha256 = "1g3bn3dmkzalzpm645ag4vk9736in0xcszj28girpyphyiyfkk45"; + revision = "1"; + editedCabalFile = "0rvk7mbqz5yr5qx52ais53x1sknbf9r87q7rypk63jznjj1jcbmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl transformers ]; @@ -136088,8 +136510,10 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.2"; - sha256 = "08wjng9d1sqjqc6pgq2lh84gcaabqmrslm3slc0rvaxh1lvasv6s"; + version = "1.0.3"; + sha256 = "1kkiyfz7ra3i7jah1z347aq534isz7w8ancbhv6if905ybd3bhvf"; + revision = "1"; + editedCabalFile = "0f476hjzg99c51ac7ncl2w7lv8dakqwscqd7lx9n5cv3sclr38y5"; libraryHaskellDepends = [ base mmorph monad-control mtl transformers transformers-base ]; @@ -136098,6 +136522,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "list-t_1_0_3_1" = callPackage + ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control + , mtl, mtl-prelude, transformers, transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1.0.3.1"; + sha256 = "0h6bwljy0cqm1fsq151glglnvczjcvbphxiw7c83ps2zy9whg4y9"; + libraryHaskellDepends = [ + base mmorph monad-control mtl transformers transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + description = "ListT done right"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -137388,10 +137829,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.0.0"; - sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; - revision = "1"; - editedCabalFile = "11sd5si8snl5agl34arp9lkxjnm07rd5rs05apq1lvcac70la18d"; + version = "0.10.0.1"; + sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -138400,8 +138839,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "5"; - editedCabalFile = "0dfrgg60nd7l7pfjar1s1g380r4591y6ccv9fyh0n34ymhizk84y"; + revision = "6"; + editedCabalFile = "1zkf8ss6siai3py4drb5hr0m3np2kk3vrzb6kcxhq0vxxz3xynjh"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -139456,6 +139895,8 @@ self: { pname = "maclight"; version = "0.1.0.0"; sha256 = "0qf44jza8avq2yfsx2f0bdxbnda4lm3xq9qaivmslfbdfjy3mxv3"; + revision = "1"; + editedCabalFile = "0v10y2x6c2cyh1qc0yki1mn69bcps0bdbq1mipf35mjmd0zs5iyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filemanip filepath parsec strict ]; @@ -141051,6 +141492,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_2_7_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, data-default-class + , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions + , vector + }: + mkDerivation { + pname = "massiv"; + version = "0.2.7.0"; + sha256 = "080pdghb6yf08addkysdpgdgzf60lc90z580vk2igjfc23w9xwc7"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq ghc-prim primitive + vector + ]; + testHaskellDepends = [ + base bytestring data-default deepseq hspec QuickCheck + safe-exceptions vector + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, directory , filepath, JuicyPixels, massiv, netpbm, process, vector @@ -141797,31 +142260,6 @@ self: { }: mkDerivation { pname = "mbug"; - version = "1.3"; - sha256 = "1pa3myyd2qrb14797hix4dh0ajpwr49219x5bf030yps6b0hsi91"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring directory extra formatting http-client - http-client-tls mtl optparse-applicative process scalpel-core - tagsoup text time xdg-basedir - ]; - executableHaskellDepends = [ - base bytestring directory extra formatting http-client - http-client-tls mtl optparse-applicative process scalpel-core - tagsoup text time xdg-basedir - ]; - description = "download bugs mailboxes"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "mbug_1_3_2" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, formatting - , http-client, http-client-tls, mtl, optparse-applicative, process - , scalpel-core, tagsoup, text, time, xdg-basedir - }: - mkDerivation { - pname = "mbug"; version = "1.3.2"; sha256 = "05cyznwvwjc1ajjkr28h8dawlk10nx60ybx30g6vs5h68zlq43nd"; isLibrary = true; @@ -141838,7 +142276,6 @@ self: { ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mcl" = callPackage @@ -142340,6 +142777,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "megaparsec_6_5_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, hspec, hspec-discover, hspec-expectations + , mtl, parser-combinators, QuickCheck, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "6.5.0"; + sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; + revision = "4"; + editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec hspec-expectations mtl QuickCheck + scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl @@ -142781,34 +143245,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {menoh = null;}; - "mercury-api" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory - , hashable, HUnit, optparse-applicative, text, unordered-containers + "menshen" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, regex-tdfa + , scientific, text }: mkDerivation { - pname = "mercury-api"; - version = "0.1.0.1"; - sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; - revision = "2"; - editedCabalFile = "093c8afmcrnbfliz1ykpyc4w40dli2wig0qi0xcwg8445idwp2kg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring clock hashable text - unordered-containers - ]; - executableHaskellDepends = [ - ansi-terminal base bytestring optparse-applicative text - ]; + pname = "menshen"; + version = "0.0.1"; + sha256 = "1i4h5s3d57466hzyp7mag1z7dbp306qm2sf4k3a0frpsz2n2ijsw"; + libraryHaskellDepends = [ base regex-tdfa scientific text ]; testHaskellDepends = [ - base bytestring directory HUnit optparse-applicative text + aeson base hspec QuickCheck regex-tdfa scientific text ]; - description = "Haskell binding to Mercury API for ThingMagic RFID readers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + description = "Data Validation"; + license = stdenv.lib.licenses.bsd3; }) {}; - "mercury-api_0_1_0_2" = callPackage + "mercury-api" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory , hashable, HUnit, optparse-applicative, text, unordered-containers }: @@ -144597,6 +145050,8 @@ self: { pname = "miss"; version = "0"; sha256 = "1xcbjmv2fyjffn1j2xhn0glvxdb2cqd8frvc9yr1pgz6874sv60w"; + revision = "1"; + editedCabalFile = "0m4dvn39917fxmgd2ahigz70qqy4ccfsi4n0885v82kiqwgmvxxq"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers cryptohash-sha1 deepseq digest exceptions filesystem-abstractions @@ -145202,8 +145657,8 @@ self: { }: mkDerivation { pname = "modularity"; - version = "0.2.0.3"; - sha256 = "1w1w9fcsh758wnnq3i1c4bklpg5m622lh3qybddacs65gvih64sy"; + version = "0.2.1.0"; + sha256 = "1xs9hdxsdpylhq3dzmyxfycwyqzy3v1zz48gvzpfcamfivxxpdph"; libraryHaskellDepends = [ base eigen hmatrix sparse-linear-algebra spectral-clustering vector ]; @@ -145576,16 +146031,18 @@ self: { }) {}; "monad-dijkstra" = callPackage - ({ mkDerivation, base, free, hlint, mtl, psqueues, tasty - , tasty-hspec, transformers + ({ mkDerivation, base, containers, free, hlint, mtl, psqueues + , tasty, tasty-hspec, transformers }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.1.1"; - sha256 = "0j29ffim7hwvj791na92yrbgly1frn0qvcpyc1z29837kawap190"; - libraryHaskellDepends = [ base free mtl psqueues transformers ]; + version = "0.1.1.2"; + sha256 = "1890rnypk3ra4f0f3m7nr31df3x6pmpw6ivid77wj7h9mdp0bdb6"; + libraryHaskellDepends = [ + base containers free mtl psqueues transformers + ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; - description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm"; + description = "A monad transformer for weighted graph searches"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146457,10 +146914,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadLib"; - version = "3.8"; - sha256 = "1y414xfaavp63w5za4jby4cnaqwivkvkxxknb488z1k040kiisv1"; - revision = "1"; - editedCabalFile = "1mnzhliilvhsynv5h7rqchngvf8by1z33j4lj8zqqzl1xdmy2knx"; + version = "3.9"; + sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -147381,8 +147836,8 @@ self: { ({ mkDerivation, morphisms }: mkDerivation { pname = "morphisms-functors"; - version = "0.1.6"; - sha256 = "103mg7pdykmiyx4xygrrygamj1d26v3xlph14l3w1hh02i6w4x4h"; + version = "0.1.7"; + sha256 = "1mv2sjn68n55482496icg84nbf3mn85fizf4q42781qn689np60q"; libraryHaskellDepends = [ morphisms ]; description = "Functors, theirs compositions and transformations"; license = stdenv.lib.licenses.mit; @@ -147718,21 +148173,21 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, binary, bytestring, c2hs, criterion - , monad-loops, openmpi, packman, store + ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion + , monad-loops, openmpi, store }: mkDerivation { pname = "mpi-hs"; - version = "0.4.1.0"; - sha256 = "0bf0ghzvakww5slvfd3fq0sa0972i6y60lg6ibby49nslfkl52wd"; + version = "0.5.1.1"; + sha256 = "0vvbvck5hd3ca1l1bdcnkkb5p2xf9gj9ljf8v130x0fx3zhxjp13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring monad-loops packman store + base binary bytestring cereal monad-loops store ]; librarySystemDepends = [ openmpi ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base binary ]; testHaskellDepends = [ base monad-loops ]; benchmarkHaskellDepends = [ base criterion ]; description = "MPI bindings for Haskell"; @@ -148863,6 +149318,8 @@ self: { pname = "multiset-comb"; version = "0.2.4.1"; sha256 = "1nih0101d6z2m4wi22804vjxrd5nr35mmqk31lm7bhanmwnl7qwa"; + revision = "1"; + editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg"; libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = stdenv.lib.licenses.bsd3; @@ -149911,8 +150368,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.6"; - sha256 = "1vlr4z3ng8sibb7g8363xlhff3811z8b5nmm0ljai6r5r5hrym4y"; + version = "0.1.7"; + sha256 = "1nbj958nsr568c1mhwhcidz8d1p35c6b99m8xz2z0w8ig737nbgg"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -149962,6 +150419,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mysql-haskell_0_8_4_2" = callPackage + ({ mkDerivation, base, binary, binary-ieee754, binary-parsers + , blaze-textual, bytestring, bytestring-lexing, cryptonite + , io-streams, memory, monad-loops, network, scientific, tasty + , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams + , word24 + }: + mkDerivation { + pname = "mysql-haskell"; + version = "0.8.4.2"; + sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz"; + libraryHaskellDepends = [ + base binary binary-ieee754 binary-parsers blaze-textual bytestring + bytestring-lexing cryptonite io-streams memory monad-loops network + scientific tcp-streams text time tls vector wire-streams word24 + ]; + testHaskellDepends = [ + base bytestring io-streams tasty tasty-hunit text time vector + ]; + description = "pure haskell MySQL driver"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-haskell-nem" = callPackage ({ mkDerivation, base, bytestring, io-streams, mysql-haskell , scientific, text, time @@ -150408,8 +150889,8 @@ self: { ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { pname = "namespace"; - version = "0.1.4.0"; - sha256 = "12v2mk4wcqsdcwym6dbwkwcamr04l4vncdwfj0bsnxzvf4mjzx7p"; + version = "0.1.4.1"; + sha256 = "14z8g7nya4pp4gvspcmz4pkz1vd9g268pav2xxb203vi7va7wbff"; libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; description = "A Generic Haskell library for managing namespaces"; @@ -150524,8 +151005,10 @@ self: { }: mkDerivation { pname = "nanomsg-haskell"; - version = "0.2.3"; - sha256 = "0q9zjay4njlr3dakmwhcmyhh3hw7p3q2ani3s5acmm3zdj25slqx"; + version = "0.2.4"; + sha256 = "00941a7vp6y4gzxpjlr4516ic96l5892w0akqajq3jyh5601jqg3"; + revision = "1"; + editedCabalFile = "02ahbmda51j7ayvda9nwvkbw8wnd1gm9kqa3lqdqh8s587wl4wm7"; libraryHaskellDepends = [ base binary bytestring ]; librarySystemDepends = [ nanomsg ]; testHaskellDepends = [ @@ -151479,16 +151962,31 @@ self: { }) {}; "netlib-carray" = callPackage - ({ mkDerivation, base, carray, netlib-ffi, transformers }: + ({ mkDerivation, array, base, carray, netlib-ffi, transformers }: mkDerivation { pname = "netlib-carray"; - version = "0.0.1.1"; - sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv"; - libraryHaskellDepends = [ base carray netlib-ffi transformers ]; + version = "0.1"; + sha256 = "0rh4m4xxwm8n0577khqa2cx74hnwmgz94phq2rwhsdppg6dd2xx5"; + libraryHaskellDepends = [ + array base carray netlib-ffi transformers + ]; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; }) {}; + "netlib-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: + mkDerivation { + pname = "netlib-comfort-array"; + version = "0.0"; + sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al"; + libraryHaskellDepends = [ + base comfort-array netlib-ffi transformers + ]; + description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "netlib-ffi" = callPackage ({ mkDerivation, base, guarded-allocation, storable-complex , transformers @@ -151843,6 +152341,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network_3_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, hspec + , hspec-discover, HUnit, unix + }: + mkDerivation { + pname = "network"; + version = "3.0.0.0"; + sha256 = "1j9lhyb50k056ynyfsyh1ak9gn1knh11cyajlnbix8yhahm2mkla"; + libraryHaskellDepends = [ base bytestring deepseq unix ]; + testHaskellDepends = [ base bytestring directory hspec HUnit ]; + testToolDepends = [ hspec-discover ]; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -151998,14 +152512,13 @@ self: { }) {}; "network-bsd" = callPackage - ({ mkDerivation, base, network }: + ({ mkDerivation, base, deepseq, network }: mkDerivation { pname = "network-bsd"; - version = "2.8.0.0"; - sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5"; - libraryHaskellDepends = [ base network ]; - doHaddock = false; - description = "Network.BSD"; + version = "2.8.1.0"; + sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; + libraryHaskellDepends = [ base deepseq network ]; + description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -152049,6 +152562,8 @@ self: { pname = "network-bytestring"; version = "0.1.3.4"; sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96"; + revision = "1"; + editedCabalFile = "0znp4qkad1sd650kjqhbbrr2ap7bb772g3db92k7r2rrydr19cdl"; libraryHaskellDepends = [ base bytestring network unix ]; description = "Fast, memory-efficient, low-level networking"; license = stdenv.lib.licenses.bsd3; @@ -152781,8 +153296,8 @@ self: { ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.2.0"; - sha256 = "1r1blpz313v6qacvbns53c2i1zgvadvl0ibmp2s3bv1ymm4caj74"; + version = "0.1.2.1"; + sha256 = "0sfyqkm49vgw6x2xkgaa0lv2fmrzwgcz33ch333jsib0qbmji5vw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; @@ -153156,8 +153671,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.6.2"; - sha256 = "1wvh33raci7s4hczcfn5sj2kk1g61ry6xwn3lg7g3yy5bn7azv73"; + version = "1.6.3"; + sha256 = "0dqfjiw55cd16grrqdp1ml557rh58dy3lfcjrfmy91kb5v50cqz6"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -153172,8 +153687,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.2.4"; - sha256 = "0a8w68bzlh7v2b9infvxlscg3mnfi8fngi7z3bap3zwbz86hwb0k"; + version = "0.4.3.0"; + sha256 = "13vhbwld700f56gd95jm9rrzbzx6sp5mimf8qrjdxqwjj2a3rbmp"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -153954,6 +154469,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty_0_3_1" = callPackage + ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + }: + mkDerivation { + pname = "non-empty"; + version = "0.3.1"; + sha256 = "0118vf88pzx1spzx4amc9sxz5vdrmfpryp816fh9l7k5hnzhy0bh"; + libraryHaskellDepends = [ + base containers deepseq QuickCheck utility-ht + ]; + description = "List-like structures with static restrictions on the number of elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "non-empty-containers" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -154381,10 +154911,10 @@ self: { ({ mkDerivation, base, containers, numeric-prelude, primes }: mkDerivation { pname = "np-extras"; - version = "0.3.1.1"; - sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; - revision = "2"; - editedCabalFile = "01jp7y4lsdxlfrbi5vqsc5iyjzzc996w7g88amkkfg5k6amlxb9r"; + version = "0.3.1.2"; + sha256 = "1nah4gxagr02nhwbyq2zinx6nj93h40lyw6fv1bv16x8v3d8p69m"; + revision = "1"; + editedCabalFile = "1imcizgbckwcmxwjicads55g0v6abprz3g69b6blkkgmcq5r9x6b"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -158198,8 +158728,8 @@ self: { pname = "ottparse-pretty"; version = "0.1.2.6"; sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5"; - revision = "2"; - editedCabalFile = "05fxdr12vwf486609f8ld6d3cgpr632402n404gi8hgxj5ijc6yx"; + revision = "3"; + editedCabalFile = "0g17l53dp1vcn2yzv37yvph9r4jsw4lgwip4l3h038r9g940lwjc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158896,6 +159426,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.4.0"; sha256 = "15vfqpfkw4wnsg98804l5ylqbc926s2j5z4ik5zhval4d3kiamgz"; + revision = "1"; + editedCabalFile = "06ic2286am3jpmlb6jxnrx0y9c7rh5rs3l0chv1s5ahharp341g9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -160880,8 +161412,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.1.2"; - sha256 = "0lvgb0jl0bfzjqpap3gxlhn0mhbwbd15h33l1idpghxqpmzgvczy"; + version = "0.8.2.0"; + sha256 = "04cvvff88ga3s22rcsjiyifdggjqpymfkbbcay7ibjhmiqwhisfq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161988,23 +162520,19 @@ self: { "pencil" = callPackage ({ mkDerivation, base, data-default, directory, doctest - , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc - , parsec, semigroups, text, time, unordered-containers, vector, xml - , yaml + , edit-distance, filepath, hashable, hsass, mtl, pandoc, parsec + , semigroups, text, time, unordered-containers, vector, xml, yaml }: mkDerivation { pname = "pencil"; - version = "0.1.2"; - sha256 = "0wgs79vsz52cnmbcfzbb3avn98ciadnispgr98h6kwhgj5pmaxbm"; - isLibrary = true; - isExecutable = true; + version = "0.1.3"; + sha256 = "0kga9i19qxp6g51dyavnybfs6znsija87hxsfrxblsyi4gqs9hbp"; libraryHaskellDepends = [ - base data-default directory edit-distance feed filepath hashable - hsass mtl pandoc parsec semigroups text time unordered-containers - vector xml yaml + base data-default directory edit-distance filepath hashable hsass + mtl pandoc parsec semigroups text time unordered-containers vector + xml yaml ]; - executableHaskellDepends = [ base text unordered-containers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base doctest text unordered-containers ]; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -162524,10 +163052,10 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.9.0"; - sha256 = "0qgjfydyhcyfr8mni0qjykn3jsh4r299yy2wqsl3rsd19bmmr1p7"; - revision = "2"; - editedCabalFile = "1szx008irw7w2h9qz443mml06sg6w9vazbxxyi67d91hyjlgca2j"; + version = "2.9.1"; + sha256 = "1b6shb1d8p7dapj428glmsy7w69424bxrvgf7ws8jd266h4gshk7"; + revision = "1"; + editedCabalFile = "1ing9cdpafmfx0mpvrl3xzfvmw5aw2lpiq69nnhrsmlhb9pi8ni0"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger http-api-data @@ -164091,8 +164619,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.10.1.3"; - sha256 = "1shn877lirnbbhk6wzbypv5j5cqh8wyvgg0333h7mhkmvkm0v569"; + version = "0.10.1.4"; + sha256 = "1kmkxcvkfqwp2p46s22gdnvk12g7bx9dqr8cs04wjw1rbj0mli49"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random text time @@ -167309,8 +167837,8 @@ self: { ({ mkDerivation, base, primitive, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.1.0.0"; - sha256 = "1f1cbvjak0ywhmrrjqvrjfzicq5jfxifxs6alp692rwnm2cbim07"; + version = "0.2.0.0"; + sha256 = "059b5zip3i7cfa977kz0jzxc7b8nws9libkxwf8pnvxk70i7apq1"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive tasty tasty-hunit ]; description = "posix bindings"; @@ -167838,8 +168366,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.13.1"; - sha256 = "0xblb0k3xnsbvdqrl5k3i6jimj4cskgip6w021byirn8i73s7j8a"; + version = "0.1.14.0"; + sha256 = "1z9fdfwpcnhbsq977070hn8ykxcnisjzvpdh5lz4bqirscx2gr2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168167,8 +168695,8 @@ self: { }: mkDerivation { pname = "postmaster"; - version = "0.3.2"; - sha256 = "1l1hq77qxi1f9nv7bxgkfvcm50p61svqvn9f59aq3b9zj2vikmf6"; + version = "0.3.3"; + sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -168198,8 +168726,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.1.3"; - sha256 = "1cg89jh2s2dim874h8vv52ab2dzvq01zvjn45fwdzs3j6815nlj4"; + version = "2.1.4.1"; + sha256 = "1hc7jp7q6mdqva40v0dppihp1bnl30h7vxnkawg0kmczq5p9js35"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -168229,21 +168757,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki-conduit" = callPackage + ({ mkDerivation, acquire, base, base-prelude, bytestring, conduit + , potoki, potoki-core, profunctors, QuickCheck + , quickcheck-instances, rerebase, slave-thread, stm-chans, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "potoki-conduit"; + version = "0.1"; + sha256 = "11hg5zib91b1kp75amlng96b1n357rkj120afnc0825vvb81ky14"; + libraryHaskellDepends = [ + acquire base base-prelude bytestring conduit potoki-core + profunctors slave-thread stm-chans text + ]; + testHaskellDepends = [ + conduit potoki QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Integration of \"potoki\" and \"conduit\""; + license = stdenv.lib.licenses.mit; + }) {}; + "potoki-core" = callPackage ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion , deepseq, deferred-folds, directory, foldl, hashable, ilist , primitive, profunctors, ptr, QuickCheck, quickcheck-instances - , random, rerebase, scanner, split, stm, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder, time, transformers - , unordered-containers, vector + , random, rerebase, scanner, split, stm, stm-chans, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "2.3.3"; - sha256 = "1f6rr75h4cqgy1qjh5qplcq1qz2pwc11mi4k61z691clz5yfmbm0"; + version = "2.3.4.1"; + sha256 = "0mg8hd85xim33jv1abzgjfcy85mmrrvs30gpvspdci5d7xghqrmv"; libraryHaskellDepends = [ acquire attoparsec base bytestring deepseq deferred-folds directory - foldl hashable primitive profunctors ptr scanner stm text + foldl hashable primitive profunctors ptr scanner stm stm-chans text text-builder time transformers unordered-containers vector ]; testHaskellDepends = [ @@ -168723,6 +169273,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "prefetch" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "prefetch"; + version = "0.1.0.0"; + sha256 = "0qc4khx92xqjzq8pp5agxzh9l1l79np32s7af1kffpvffz4r5rpn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring ]; + description = "Prefetch stdin even before stdout is ready"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prefix-expression" = callPackage ({ mkDerivation, base, hspec, regex-pcre-builtin }: mkDerivation { @@ -169257,6 +169820,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-types_0_3_0_1" = callPackage + ({ mkDerivation, base, hspec, mtl, tagged }: + mkDerivation { + pname = "pretty-types"; + version = "0.3.0.1"; + sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv"; + libraryHaskellDepends = [ base mtl tagged ]; + testHaskellDepends = [ base hspec tagged ]; + description = "A small pretty printing DSL for complex types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyFunctionComposing" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170666,8 +171242,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.2.0.1"; - sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0"; + version = "0.2.1.1"; + sha256 = "0cl1d4d4jgkqk37q2n3n7xqmd847srd6sqikciz4b8cfp57lw8m7"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -170699,8 +171275,8 @@ self: { ({ mkDerivation, base, fgl, graphviz, mtl, prolog, text }: mkDerivation { pname = "prolog-graph-lib"; - version = "0.2.0.1"; - sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr"; + version = "0.2.1.1"; + sha256 = "1qxikgryyh47zm0qwbsa7lpqmiphbl1askjjjc0rfr9dh5f0wclr"; libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; @@ -170739,8 +171315,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.0"; - sha256 = "0kpzfmdibpp08rhc8v92nizi8hbb9dm7ysqd0wclx9s5273zqxal"; + version = "2.1.1"; + sha256 = "09g3xi6x6m6h15p3ibwyabfq15rhcaphq7ix2w23aphjwc64ll97"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-types network-uri text transformers wai warp @@ -170820,6 +171396,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "prometheus-proc" = callPackage + ({ mkDerivation, base, filepath, prometheus-client + , regex-applicative, unix, unix-memory + }: + mkDerivation { + pname = "prometheus-proc"; + version = "0.1.0.0"; + sha256 = "1384kcsnhby17ivjlii2ixqw1qhas6y4l1h8vq3lzaxqydbidhbm"; + libraryHaskellDepends = [ + base filepath prometheus-client regex-applicative unix unix-memory + ]; + description = "Export metrics from /proc for the current process"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "promise" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -170911,8 +171502,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.5.0"; - sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv"; + version = "5.6.1"; + sha256 = "1wbh9vc0jkdqsrqfnxvz2498awqkr0jph9qv6c0zwbqm7zbjzn04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171699,31 +172290,6 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.7.0"; - sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc"; - revision = "1"; - editedCabalFile = "0ncag4p7v41x5disbvkwzmv0c7ifc85lmjljzvf8d33arh7b08bj"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree-psqueue ghc-prim - hashable mtl PSQueue random unordered-containers - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "psqueues_0_2_7_1" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2, unordered-containers - }: - mkDerivation { - pname = "psqueues"; version = "0.2.7.1"; sha256 = "1hcfxb977lzxsmd47z0snjj4xdhiwnqzif8xkpwzw28dspn44zh4"; revision = "1"; @@ -171739,7 +172305,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pstemmer" = callPackage @@ -171817,8 +172382,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20180825"; - sha256 = "0wyni1f9v647zb7hg70da4s30dplv6whywd0jwghph1vqdlzlbma"; + version = "0.20190115"; + sha256 = "1w73kpqb8s6yc7h66cam89gcmz6qnsgis2fqvyr9vrqs466k3j01"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -172619,30 +173184,6 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.6"; - sha256 = "0i5lf3aniff8lnvgkl3mmy5xbjr130baz1h25p6q3asapirbj1k0"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_1_5_1_7" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; version = "1.5.1.7"; sha256 = "01p168y4hwn38b4lpf3pi7pv5w46pd8gmli42q7bs3jxd6jhhppc"; libraryHaskellDepends = [ @@ -172657,7 +173198,6 @@ self: { ]; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -173110,8 +173650,8 @@ self: { }: mkDerivation { pname = "qnap-decrypt"; - version = "0.3.3"; - sha256 = "0gwnpyzyrfw6i8a5arm8q6psjhwa8kl8n94wcglsnl59k1iadfb6"; + version = "0.3.4"; + sha256 = "0s263zkdns50bvanjiaiavdk6bpd1ccqbckdmxwbbl2sxp2s3jxz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -174051,31 +174591,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "quickcheck-state-machine_0_5_0" = callPackage + "quickcheck-state-machine_0_6_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , directory, doctest, exceptions, filelock, filepath, http-client , matrix, monad-logger, mtl, network, persistent , persistent-postgresql, persistent-template, pretty-show, process , QuickCheck, quickcheck-instances, random, resourcet, servant - , servant-client, servant-server, split, strict, string-conversions - , tasty, tasty-hunit, tasty-quickcheck, text, tree-diff, unliftio - , vector, wai, warp + , servant-client, servant-server, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, text, tree-diff, unliftio, vector + , wai, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.5.0"; - sha256 = "0wds624fhvzwxcbrr05pgfq802c5namrsqpkdr2388j525374lsj"; + version = "0.6.0"; + sha256 = "0zbjap2jjd534w6cigi4xz34x3f6w8icvxyvxs35j61c52cp2pry"; libraryHaskellDepends = [ ansi-wl-pprint base containers exceptions matrix mtl pretty-show - QuickCheck split tree-diff unliftio vector + QuickCheck tree-diff unliftio vector ]; testHaskellDepends = [ base bytestring containers directory doctest filelock filepath http-client matrix monad-logger mtl network persistent - persistent-postgresql persistent-template process QuickCheck - quickcheck-instances random resourcet servant servant-client - servant-server strict string-conversions tasty tasty-hunit - tasty-quickcheck text tree-diff unliftio vector wai warp + persistent-postgresql persistent-template pretty-show process + QuickCheck quickcheck-instances random resourcet servant + servant-client servant-server strict string-conversions tasty + tasty-hunit tasty-quickcheck text tree-diff unliftio vector wai + warp ]; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; @@ -174135,6 +174676,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-transformer" = callPackage + ({ mkDerivation, base, QuickCheck, random, transformers }: + mkDerivation { + pname = "quickcheck-transformer"; + version = "0.3"; + sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j"; + libraryHaskellDepends = [ base QuickCheck random transformers ]; + description = "A GenT monad transformer for QuickCheck library"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -174673,8 +175225,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.6.0.0"; - sha256 = "02jvlbj3w5ww59ms37l24crr8vib7ghzr9y79bip3p4mhpi4c32l"; + version = "0.6.0.1"; + sha256 = "19c2bv0iq4j0709rf9k9jk5q2s756bvjnr1gy630mcgp92rg8d9j"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -175823,8 +176375,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.7"; - sha256 = "1kp6f45wn3a7wnsvj08a3b0kp5wwprw4rjrrqqd22yr9mpwx2z7w"; + version = "1.0.8"; + sha256 = "045hr0jilydb1xcvhh9q5iwazpf1k1d2q1y0h4gkgnbn6qmgwhnk"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -175843,8 +176395,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.0.4"; - sha256 = "1cri461f40xa43kwg3wq5k98irfqypsi97xdk9n60yqhc8msca4m"; + version = "1.0.5"; + sha256 = "07k2gzc2by6zhsk1zqp0kjk37zc6ikigdp0j5d38pd7x30a7qk7x"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -175906,6 +176458,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rattletrap_6_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, clock, containers, filepath, http-client + , http-client-tls, HUnit, template-haskell, temporary, text + , transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "6.2.1"; + sha256 = "0pygwgq5q6mvpbkis2xiw6ac65fn8q9452qql5dc21p4mi27bwka"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring clock + containers filepath http-client http-client-tls HUnit + template-haskell temporary text transformers + ]; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -176979,13 +177563,17 @@ self: { }) {}; "record-encode" = callPackage - ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }: + ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck + , vector + }: mkDerivation { pname = "record-encode"; - version = "0.2.2"; - sha256 = "1wdrvj2ilf5kqchfcfd3pnqgprc86fri7ajc5r0xqf6zc61s1fgk"; + version = "0.2.3"; + sha256 = "0xljdy3wfyirs3zwc1ij19w9520bc1n56cdigngfb9hs497d6jh3"; libraryHaskellDepends = [ base generics-sop vector ]; - testHaskellDepends = [ base generics-sop hspec QuickCheck vector ]; + testHaskellDepends = [ + base doctest generics-sop hspec QuickCheck vector + ]; description = "Generic encoding of records"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -177185,6 +177773,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "red-black-record" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, profunctors + , sop-core, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "red-black-record"; + version = "1.1.0.0"; + sha256 = "12q3b44qcb8zp5m0zrbj88kigk00rm6ljrnpwd29wv1gdwzd15af"; + libraryHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ + aeson base bytestring doctest profunctors sop-core tasty + tasty-hunit text + ]; + description = "Extensible records and variants indexed by a type-level Red-Black tree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "red-black-tree" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -177502,6 +178107,8 @@ self: { pname = "ref-tf"; version = "0.4.0.1"; sha256 = "03mywifasfvxlz7hy5bbq3i8zi3i99k5cb0kq38gndx4vk2j5dgw"; + revision = "1"; + editedCabalFile = "042nn6y3rbx9z88bkidy1ilp32grm6a1n0ny1wrzxdp46xi5r7in"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; license = stdenv.lib.licenses.bsd3; @@ -178722,6 +179329,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "registry_0_1_2_3" = callPackage + ({ mkDerivation, async, base, containers, exceptions, hashable + , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , protolude, random, resourcet, semigroupoids, semigroups, tasty + , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base + }: + mkDerivation { + pname = "registry"; + version = "0.1.2.3"; + sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni"; + libraryHaskellDepends = [ + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions hashable hedgehog hedgehog-corpus + io-memoize MonadRandom mtl protolude random resourcet semigroupoids + semigroups tasty tasty-discover tasty-hedgehog tasty-th text + transformers-base + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -179890,8 +180523,8 @@ self: { pname = "req"; version = "1.2.1"; sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; - revision = "1"; - editedCabalFile = "1ksqfsln8v08ibm89cgn1clxrvhk889421q5h52v1m9kzkh52njq"; + revision = "3"; + editedCabalFile = "1sbm2rk2q56gma2wja47q1rc8a2pizl8487g5z4fy1zynxm5inyj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -179918,8 +180551,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "3"; - editedCabalFile = "1gnaq7ya4grjwadz58r9g10dybgg50ch89bhbnhyicdins2aa9b2"; + revision = "4"; + editedCabalFile = "13chmpfq1m1fgmgf7nxgs4dgfkpsv2khp4ma3cqqki76j1s8rq3p"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -180011,8 +180644,8 @@ self: { }: mkDerivation { pname = "require"; - version = "0.4.0"; - sha256 = "1kfi0y46ycjsylzv73lxh721a45qz5ki9m6czv4r53scrpbaywig"; + version = "0.4.2"; + sha256 = "03dhj1j9gp6mmgaxxkd1bf2i6hw78ql2qpi0qrdmx5dinclkidk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181807,8 +182440,8 @@ self: { }: mkDerivation { pname = "rob"; - version = "0.0.2"; - sha256 = "1bbhv502c9r8d0kmrvl3q7yl12ykjwfvknlm0kmgnsv5lpz2zx59"; + version = "0.0.4"; + sha256 = "0ds0psp28fb5y21ycsxva1jqrbcvia94g3rk1b5p356php7zahsm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183918,41 +184551,42 @@ self: { "salak" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , filepath, hspec, QuickCheck, scientific, text + , filepath, hspec, mtl, QuickCheck, scientific, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "salak"; - version = "0.1.4"; - sha256 = "17zlgk85yp6ihfppf0simrvc70sk2a3jkjzxzzsgibyxmsm2jmxr"; + version = "0.1.7"; + sha256 = "1r937yil04n28dxggwp12kzs40nvmfrhcm1m77cg9k244ka415k6"; libraryHaskellDepends = [ - aeson base directory filepath scientific text unordered-containers - vector yaml + aeson base directory filepath mtl scientific text transformers + unordered-containers vector yaml ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - QuickCheck scientific text unordered-containers vector yaml + aeson aeson-pretty base bytestring directory filepath hspec mtl + QuickCheck scientific text transformers unordered-containers vector + yaml ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; }) {}; - "salak_0_2_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , filepath, hspec, QuickCheck, scientific, text + "salak_0_2_3" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen + , mtl, QuickCheck, scientific, stm, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "salak"; - version = "0.2.1"; - sha256 = "13hv4fcsb12fzn738jwlzqy70q5srmklrqk7vh3sk17iiwi6jci5"; + version = "0.2.3"; + sha256 = "1ifa4gvwm3sri6nmgqsi7vrl7vafyzraz9v2y3a8k7gmn0izkmb5"; libraryHaskellDepends = [ - aeson base directory filepath scientific text unordered-containers - vector yaml + aeson base directory filepath menshen mtl scientific stm text + transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - QuickCheck scientific text unordered-containers vector yaml + aeson base directory filepath hspec menshen mtl QuickCheck + scientific stm text transformers unordered-containers vector yaml ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; @@ -184538,8 +185172,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.4.6"; - sha256 = "1f0smglnxblywzf553xhmzd2jyg67w14ylyc05hj6dx3fr3xls4m"; + version = "2.4.7"; + sha256 = "1ik254jzgazlbjm09nms8imansk8nb7hhghzyqjcgywg45i119i3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184603,6 +185237,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; + "sbv_8_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, deepseq, directory, doctest, filepath, generic-deriving + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, transformers, z3 + }: + mkDerivation { + pname = "sbv"; + version = "8.0"; + sha256 = "1bv5vf8r892q5ykh4xnzrczay6i423rbyk3rdz3z5ch4fyisvlrj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time transformers + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -184610,8 +185272,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.10"; - sha256 = "0yvvwkhvdfhy1i09br6ci8m4nchmmvn83glnqxd8s2zdmhmxsr54"; + version = "0.11"; + sha256 = "19gji0aqdi232x3y3vkpblwr6y63n7in92dq48ax67h6bqxwg5g2"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -185321,36 +185983,6 @@ self: { "scotty" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring , case-insensitive, data-default-class, directory, exceptions, fail - , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types - , lifted-base, monad-control, mtl, nats, network, regex-compat - , text, transformers, transformers-base, transformers-compat, wai - , wai-extra, warp - }: - mkDerivation { - pname = "scotty"; - version = "0.11.2"; - sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x"; - revision = "1"; - editedCabalFile = "1h4fk7q8x7cvlqq4bbmdh465s6a8955bgchm121fvk08x7rm3yz3"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class exceptions fail http-types monad-control mtl - nats network regex-compat text transformers transformers-base - transformers-compat wai wai-extra warp - ]; - testHaskellDepends = [ - async base bytestring data-default-class directory hpc-coveralls - hspec hspec-wai http-types lifted-base network text wai - ]; - testToolDepends = [ hpc-coveralls hspec-discover ]; - description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "scotty_0_11_3" = callPackage - ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, data-default-class, directory, exceptions, fail , hspec, hspec-discover, hspec-wai, http-types, lifted-base , monad-control, mtl, nats, network, regex-compat, text , transformers, transformers-base, transformers-compat, wai @@ -185360,6 +185992,8 @@ self: { pname = "scotty"; version = "0.11.3"; sha256 = "14570k1klrlwra58zz7ip3j41nc75gaswrp8m4xwlrjzgpdqm70a"; + revision = "1"; + editedCabalFile = "0pcaw6wr8nqs7pl64pb00zxd359np5x35159lqkqlcziiv0n2g3b"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -186932,8 +187566,8 @@ self: { }: mkDerivation { pname = "sendgrid-v3"; - version = "0.1.1.0"; - sha256 = "1f8kxg6v6804qq7kl22ycff26kq6nh5n7kpkvbdx36pf54a6632w"; + version = "0.1.2.0"; + sha256 = "06j07c86560f4w4vpx6gbnmrbyhs9i69jksliifsd9a9flg93vx3"; libraryHaskellDepends = [ aeson base lens semigroups text wreq ]; testHaskellDepends = [ base semigroups tasty tasty-hunit text ]; description = "Sendgrid v3 API library"; @@ -187698,30 +188332,26 @@ self: { "servant-auth-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, bytestring-conversion, case-insensitive, cookie - , crypto-api, data-default-class, entropy, hspec, hspec-discover - , http-api-data, http-client, http-types, jose, lens, lens-aeson - , markdown-unlit, monad-time, mtl, QuickCheck, servant - , servant-auth, servant-server, tagged, text, time, transformers - , unordered-containers, wai, warp, wreq + , bytestring, case-insensitive, cookie, data-default-class, entropy + , hspec, hspec-discover, http-client, http-types, jose, lens + , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck + , servant, servant-auth, servant-server, tagged, text, time + , transformers, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.2.0"; - sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap"; - revision = "3"; - editedCabalFile = "1zjxqlfyw3wwlyq2faiq9gqhfixn2mvfsv8dapalxs9fph7a2nzj"; + version = "0.4.3.0"; + sha256 = "1kzh4j6118qjzhfbxlszwi6ixgg9g4zn903n9qwrb5z8c2y6b9bl"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data http-types jose lens - monad-time mtl servant servant-auth servant-server tagged text time - unordered-containers wai + case-insensitive cookie data-default-class entropy http-types jose + lens memory monad-time mtl servant servant-auth servant-server + tagged text time unordered-containers wai ]; testHaskellDepends = [ aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth - servant-server time transformers wai warp wreq + jose lens lens-aeson mtl QuickCheck servant-auth servant-server + time transformers wai warp wreq ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; @@ -188546,6 +189176,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-kotlin_0_1_1_6" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.1.6"; + sha256 = "0v16y6f956yf64npq8fm1q6j1q8yygci3amsxyvrggs1rdd8hi31"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp @@ -190086,8 +190742,8 @@ self: { }: mkDerivation { pname = "sets"; - version = "0.0.6"; - sha256 = "0vnh4wy4p4x0jcxlwzj3mpxhkjv3igg2lphjgxj4dqzd2qddj63d"; + version = "0.0.6.1"; + sha256 = "15msfpnifcavbi5dgsrpl2v9b7hyv0c8lqkkcl0mz0rdm69l2p4q"; libraryHaskellDepends = [ base bytestring commutative composition containers contravariant hashable keys mtl QuickCheck semigroupoids semigroups transformers @@ -191145,8 +191801,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.7"; - sha256 = "101ivifq9gcfafj295l773wpv0c0cqmh8zjzg65r1fhblhbd30f7"; + version = "0.6.8"; + sha256 = "0xv28s1b8rd1zd2mr5g6km8gwsy5ynsyji8fd68clq1rx9jjfcsc"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -191273,6 +191929,37 @@ self: { , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.8.0"; + sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk"; + revision = "1"; + editedCabalFile = "17achybammxg5i7zcmwlfcb7xk77q3lfvck3gqa9ljfb6ksgrxb7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process system-fileio system-filepath + text time transformers transformers-base unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shelly_1_8_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers , transformers-base, unix, unix-compat }: mkDerivation { @@ -191297,6 +191984,7 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -191340,10 +192028,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.1.0.0"; - sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518"; - revision = "1"; - editedCabalFile = "10h2hz3fda9zg6zpkmmjjfxjghs7g0cj3r85vifp0za9ap41ph3k"; + version = "0.2.0.0"; + sha256 = "1r3giir4l1l2pn4kamgmdqsw1j8qz9aaw741lq761yk1s3lciwim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191574,27 +192260,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "show-combinators"; - version = "0.1.0.0"; - sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12"; - revision = "2"; - editedCabalFile = "003ry21snn1b9ip5c1z62hzdy24ckbbb5zf637nxcf9qj07z2xsz"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Combinators to write Show instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "show-combinators_0_1_1_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "show-combinators"; version = "0.1.1.0"; sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-please" = callPackage @@ -192359,6 +193030,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-log_0_9_11" = callPackage + ({ mkDerivation, async, base, base-unicode-symbols, containers + , data-default, deepseq, directory, exceptions, filepath, hformat + , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore + , text, time, transformers + }: + mkDerivation { + pname = "simple-log"; + version = "0.9.11"; + sha256 = "1mqibcpcnwc0hqbcbvl32vv4458n02f2k2bnparh8ajm5n9h0cjk"; + libraryHaskellDepends = [ + async base base-unicode-symbols containers data-default deepseq + directory exceptions filepath hformat microlens microlens-platform + mmorph mtl SafeSemaphore text time transformers + ]; + testHaskellDepends = [ base hspec microlens-platform text ]; + description = "Simple log for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-log-syslog" = callPackage ({ mkDerivation, base, hsyslog, simple-log, text }: mkDerivation { @@ -192556,8 +193248,25 @@ self: { pname = "simple-sendfile"; version = "0.2.27"; sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn"; - revision = "1"; - editedCabalFile = "040adccwis3yy8af783vjz3a2yb3fcmm49cpzdgikm2293pwyj0p"; + revision = "2"; + editedCabalFile = "1590hn309h3jndahqh8ddrrn0jvag51al8jgb2p5l9m5r1ipn3i5"; + libraryHaskellDepends = [ base bytestring network unix ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra directory hspec HUnit network + process resourcet unix + ]; + description = "Cross platform library for the sendfile system call"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "simple-sendfile_0_2_28" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, hspec, HUnit, network, process, resourcet, unix + }: + mkDerivation { + pname = "simple-sendfile"; + version = "0.2.28"; + sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -192565,6 +193274,7 @@ self: { ]; description = "Cross platform library for the sendfile system call"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-server" = callPackage @@ -192760,8 +193470,8 @@ self: { }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.9"; - sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz"; + version = "0.4.0.10"; + sha256 = "0dyr9bg3y8613hd0zz7knkniq7p0hxm7w9pjs0jjhq586g0qh5ql"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ base doctest doctest-driver-gen tasty tasty-quickcheck @@ -193803,8 +194513,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.12.0.0"; - sha256 = "01qi6k9gcz6y8x8hlvsmm2irfvcsbdqqvzg5kgf2x02idmh9zy1a"; + version = "0.13.0.0"; + sha256 = "0b1mk6d79h4mkh71kgg208i15bik97a29hzs1j57qxipici680rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196340,6 +197050,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sockets" = callPackage + ({ mkDerivation, async, base, ip, posix-api, primitive, tasty + , tasty-hunit + }: + mkDerivation { + pname = "sockets"; + version = "0.1.0.0"; + sha256 = "000j2bfjsa33l73pg57g4rignl7dy0jl072r3h9wl4d1f4qc3sim"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ip posix-api primitive ]; + testHaskellDepends = [ async base ip primitive tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ip primitive ]; + description = "High-level network sockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "socketson" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , crypto-api, data-default, DRBG, either, errors, http-types @@ -196372,6 +197099,8 @@ self: { pname = "socks"; version = "0.5.6"; sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs"; + revision = "1"; + editedCabalFile = "19f6yzalxbvw0zi1z8wi0vz7s21p5anvfaqsaszppnkgk6j6nnvn"; libraryHaskellDepends = [ base bytestring cereal network ]; description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; @@ -197257,8 +197986,8 @@ self: { pname = "species"; version = "0.4.0.1"; sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; - revision = "1"; - editedCabalFile = "1pvk34n7lsbpng9b6m6nrhhr44z1pilh292j3lfnx69hvxhvaq93"; + revision = "2"; + editedCabalFile = "03rzc0f11c60h899nxifz4300hlic2nnnya75rx2b5rigy41714r"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -197274,8 +198003,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.2.1.2"; - sha256 = "11xylsi8gjshcs539y55gh23hf4b031ssnfjhpbajwjrmagynjnn"; + version = "0.2.2.3"; + sha256 = "017pf2sqw2p1ipflamlwsgkqsk83qm0y7sw672nkg4zvyck1arwc"; libraryHaskellDepends = [ base clustering eigen hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -199050,8 +199779,8 @@ self: { }: mkDerivation { pname = "stack2nix"; - version = "0.2.1"; - sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy"; + version = "0.2.2"; + sha256 = "0x5dsgq9mdibbbilc0wn86qqkdgjkm606y4ix57vwxpfgrgkd3wm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199066,7 +199795,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Convert stack.yaml files into Nix build instructions."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage" = callPackage @@ -199883,6 +200611,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "static-text_0_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, doctest, doctest-driver-gen + , markdown-unlit, tasty, tasty-hunit, template-haskell, text + , vector + }: + mkDerivation { + pname = "static-text"; + version = "0.2.0.4"; + sha256 = "19d43v2cp6wg861lc6rvimzqq20via6fvradysapmilq7svs5kq7"; + libraryHaskellDepends = [ + base bytestring template-haskell text vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-driver-gen markdown-unlit tasty + tasty-hunit template-haskell + ]; + testToolDepends = [ markdown-unlit ]; + description = "Lists, Texts, ByteStrings and Vectors of statically known length"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "staticanalysis" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { @@ -201041,8 +201791,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.29.0"; - sha256 = "0zncpgjklm649fzrjjy0bri0ivybrc7lvys8yq72b4dpb8ksp5zs"; + version = "0.29.1"; + sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201058,15 +201808,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_29_1" = callPackage + "stratosphere_0_30_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.29.1"; - sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; + version = "0.30.0"; + sha256 = "15cv5w93w6z1w5ry69iv0lab6qcdmwqvi0wyym4rigfs8ag3rrra"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202532,8 +203282,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.7"; - sha256 = "0hxy5znrfcls6bd8hjil97mya3w8zkppfd4jrz0ayz7zidbws5kg"; + version = "5.0.8"; + sha256 = "0wfi3s8hv11xs0wpvbc9z4nsskdpg5q7ivcpci8cnhn20wffb0nn"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -202801,8 +203551,8 @@ self: { }: mkDerivation { pname = "stylish-cabal"; - version = "0.4.0.1"; - sha256 = "00jwq35dr60c9gjwy8hg3i8b39gxknr92mrz21657gazl90cxy4z"; + version = "0.4.1.0"; + sha256 = "0yxxw22n2k4dpcxyzq140vg3l6338549qds1v3ggkwsykmz3469s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203637,10 +204387,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.2"; - sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s"; - revision = "3"; - editedCabalFile = "08fzw4v5w48d9x315hvl27pbg8c0dch9ihmw1f74g9pxnxmpfbxi"; + version = "1.3"; + sha256 = "19mf3sf3smza4yk21k98wb39mk3jg0nxr93nl924ivsyv514flgx"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -203667,6 +204415,8 @@ self: { pname = "sv-cassava"; version = "0.3"; sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; + revision = "1"; + editedCabalFile = "01xfdl296jcdh7c4yirzf6z0787z941h6p58dn5xhnsr965sncg1"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -203703,6 +204453,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sv-core_0_4" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, contravariant, deepseq, double-conversion, lens, mtl + , parsec, profunctors, QuickCheck, readable, semigroupoids + , semigroups, tasty, tasty-quickcheck, text, transformers, trifecta + , utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv-core"; + version = "0.4"; + sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring containers contravariant + deepseq double-conversion lens mtl parsec profunctors readable + semigroupoids semigroups text transformers trifecta utf8-string + validation vector void + ]; + testHaskellDepends = [ + base bytestring profunctors QuickCheck semigroupoids semigroups + tasty tasty-quickcheck text validation vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sv-svfactor" = callPackage ({ mkDerivation, base, bytestring, lens, profunctors, sv-core , svfactor, validation @@ -203711,6 +204487,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; + revision = "1"; + editedCabalFile = "0g0bswas1y06k1yg9lgzwm36pyxd05s3pji3nsiqff6bhfph3d37"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -204413,8 +205191,8 @@ self: { ({ mkDerivation, base, containers, hspec, HUnit }: mkDerivation { pname = "symmetric-properties"; - version = "0.1.0.0"; - sha256 = "10q6w071fa9nyrg7kz9zil3jz7xpvp5l8ni4kddra10dp2hnwg80"; + version = "0.1.0.1"; + sha256 = "06gsplc7l3vc5gyqh0c7ih814x826zjamx6ngsjx5pj1jsbia1wm"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec HUnit ]; description = "Monoids for sameness and uniqueness"; @@ -206335,8 +207113,8 @@ self: { }: mkDerivation { pname = "tar-conduit"; - version = "0.3.1"; - sha256 = "15w1qs276x2j13s3dg5a0d8jjcs3rf8hhnfa2m6p8jm7kjirvahm"; + version = "0.3.2"; + sha256 = "0bgn3hyf20g1gfnzy8f41s7nj54kfcyjk2izw99svrw8f3dphi80"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators directory filepath safe-exceptions text unix @@ -206568,6 +207346,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_1_2_1_0" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "1.2.1.0"; + sha256 = "0a0iqc9vnrj4a44h77larcprydipwxy9qkh3zb6zk9mpn9fas498"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit @@ -207232,6 +208022,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tcp-streams_1_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, directory + , HUnit, io-streams, network, pem, test-framework + , test-framework-hunit, tls, x509, x509-store, x509-system + }: + mkDerivation { + pname = "tcp-streams"; + version = "1.0.1.1"; + sha256 = "1dz21ycm06d9mwc6dbjr8ansl212ril3i5jl73yzkdi9ngj16qqa"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring data-default-class io-streams network pem tls x509 + x509-store x509-system + ]; + testHaskellDepends = [ + base bytestring directory HUnit io-streams network test-framework + test-framework-hunit + ]; + description = "One stop solution for tcp client and server with tls support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tcp-streams-openssl" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system , HUnit, io-streams, network, tcp-streams, test-framework @@ -208168,22 +208981,6 @@ self: { }: mkDerivation { pname = "tensors"; - version = "0.1.1"; - sha256 = "1pqn4vmkdi4r3s2p0rycv8yyarphifl067wdw7bj41dsv65qk8j3"; - libraryHaskellDepends = [ base reflection singletons vector ]; - testHaskellDepends = [ - base hspec QuickCheck reflection singletons vector - ]; - description = "Tensor in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tensors_0_1_2" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, reflection, singletons - , vector - }: - mkDerivation { - pname = "tensors"; version = "0.1.2"; sha256 = "19r1jjpb8vbjmjbcs0sgnn83mniihw2v1dwhpkm6alrxqdai1637"; libraryHaskellDepends = [ base reflection singletons vector ]; @@ -208192,7 +208989,6 @@ self: { ]; description = "Tensor in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "term-rewriting" = callPackage @@ -208272,6 +209068,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "terminal" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, prettyprinter + , stm, tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "terminal"; + version = "0.1.0.0"; + sha256 = "15km89sb94aqnyjvl1i63nqchqszd9hpa46sxrv2wbbn1dajcfbx"; + libraryHaskellDepends = [ + async base bytestring exceptions prettyprinter stm text + transformers + ]; + testHaskellDepends = [ + async base bytestring exceptions prettyprinter stm tasty + tasty-hunit tasty-quickcheck text transformers + ]; + description = "Portable terminal interaction library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "terminal-progress-bar" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, terminal-size , test-framework, test-framework-hunit, text, time @@ -208291,6 +209107,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-punch" = callPackage + ({ mkDerivation, ansi-terminal, base, filepath, QuickCheck, text + , time + }: + mkDerivation { + pname = "terminal-punch"; + version = "0.1.1"; + sha256 = "11z6jb130300yjkrl511960anjac9ncc3g1yj6jqpah6j2imsa8s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base filepath text time + ]; + testHaskellDepends = [ base QuickCheck time ]; + description = "Simple terminal-based time tracker"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "terminal-size" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -208330,12 +209164,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "terminfo_0_4_1_3" = callPackage + "terminfo_0_4_1_4" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.1.3"; - sha256 = "09hf9wrp2q3k4y9fcp4fzmk34zh7hfmp0mfqxc0v6h5clajdbvai"; + version = "0.4.1.4"; + sha256 = "170pnql6ycpk6gwy9v28mppm0w2n89l0n6fhnzph2za9kwrs9fqh"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -210624,26 +211458,6 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.2.0.1"; - sha256 = "1mki2s821b1zpdn5463qz5vl3kvxxam90iax1n6vznf0d7p4rik5"; - libraryHaskellDepends = [ - base bytestring containers directory filepath primitive syb - template-haskell text th-orphans - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec primitive syb - template-haskell text th-orphans vector - ]; - description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "th-utilities_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hspec, primitive, syb, template-haskell, text, th-orphans, vector - }: - mkDerivation { - pname = "th-utilities"; version = "0.2.1.0"; sha256 = "1kc3zv43948whv47cpmwnqw90iz68dmi1bmw9b183bnd0yr7wnfb"; libraryHaskellDepends = [ @@ -210656,7 +211470,6 @@ self: { ]; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thank-you-stars" = callPackage @@ -211135,25 +211948,24 @@ self: { "thrift" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network - , network-uri, QuickCheck, split, text, unordered-containers - , vector + , bytestring, containers, ghc-prim, hashable, hspec, hspec-core + , HTTP, network, network-uri, QuickCheck, split, text + , unordered-containers, vector }: mkDerivation { pname = "thrift"; - version = "0.10.0"; - sha256 = "01vxik64gnsnm0y9mh82dv48f711231dhc4kksdmgs7f352fc1k7"; + version = "0.12.0"; + sha256 = "1yzfq671apw3mjaws16a6agjw3vpm7yz0gdp3kyh8vvbp5d0czyf"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring containers - ghc-prim hashable HTTP network network-uri QuickCheck split text - unordered-containers vector + ghc-prim hashable hspec-core HTTP network network-uri QuickCheck + split text unordered-containers vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck unordered-containers ]; description = "Haskell bindings for the Apache Thrift RPC system"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.asl20; }) {}; "thrist" = callPackage @@ -211438,15 +212250,18 @@ self: { "tidal" = callPackage ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, text, vector + , microspec, mwc-random, network, parsec, text, transformers + , vector }: mkDerivation { pname = "tidal"; - version = "1.0.6"; - sha256 = "0hs9ywd6cpsw1cnjr2kw8p1hwrw2fgd3bqqv7hffxn6dlsslbgj2"; + version = "1.0.7"; + sha256 = "1p2h3g9fa3jd3133ryhcdpkb6a3a3994hrbr1ryd0gza8gd3bgv1"; + revision = "1"; + editedCabalFile = "16ingdhhc38zj1gixj3c7b01lr9lbnxkr8pf0x2j8z1jpbl7jg4a"; libraryHaskellDepends = [ base bifunctors colour containers hosc mwc-random network parsec - text vector + text transformers vector ]; testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; @@ -212449,8 +213264,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.9.2"; - sha256 = "1pid79ar85ajs6gi5d8smqn9ivfr8y50qys1n5zq68kpx2gmf3lq"; + version = "1.9.5"; + sha256 = "1z7yvp0c10gkxljg6lkn26niigx0wkdmzs7pqjd666lgzk0ji5hy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213099,19 +213914,33 @@ self: { }) {}; "tokenizer-monad" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "tokenizer-monad"; - version = "0.1.0.0"; - sha256 = "1n31n3wql93ljjgzfxpl5qd7kdb3dmr00yw0sz0wkkfgh2id1m99"; - revision = "1"; - editedCabalFile = "0ahl0aj1xrpnd8m7aa9bp94lid0ypnmwi4cishrr1ixnwl2bdlnx"; - libraryHaskellDepends = [ base text ]; + version = "0.2.2.0"; + sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn"; + libraryHaskellDepends = [ base bytestring text ]; description = "An efficient and easy-to-use tokenizer monad"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tokenizer-streaming" = callPackage + ({ mkDerivation, base, bytestring, mtl, streaming + , streaming-bytestring, streaming-commons, text, tokenizer-monad + }: + mkDerivation { + pname = "tokenizer-streaming"; + version = "0.1.0.1"; + sha256 = "0ml4fby87z1fgk2v3if3z6bf1h9gsdcjgmq6lr77qsri2yfcscla"; + libraryHaskellDepends = [ + base bytestring mtl streaming streaming-bytestring + streaming-commons text tokenizer-monad + ]; + description = "A variant of tokenizer-monad that supports streaming"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tokstyle" = callPackage ({ mkDerivation, array, base, deepseq, filepath, language-c }: mkDerivation { @@ -213243,6 +214072,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tomland_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , gauge, hashable, hedgehog, hspec-megaparsec, htoml + , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec + , parser-combinators, tasty, tasty-discover, tasty-hedgehog + , tasty-hspec, tasty-silver, text, time, toml-parser, transformers + , unordered-containers + }: + mkDerivation { + pname = "tomland"; + version = "1.0.0"; + sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6"; + revision = "1"; + editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec mtl + parser-combinators text time transformers unordered-containers + ]; + executableHaskellDepends = [ base text time unordered-containers ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + base bytestring containers hashable hedgehog hspec-megaparsec + megaparsec tasty tasty-hedgehog tasty-hspec tasty-silver text time + unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + aeson base deepseq gauge htoml htoml-megaparsec parsec text time + toml-parser + ]; + description = "Bidirectional TOML serialization"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -213276,8 +214142,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.0.0"; - sha256 = "18ziyj0d4xfhbwk7z84drhqgngmy71gmdv2jma8ikfjlahs6mf5b"; + version = "0.1.1.0"; + sha256 = "0hilycd6m32jv3gbsq6j182mc3igcxnhsfqzn6sj5zbip0kx17h7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213810,8 +214676,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.4"; - sha256 = "0dzcmb10imksryr6lpmnq8b7bzqkm9y1dkyx52k1ic5yms3rwxyx"; + version = "0.5"; + sha256 = "1vzq0jfa9dxaqpkk0wipd3jmppdkr0jypb2463b63qzb0jc6f05n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -215222,8 +216088,8 @@ self: { }: mkDerivation { pname = "ttl-hashtables"; - version = "1.1.0.0"; - sha256 = "09pngm18sjv0bd3a79ijbxgz8s7zlpblj6zinxfg6yg5s529q3i4"; + version = "1.3.0.0"; + sha256 = "1qlwwxylj9d2p4jm4bi0a3x60cfzd6g982v6q0crs323zn8q5cj5"; libraryHaskellDepends = [ base clock containers data-default failable hashable hashtables mtl transformers @@ -216868,6 +217734,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-spec_0_4_0_0" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "type-spec"; + version = "0.4.0.0"; + sha256 = "0z94hgvmnpcv9va7spdkmbxz99ri1skdq3kwxbid77cpyh95xsxq"; + libraryHaskellDepends = [ base pretty ]; + testHaskellDepends = [ base ]; + description = "Type Level Specification by Example"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-spine" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -216981,6 +217860,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-admin" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, data-default-class + , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session + , heterocephalus, http-api-data, http-types, lucid, monad-control + , mtl, persistable-record, relational-query, relational-query-HDBC + , relational-record, template-haskell, text, time, transformers + , transformers-base, unordered-containers, utf8-string, wai + , wai-extra, warp, yaml + }: + mkDerivation { + pname = "typed-admin"; + version = "0.1.0.0"; + sha256 = "146dkmcrq1rsw7mpdyxa9vhnsr8rfgqz88r10f60chn1m7yhlk7q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup bytestring data-default-class exceptions + generic-lens HDBC HDBC-postgresql HDBC-session heterocephalus + http-api-data http-types lucid monad-control mtl persistable-record + relational-query relational-query-HDBC relational-record + template-haskell text time transformers transformers-base + unordered-containers utf8-string wai wai-extra warp yaml + ]; + description = "Admin console framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typed-duration" = callPackage ({ mkDerivation, base, lifted-base, monad-control , transformers-base @@ -217002,8 +217908,8 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.3.0"; - sha256 = "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0"; + version = "0.2.4.0"; + sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -217257,6 +218163,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typerep-map_0_3_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat + , hedgehog, primitive, QuickCheck, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, vector + }: + mkDerivation { + pname = "typerep-map"; + version = "0.3.1"; + sha256 = "1ycyk47h578vf4kpf1y708zg9cc6i028jv1fdaw3zy59wrbl8y74"; + revision = "2"; + editedCabalFile = "0zcvg2kr3kcnhxdndw6fcjdd1421ncglr34mc8d9sw1hjjcb5w38"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim primitive vector + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover + tasty-hedgehog tasty-hspec + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq dependent-map dependent-sum + ghc-typelits-knownnat + ]; + doHaddock = false; + description = "Efficient implementation of a dependent map with types as keys"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -217339,8 +218275,8 @@ self: { }: mkDerivation { pname = "typograffiti"; - version = "0.1.0.0"; - sha256 = "0wd7p6hyn0v8rkvcpbqyjarhv47hi1r3fjzmrldfkylfwnhzj0lf"; + version = "0.1.0.2"; + sha256 = "1i7my9vqkabwxsj6hp9alvlpb483vs07f07662i707kpqf5pryrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217355,7 +218291,7 @@ self: { base bytestring containers freetype2 gl linear mtl pretty-show stm template-haskell vector ]; - description = "Display TTF fonts in OpenGL. Includes caching for fast rendering."; + description = "Just let me draw nice text already"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -217565,8 +218501,8 @@ self: { pname = "ucam-webauth"; version = "0.1.0.0"; sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k"; - revision = "2"; - editedCabalFile = "1myl5nncwmld4hr0b9990dnqn9ydvza5ciqw5b8pjl747g9qky9f"; + revision = "3"; + editedCabalFile = "01j0296a60hpw0n5d50327hnqpkxwzz7pngxq8da5ram0q13cfzw"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers cryptonite errors http-api-data http-types microlens microlens-mtl mtl @@ -217592,8 +218528,8 @@ self: { pname = "ucam-webauth-types"; version = "0.1.0.0"; sha256 = "0jq66amdmrbkg69m0cbbw7xfvsc9iy74khn1k39n7jkq821pzjni"; - revision = "2"; - editedCabalFile = "1pbl2sy17pkc15170h96ard4z155fm45g18jdxjcdx9hacl003rw"; + revision = "3"; + editedCabalFile = "1png0b60pfhx5gfwbmxxq42nfy9yj2zrcw8krq0vm45qgjw4gd8g"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq http-types microlens microlens-mtl mtl text time timerep @@ -218605,8 +219541,8 @@ self: { pname = "uniprot-kb"; version = "0.1.2.0"; sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; - revision = "2"; - editedCabalFile = "1kyqbp32a9wys94rxbm5k022crpnm6fnz8w2d3anb7zch17l80qw"; + revision = "3"; + editedCabalFile = "1a532yhvgs7n096f6mjwm7811d2c6xbgr45gscg7d4ys042c0586"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -218665,8 +219601,8 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.5.0.2"; - sha256 = "0rf2z02r4nk5z9f6937g25brvq391qy8a63mawnkk8hidq8af09j"; + version = "0.5.1"; + sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -219182,6 +220118,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-time_0_4_5" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover + , old-locale, old-time, QuickCheck, time + }: + mkDerivation { + pname = "unix-time"; + version = "0.4.5"; + sha256 = "1bwg132x2613k93wxka17461fc72wrjy5vmgcyami0nn5b30ay7y"; + libraryHaskellDepends = [ base binary bytestring old-time ]; + testHaskellDepends = [ + base bytestring hspec old-locale old-time QuickCheck time + ]; + testToolDepends = [ hspec-discover ]; + description = "Unix time parser/formatter and utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific @@ -219363,6 +220317,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_10_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.10.0"; + sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -222256,6 +223234,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_16" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.16"; + sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -223604,6 +224594,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai_3_2_2" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover + , http-types, network, text, transformers, vault + }: + mkDerivation { + pname = "wai"; + version = "3.2.2"; + sha256 = "1qbzq4k8b23pg1knw5y99rdvkfywnncwqkfrkp2w7g6p054xar1a"; + libraryHaskellDepends = [ + base bytestring http-types network text transformers vault + ]; + testHaskellDepends = [ base bytestring hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Web Application Interface"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-accept-language" = callPackage ({ mkDerivation, base, bytestring, file-embed, http-types, text , wai, wai-app-static, wai-extra, warp, word8 @@ -223800,6 +224808,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-enforce-https" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, hspec + , http-types, network, text, wai, wai-extra, warp, warp-tls + }: + mkDerivation { + pname = "wai-enforce-https"; + version = "0.0.1"; + sha256 = "0gm4n57abmbawpij3hsn6ia283b75sn40387dimpp573q5nnnwmv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive http-types network text wai + ]; + executableHaskellDepends = [ base http-types wai warp warp-tls ]; + testHaskellDepends = [ + base bytestring case-insensitive hspec http-types wai wai-extra + ]; + description = "Enforce HTTPS in Wai server app safely"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-eventsource" = callPackage ({ mkDerivation, wai }: mkDerivation { @@ -223841,6 +224870,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_25" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.25"; + sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute network old-locale + resourcet streaming-commons text time transformers unix unix-compat + vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -225344,6 +226403,8 @@ self: { pname = "warp"; version = "3.2.25"; sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy"; + revision = "1"; + editedCabalFile = "0q0l9s1c9m20g7j6lgrj7d3l0awr3hc35bvm95an61hg18cilngj"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -225366,6 +226427,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_26" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.26"; + sha256 = "1s83313cs6w84a8yfwqkixfz4a94aszma4phsqv7x1ivi9b3i8sc"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -225776,8 +226872,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2.1"; - sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m"; + version = "0.1.2.2"; + sha256 = "0cbf46d1a55y7j2d84crhfdsgy0c2x0rfmvhhwxxh5pigg846cd2"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -226044,27 +227140,27 @@ self: { , hspec-contrib, hspec-discover, hspec-expectations, http-client , http-client-tls, machines, memory, microlens, microlens-aeson , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random - , relapse, secp256k1-haskell, split, stm, tagged, template-haskell - , text, time, transformers, vinyl + , relapse, split, stm, tagged, template-haskell, text, time + , transformers, uuid-types, vinyl }: mkDerivation { pname = "web3"; - version = "0.8.2.1"; - sha256 = "1dcv7977r98lrwh12si9vzvm5bcjdyfdivl63r5zwkykapd15z00"; + version = "0.8.3.0"; + sha256 = "1g97dv41widcl612zi49mqf9f61zwp23ml0xf5kw9ac51c683s1q"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop http-client http-client-tls machines memory microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec relapse secp256k1-haskell tagged template-haskell text - transformers vinyl + parsec relapse tagged template-haskell text transformers uuid-types + vinyl ]; testHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop hspec hspec-contrib hspec-discover hspec-expectations http-client http-client-tls machines memory microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec random relapse secp256k1-haskell split stm tagged - template-haskell text time transformers vinyl + parsec random relapse split stm tagged template-haskell text time + transformers uuid-types vinyl ]; testToolDepends = [ hspec-discover ]; description = "Ethereum API for Haskell"; @@ -226072,7 +227168,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "web3_0_8_3_0" = callPackage + "web3_0_8_3_1" = callPackage ({ mkDerivation, aeson, async, base, basement, bytestring, cereal , cryptonite, data-default, exceptions, generics-sop, hspec , hspec-contrib, hspec-discover, hspec-expectations, http-client @@ -226083,8 +227179,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.8.3.0"; - sha256 = "1g97dv41widcl612zi49mqf9f61zwp23ml0xf5kw9ac51c683s1q"; + version = "0.8.3.1"; + sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop http-client http-client-tls machines memory @@ -228355,6 +229451,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq_0_5_3_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , authenticate-oauth, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, case-insensitive, containers + , cryptonite, directory, doctest, exceptions, filepath, ghc-prim + , hashable, http-client, http-client-tls, http-types, HUnit, lens + , lens-aeson, memory, mime-types, network-info, psqueues + , QuickCheck, snap-core, snap-server, template-haskell, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, transformers, unix-compat + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "wreq"; + version = "0.5.3.2"; + sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base base16-bytestring + bytestring case-insensitive containers cryptonite exceptions + ghc-prim hashable http-client http-client-tls http-types lens + lens-aeson memory mime-types psqueues template-haskell text time + time-locale-compat unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring + case-insensitive containers directory doctest filepath hashable + http-client http-types HUnit lens lens-aeson network-info + QuickCheck snap-core snap-server temporary test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat unordered-containers uuid vector + ]; + description = "An easy-to-use HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wreq-sb" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -228806,6 +229941,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_12" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.12"; + sha256 = "1xnnyavkgf2cdnsm494bl1z275l9rynh9s3djq3mqk6lrr4bvsix"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -231326,25 +232476,25 @@ self: { , monad-logger, mtl, mwc-random, QuickCheck, reflection, salak , scientific, servant-client, servant-server, servant-swagger , servant-swagger-ui, swagger2, text, unliftio-core - , unordered-containers, vault, wai, wai-extra, warp + , unordered-containers, vault, vector, wai, warp }: mkDerivation { pname = "yam"; - version = "0.5.7"; - sha256 = "0vswpq0mzc4x6kjyzg0fyq0bb2ywqh0vh2nsvx9qymdd6vg8nx9y"; + version = "0.5.11"; + sha256 = "0k9y8zg1sbdxb6c3fdmlz0dswb8yam5x812avfw6rg3as8sp1pcf"; libraryHaskellDepends = [ base base16-bytestring binary bytestring data-default fast-logger http-client http-types lens monad-logger mtl mwc-random reflection salak scientific servant-client servant-server servant-swagger servant-swagger-ui swagger2 text unliftio-core unordered-containers - vault wai wai-extra warp + vault vector wai warp ]; testHaskellDepends = [ base base16-bytestring binary bytestring data-default fast-logger hspec http-client http-types lens monad-logger mtl mwc-random QuickCheck reflection salak scientific servant-client servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault wai wai-extra warp + unliftio-core unordered-containers vault vector wai warp ]; description = "Yam Web"; license = stdenv.lib.licenses.bsd3; @@ -231396,8 +232546,8 @@ self: { }: mkDerivation { pname = "yam-datasource"; - version = "0.5.7"; - sha256 = "0sqrc0w5mvjjkih9dcqbiz12n20zvqmc6qhwsn4fxd9air2x8yfc"; + version = "0.5.11"; + sha256 = "170xpd1kw403g9zds795zbxkaz0qy7lfgzppx4q0ri42ky59z8pl"; libraryHaskellDepends = [ base conduit persistent resource-pool resourcet unliftio-core yam ]; @@ -232691,28 +233841,6 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.0.0"; - sha256 = "12n2af0by708d5g2080y6w1xf8h692v1nxzgmwqfmsqf0c51ad05"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring errors hoauth2 http-client http-conduit - http-types microlens random safe-exceptions text uri-bytestring - yesod-auth yesod-core - ]; - testHaskellDepends = [ base hspec uri-bytestring ]; - description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-auth-oauth2_0_6_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec - , http-client, http-conduit, http-types, microlens, random - , safe-exceptions, text, uri-bytestring, yesod-auth, yesod-core - }: - mkDerivation { - pname = "yesod-auth-oauth2"; version = "0.6.1.0"; sha256 = "148w2cn6f0mn6qyymxr2zlw8jnhyjqhzhszhy1faca8ziqsi9mas"; isLibrary = true; @@ -232988,6 +234116,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_10_1" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, fast-logger, gauge, hspec, hspec-expectations + , http-types, HUnit, monad-logger, mtl, network, parsec + , path-pieces, primitive, random, resourcet, rio, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , unix-compat, unliftio, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.10.1"; + sha256 = "0xkfzdy1r07w7xqai4r5b96rrk51gr5ndwrf20nhdnjjms4928li"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types monad-logger mtl + parsec path-pieces primitive random resourcet rio shakespeare + template-haskell text time transformers unix-compat unliftio + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -233268,6 +234433,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_6_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, text, time, transformers, wai + , xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.6.4"; + sha256 = "0iqcrbmwhgfk78qi2n1n3i39izqr7km4i8fa1zmvplqkcbyi149c"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare text time + transformers wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, text, yesod-core, yesod-form }: mkDerivation { @@ -234182,8 +235370,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.5.1"; - sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj"; + version = "1.6.6"; + sha256 = "1h82njqkbr6h6saixkzim83srx794s6x6qrcmr0w82z5mfl2nfjf"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -234191,8 +235379,8 @@ self: { transformers wai wai-extra xml-conduit xml-types yesod-core ]; testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch deleted file mode 100644 index 46d7afada4ad..000000000000 --- a/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 2e0e557e7512ddd0376f179e82c811d8b4cce401 Mon Sep 17 00:00:00 2001 -From: Joey Hess <joeyh@joeyh.name> -Date: Sat, 5 Jan 2019 11:54:06 -0400 -Subject: [PATCH] Support being built with ghc 8.0.1 (MonadFail) - -Tested on an older ghc by enabling MonadFailDesugaring globally. - -In TransferQueue, the lack of a MonadFail for STM exposed what would -normally be a bug in the pattern matching, although in this case an -earlier check that the queue was not empty avoided a pattern match -failure. ---- - Annex.hs | 2 ++ - Assistant/Monad.hs | 2 ++ - Assistant/TransferQueue.hs | 21 +++++++++++---------- - CHANGELOG | 1 + - 4 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/Annex.hs b/Annex.hs -index 0a0368d36..af0ede1f4 100644 ---- a/Annex.hs -+++ b/Annex.hs -@@ -74,6 +74,7 @@ import "mtl" Control.Monad.Reader - import Control.Concurrent - import Control.Concurrent.Async - import Control.Concurrent.STM -+import qualified Control.Monad.Fail as Fail - import qualified Control.Concurrent.SSem as SSem - import qualified Data.Map.Strict as M - import qualified Data.Set as S -@@ -93,6 +94,7 @@ newtype Annex a = Annex { runAnnex :: ReaderT (MVar AnnexState) IO a } - MonadCatch, - MonadThrow, - MonadMask, -+ Fail.MonadFail, - Functor, - Applicative - ) -diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs -index 403ee16a8..ef2ee6012 100644 ---- a/Assistant/Monad.hs -+++ b/Assistant/Monad.hs -@@ -27,6 +27,7 @@ module Assistant.Monad ( - - import "mtl" Control.Monad.Reader - import System.Log.Logger -+import qualified Control.Monad.Fail as Fail - - import Annex.Common - import Assistant.Types.ThreadedMonad -@@ -49,6 +50,7 @@ newtype Assistant a = Assistant { mkAssistant :: ReaderT AssistantData IO a } - Monad, - MonadIO, - MonadReader AssistantData, -+ Fail.MonadFail, - Functor, - Applicative - ) -diff --git a/Assistant/TransferQueue.hs b/Assistant/TransferQueue.hs -index 6a4473262..7c0ab80d0 100644 ---- a/Assistant/TransferQueue.hs -+++ b/Assistant/TransferQueue.hs -@@ -191,17 +191,18 @@ getNextTransfer acceptable = do - sz <- readTVar (queuesize q) - if sz < 1 - then retry -- blocks until queuesize changes -- else do -- (r@(t,info):rest) <- readTList (queuelist q) -- void $ modifyTVar' (queuesize q) pred -- setTList (queuelist q) rest -- if acceptable info -- then do -- adjustTransfersSTM dstatus $ -- M.insert t info -- return $ Just r -- else return Nothing -+ else readTList (queuelist q) >>= \case -+ [] -> retry -- blocks until something is queued -+ (r@(t,info):rest) -> do -+ void $ modifyTVar' (queuesize q) pred -+ setTList (queuelist q) rest -+ if acceptable info -+ then do -+ adjustTransfersSTM dstatus $ -+ M.insert t info -+ return $ Just r -+ else return Nothing - - {- Moves transfers matching a condition from the queue, to the - - currentTransfers map. -} - diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index c7663a116763..918b2c2515e2 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchgit, clang }: +{ stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "mujs-2017-01-24"; + name = "mujs-${version}"; + version = "1.0.5"; - src = fetchgit { - url = git://git.ghostscript.com/mujs.git; - rev = "4006739a28367c708dea19aeb19b8a1a9326ce08"; - sha256 = "0wvjl8lkh0ga6fkmxgjqq77yagncbv1bdy6hpnxq31x3mkwn1s51"; + src = fetchurl { + url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; + sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l"; }; - buildInputs = [ clang ]; + buildInputs = [ readline ]; makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = http://mujs.com/; description = "A lightweight, embeddable Javascript interpreter"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 15536c6370a3..efe14da5834f 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { mkdir src/build cd src/build - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" $LD_LIBRARY_PATH) + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) ''; shared = if stdenv.isDarwin then "dylib" else "shared"; diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index c67d72705482..c67d72705482 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 811dfc47194a..cff960b29a73 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -11,27 +11,21 @@ in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q"; + sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil"; }; sourceRoot = "apache-arrow-${version}/cpp"; patches = [ - # fix ARROW-3467 - ./double-conversion_cmake.patch - # patch to fix python-test ./darwin.patch - - # facebook/zstd#1385 - ./zstd136.patch ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; preConfigure = '' @@ -58,6 +52,7 @@ stdenv.mkDerivation rec { ZSTD_HOME = zstd; cmakeFlags = [ + "-DARROW_BUILD_TESTS=ON" "-DARROW_PYTHON=ON" "-DARROW_PARQUET=ON" ]; diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch deleted file mode 100644 index 336fdde9e8fb..000000000000 --- a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -615,7 +615,7 @@ endif(UNIX) - set(ARROW_LINK_LIBS) - - # Libraries to link statically with libarrow.so --set(ARROW_STATIC_LINK_LIBS double-conversion) -+set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET}) - - if (ARROW_WITH_BROTLI) - SET(ARROW_STATIC_LINK_LIBS -@@ -694,7 +694,7 @@ else () - set(ARROW_MIN_TEST_LIBS - arrow_shared - ${ARROW_LINK_LIBS} -- double-conversion -+ ${DOUBLE_CONVERSION_TARGET} - ${BOOST_SYSTEM_LIBRARY} - ${BOOST_FILESYSTEM_LIBRARY} - ${BOOST_REGEX_LIBRARY} -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") - set(DOUBLE_CONVERSION_VENDORED 1) - else() - find_package(double-conversion REQUIRED) -+ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion) - set(DOUBLE_CONVERSION_VENDORED 0) - endif() - - include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) --ADD_THIRDPARTY_LIB(double-conversion -- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) - - if (DOUBLE_CONVERSION_VENDORED) -+ ADD_THIRDPARTY_LIB(double-conversion -+ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) -+ set(DOUBLE_CONVERSION_TARGET double-conversion) - add_dependencies(arrow_dependencies double-conversion_ep) - endif() - diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch deleted file mode 100644 index 1bdeecaef990..000000000000 --- a/pkgs/development/libraries/arrow-cpp/zstd136.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/arrow/util/compression_zstd.cc -+++ b/src/arrow/util/compression_zstd.cc -@@ -35,8 +35,13 @@ namespace util { - - Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len, - uint8_t* output_buffer) { -+ void *safe_output_buffer = static_cast<void*>(output_buffer); -+ int dummy {}; -+ if ((output_len == 0) && (output_buffer == NULL)) { -+ safe_output_buffer = static_cast<void*>(&dummy); -+ } - int64_t decompressed_size = -- ZSTD_decompress(output_buffer, static_cast<size_t>(output_len), input, -+ ZSTD_decompress(safe_output_buffer, static_cast<size_t>(output_len), input, - static_cast<size_t>(input_len)); - if (decompressed_size != output_len) { - return Status::IOError("Corrupt ZSTD compressed data."); diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 27a8b7b1119e..7b130d48928e 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { version = "2.1.27"; src = fetchurl { - url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz"; + urls = + [ "http://www.cyrusimap.org/releases/${name}.tar.gz" + "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; }; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 2cfa4b1d3cd6..e0cd1227f7ea 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -95,6 +95,7 @@ , libxcbxfixesExtlib ? true # X11 grabbing mouse rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support +, libXext ? null # Xlib support , lzma ? null # xz-utils , nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers @@ -139,7 +140,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, CF +, VideoDecodeAcceleration, cf-private }: /* Maintainer notes: @@ -230,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0.2"; + version = "4.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59"; + sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3"; }; prePatch = '' @@ -355,7 +356,7 @@ stdenv.mkDerivation rec { (enableFeature (libvorbis != null) "libvorbis") (enableFeature (libvpx != null) "libvpx") (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null) "xlib") + (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") (enableFeature (libxcb != null) "libxcb") (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") @@ -408,7 +409,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib libGLU_combined @@ -431,7 +432,7 @@ stdenv.mkDerivation rec { FILES+=($(ls $out/lib/*.dylib)) for f in ''${FILES[@]}; do if [ ! -h "$f" ]; then - install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" + install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" fi done ''; diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index b99c7240daec..f8343e668a67 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.4"; - sha256 = "0xmcijcpa7b59ws5ycmnp0a3pjmnpgly0zv8yff6if4p7pw7406f"; + branch = "3.4.5"; + sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index b470d45ba43f..9821357de3b9 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0.2"; - sha256 = "0mnh41j3kzi3x3clai1yhqasr1kc8zvd5cz0283pxhs2bxrm2v1l"; + branch = "4.1"; + sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 7ad5680c75cd..616394c6a084 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.109"; + version = "1.00.110"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "0d00ixf78jzkyhccxjsaspz7yvlwk0xvrfcqfca4cwnwvnyb54ry"; + sha256 = "1zxgvc9ikw34fsbkn9by7hwqz0p6m3f178zmj2s0qqpi84qq1vw2"; }; buildInputs = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 642063220b2c..6b7a58fa30d9 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gdal-${version}"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "191jknma0vricrgdcdmwh8588rwly6a77lmynypxdl87i3z7hv9z"; + sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite @@ -51,6 +51,20 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + + # poppler 0.73.0 support + patch -lp2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; + sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; + } + } || true + patch -p2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; + sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; + } + } ''; # - Unset CC and CXX as they confuse libtool. diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index 5098ff3bd8bb..45a29e15ede8 100644 --- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { - name = "gdl-${version}"; + pname = "gdl"; version = "3.28.0"; src = fetchurl { - url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; }; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ libxml2 gtk3 ]; + passthru = { - updateScript = gnome3.updateScript { packageName = "gdl"; attrPath = "gnome3.gdl"; }; + updateScript = gnome3.updateScript { + packageName = "gdl"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk3 intltool ]; - meta = with stdenv.lib; { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 37275489cc3d..024ccf2a4537 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -8,6 +8,7 @@ , doCheck ? stdenv.config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info +, darwin }: with stdenv.lib; @@ -44,6 +45,7 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; + binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; version = "2.58.2"; in @@ -83,7 +85,12 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ libselinux utillinuxMinimal # for libmount - ]; + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit Carbon Cocoa CoreFoundation CoreServices Foundation + # Needed for CFURLCreateFromFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + darwin.cf-private + ]); nativeBuildInputs = [ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales @@ -121,15 +128,17 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $bin/bin - for app in gapplication gdbus gio gsettings; do + for app in ${concatStringsSep " " binPrograms}; do mv "$dev/bin/$app" "$bin/bin" done + '' + optionalString (!stdenv.isDarwin) '' # Add gio-launch-desktop to $out so we can refer to it from $dev mkdir $out/bin mv "$dev/bin/gio-launch-desktop" "$out/bin/" ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" + '' + '' moveToOutput "share/glib-2.0" "$dev" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 10d5ee275006..054e6df0e4c9 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3 }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig gnum4 ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + ]); propagatedBuildInputs = [ glib libsigcxx ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 0e4ef72b8aae..fc98af8b2cae 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "fix-key-expiry.patch"; - url = "https://files.gnupg.net/file/data/fehgbjmataj5tc2pnfhj/PHID-FILE-aqck6l4elhw53tjanrie/file"; - sha256 = "1h80m045gy7r0g7dzzlfpql6p065x88p274ij9jnf7d4lwwgrf1a"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; + sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; }) ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e81989c20937..3b4cc86aaaa4 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.17.2"; + version = "1.18.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1rq20951h5in3dy0waa60dsqj27kmg6ylp2gdsxyfrq5jarlj89g"; + sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 6e83b9637c16..487af4ae97a5 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -4,8 +4,8 @@ # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. # Causes segfaults with some software (ex. rustc), but defaults to true for backward -# compatibility. Ignored on non OSX. -, stripPrefix ? true +# compatibility. +, stripPrefix ? stdenv.hostPlatform.isDarwin , disableInitExecTls ? false }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # see the comment on stripPrefix configureFlags = [] - ++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ] - ++ optional disableInitExecTls [ "--disable-initial-exec-tls" ] + ++ optional stripPrefix "--with-jemalloc-prefix=" + ++ optional disableInitExecTls "--disable-initial-exec-tls" ; doCheck = true; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index d270e2f0678d..d3733ea5f720 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "kmsxx"; - version = "2018-09-10"; + version = "2018-10-23"; name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "524176c33ee2b79f78d454fa621e0d32e7e72488"; - sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8"; + rev = "c0093c91f0fa2fd6a5b9d1b206a6f44dcd55bfb5"; + sha256 = "03rv92r938nxb4k4gwcvxy76jnhxdx6x60b58jws83285hd9rgkf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index f6ff7e758956..c7d7bfb1e824 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,22 +2,18 @@ stdenv.mkDerivation rec { name = "libaom-${version}"; - version = "1.0.0"; + version = "1.0.0-errata1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82"; + sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f"; }; nativeBuildInputs = [ yasm perl cmake pkgconfig python3 ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - preConfigure = '' # build uses `git describe` to set the build version cat > $NIX_BUILD_TOP/git << "EOF" diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 0328a2215b48..db5448caa102 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libdeflate-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "1wqxwza6rwmhrsy9sw86pdcd0w742gbzsy9qxnq6kk59m6h1dbsb"; + sha256 = "0kmp38s7vahvbgzzhs5v0bfyjgas1in7jn69gpyh70kl08279ly0"; }; postPatch = '' diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 1d07fe6ca268..1c50a28f0a4d 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -2,11 +2,12 @@ , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3 , dbus, xvfb_run, libxml2 +, hicolor-icon-theme }: let pname = "libhandy"; - version = "0.0.6"; + version = "0.0.7"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5"; + sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; }; nativeBuildInputs = [ @@ -26,10 +27,12 @@ in stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; - checkInputs = [ dbus xvfb_run ]; + checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dglade_catalog=enabled" + "-Dintrospection=enabled" ]; PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index db9c29469353..160ce9fcabf6 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.4.1"; + version = "0.4.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns"; + sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 6509b04f0113..983523e1f2fb 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root }: +{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { name = "apfelgrid-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ apfel applgrid lhapdf root ]; + buildInputs = [ apfel applgrid lhapdf root5 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 1a3334562641..620f227250dd 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "QCDNUM-${version}"; - version = "17-01-14"; + version = "17-01-13"; src = fetchurl { url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; - sha256 = "199s6kgmszxgjzd9214mpx3kyplq2q6987sii67s5xkg10ynyv31"; + sha256 = "0568rjviwvjkfihq2ka7g91vmialr31ryn7c69iqf13rcv5vzcw7"; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 2364e0913bc8..2364e0913bc8 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 7119f76c55fd..35d5075a949a 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; + NIX_LDFLAGS = [ "-lX11" ]; + meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index ed1dfe3d2630..0234c9f3d04b 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 64122a435273..56312f198e09 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -70,6 +70,11 @@ nodePackages // { pnpm = nodePackages.pnpm.override { nativeBuildInputs = [ pkgs.makeWrapper ]; + + preRebuild = '' + sed 's/"link:/"file:/g' --in-place package.json + ''; + postInstall = let pnpmLibPath = stdenv.lib.makeBinPath [ nodejs.passthru.python diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 35dea57d4e62..995981d18edc 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -102,6 +102,7 @@ , "svgo" , "swagger" , "tern" +, "textlint" , "three" , "tiddlywiki" , "triton" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index ca3cc096b1a2..3384ccf854e6 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -31,6 +31,24 @@ let sha512 = "lqK94b+caNtmKFs5oUVXlSpN3sm5IXZ+KfhMxOtr0LR2SqErzkoJilitjDvJ1WbjHlxLI7WtCjRmOLdOGJqtMQ=="; }; }; + "@azu/format-text-1.0.1" = { + name = "_at_azu_slash_format-text"; + packageName = "@azu/format-text"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azu/format-text/-/format-text-1.0.1.tgz"; + sha1 = "6967350a94640f6b02855169bd897ce54d6cebe2"; + }; + }; + "@azu/style-format-1.0.0" = { + name = "_at_azu_slash_style-format"; + packageName = "@azu/style-format"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azu/style-format/-/style-format-1.0.0.tgz"; + sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; + }; + }; "@babel/code-frame-7.0.0" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; @@ -913,40 +931,40 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.10.5" = { + "@lerna/add-3.10.6" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.10.5.tgz"; - sha512 = "T3d9FnSyBOYnM/a1j5Sa65SGOTgnv04HG7Y2lRWJcF6PvOoTsozYW0izi/vLAnAt/DvGhYf2morXkWS8AbIeDg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.10.6.tgz"; + sha512 = "FxQ5Bmyb5fF+3BQiNffM6cTeGCrl4uaAuGvxFIWF6Pgz6U14tUc1e16xgKDvVb1CurzJgIV5sLOT5xmCOqv1kA=="; }; }; - "@lerna/batch-packages-3.10.0" = { + "@lerna/batch-packages-3.10.6" = { name = "_at_lerna_slash_batch-packages"; packageName = "@lerna/batch-packages"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.10.0.tgz"; - sha512 = "ERvnpmmfV8H+3B+9FmHqmzfgz0xVe3ktW/e4WZZXYMGpqSGToILZlai4PsBrW5gUtnXA77LSskME+aRdkZaKsQ=="; + url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.10.6.tgz"; + sha512 = "sInr3ZQJFMh9Zq+ZUoVjX8R67j9ViRkVy0uEMsOfG+jZlXj1lRPRMPRiRgU0jXSYEwCdwuAB5pTd9tTx0VCJUw=="; }; }; - "@lerna/bootstrap-3.10.5" = { + "@lerna/bootstrap-3.10.6" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.10.5.tgz"; - sha512 = "WMUfysmX2WFkOzWcpv0mW6Kw91Zsuq9Ecz/TIT4q3FywvABD0mrWbcDXSyrxMspxDEOtPqM/Lk9nm6F9M98kbg=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.10.6.tgz"; + sha512 = "qbGjAxRpV/eiI9CboUIpsPPGpSogs8mN2/iDaAUBTaWVFVz/YyU64nui84Gll0kbdaHOyPput+kk2S8NCSCCdg=="; }; }; - "@lerna/changed-3.10.5" = { + "@lerna/changed-3.10.6" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.10.5.tgz"; - sha512 = "Uy3VWzjmGg2CjKRTW9os+R6Itg3LVJ6CjczeOsOFwSN4JMdNoObUnCTSdCCTUF/+hQNAoSnkw3+C8dC5FPL1Zw=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.10.6.tgz"; + sha512 = "nZDVq/sKdhgoAg1BVnpqjqUUz5+zedG+AnU+6mjEN2f23YVtRCsW55N4I9eEdW2pxXUaCY85Hj/HPSA74BYaFg=="; }; }; "@lerna/check-working-tree-3.10.0" = { @@ -967,22 +985,22 @@ let sha512 = "q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g=="; }; }; - "@lerna/clean-3.10.1" = { + "@lerna/clean-3.10.6" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.10.1.tgz"; - sha512 = "eYSNSD4xD//OIDe0r4r/HhEMEXriIuKqp4BMDhrO7pJmYhk7FvznJUSc4jc85wdA4Y0ooqSs9gF/w2lgLGgUxw=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.10.6.tgz"; + sha512 = "MuL8HOwnyvVtr6GOiAN/Ofjbx+BJdCrtjrM1Uuh8FFnbnZTPVf+0MPxL2jVzPMo0PmoIrX3fvlwvzKNk/lH0Ug=="; }; }; - "@lerna/cli-3.10.0" = { + "@lerna/cli-3.10.6" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.10.0.tgz"; - sha512 = "OTO8GlD6Rf298hxml3/Y3OE8yMDuW3NNqumbroiUb/KdkrnyjZl5F6aSMXJEySq+OSoBboZJMwj2IWglc/7fuw=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.10.6.tgz"; + sha512 = "GtmzJztjrcb5k1Qi/GKNs8xbQBgRpEBoPpt1Udgo23GkepVrQQo45QjM9hyqOhJ6LrV/lfXAv111kDBN/43jLw=="; }; }; "@lerna/collect-updates-3.10.1" = { @@ -994,13 +1012,13 @@ let sha512 = "vb0wEJ8k63G+2CR/ud1WeVHNJ21Fs6Ew6lbdGZXnF4ZvaFWxWJZpoHeWwzjhMdJ75QdTzUaIhTG1hnH9faQNMw=="; }; }; - "@lerna/command-3.10.0" = { + "@lerna/command-3.10.6" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.10.0.tgz"; - sha512 = "TTtCDQ5+bDdA/RnBuDtkfqzUV8Mr61KBHxEZL8YLAmHZtY/HsnNpZzbAZ0STPxcFB96dhxVWbRDGP+yBgRfemQ=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.10.6.tgz"; + sha512 = "jPZswMZXOpAaIuSF5hrz+eaWQzbDrvwbrkCoRJKfiAHx7URAkE6MQe9DeAnqrTKMqwfg0RciSrZLc8kWYfrzCQ=="; }; }; "@lerna/conventional-commits-3.10.0" = { @@ -1012,13 +1030,13 @@ let sha512 = "8FvO0eR8g/tEgkb6eRVYaD39TsqMKsOXp17EV48jciciEqcrF/d1Ypu6ilK1GDp6R/1m2mbjt/b52a/qrO+xaw=="; }; }; - "@lerna/create-3.10.0" = { + "@lerna/create-3.10.6" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.10.0.tgz"; - sha512 = "1EQbhyGx/J+gwlxFPecpmrztyEfBRm/sNei95UJlJWLuturSv2Ax2nCa49tcerbPlYhhlJ6lyintukL5STOzdg=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.10.6.tgz"; + sha512 = "OddQtGBHM2/eJONggLWoTE6275XGbnJ6dIVF+fLsKS93o4GC6g+qcc6Y7lUWHm5bfpeOwNOVKwj0tvqBZ6MgoA=="; }; }; "@lerna/create-symlink-3.6.0" = { @@ -1039,31 +1057,31 @@ let sha512 = "fouh3FQS07QxJJp/mW8LkGnH0xMRAzpBlejtZaiRwfDkW2kd6EuHaj8I/2/p21Wsprcvuu4dqmyia2YS1xFb/w=="; }; }; - "@lerna/diff-3.10.0" = { + "@lerna/diff-3.10.6" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.10.0.tgz"; - sha512 = "MU6P9uAND+dZ15Cm4onJakEYMC6xXZApLuPpWJf0kZtVoF2Feoo3mvQASdb17fe0jvvmWDS0RLCzq9Zhzrgm0A=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.10.6.tgz"; + sha512 = "0MqFhosjrqsIdXiKIu7t3CiJELqiU9mkjFBhYPB7JruAzpPwjMXJnC6/Ur5/7LXJYYVpqGQwZI9ZaZlOYJhhrw=="; }; }; - "@lerna/exec-3.10.1" = { + "@lerna/exec-3.10.6" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.10.1.tgz"; - sha512 = "MM5/OMP4FrVH4PIlG+3xk3jpKq+trgu/eAPttaYZBHAumCOjrDVYdyk5O68+YLz+uLkM31ixTmsiAP9f77HTsg=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.10.6.tgz"; + sha512 = "cdHqaRBMYceJu8rZLO8b4ZeR27O+xKPHgzi13OOOfBJQjrTuacjMWyHgmpy8jWc/0f7QnTl4VsHks7VJ3UK+vw=="; }; }; - "@lerna/filter-options-3.10.1" = { + "@lerna/filter-options-3.10.6" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.10.1.tgz"; - sha512 = "34q7P0/AA+omVk9uwv99i+4qmj5uGuj383RzqIcK8JDYL0JSzlmW0+c4IkxunCfRrWft8OFhSwZdOOmXtDSDYg=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.10.6.tgz"; + sha512 = "r/dQbqN+RGFKZNn+DyWehswFmAkny/fkdMB2sRM2YVe7zRTtSl95YxD9DtdYnpJTG/jbOVICS/L5QJakrI6SSw=="; }; }; "@lerna/filter-packages-3.10.0" = { @@ -1093,13 +1111,13 @@ let sha512 = "yuFtjsUZIHjeIvIYQ/QuytC+FQcHwo3peB+yGBST2uWCLUCR5rx6knoQcPzbxdFDCuUb5IFccFGd3B1fHFg3RQ=="; }; }; - "@lerna/global-options-3.1.3" = { + "@lerna/global-options-3.10.6" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; - version = "3.1.3"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.1.3.tgz"; - sha512 = "LVeZU/Zgc0XkHdGMRYn+EmHfDmmYNwYRv3ta59iCVFXLVp7FRFWF7oB1ss/WRa9x/pYU0o6L8as/5DomLUGASA=="; + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.10.6.tgz"; + sha512 = "k5Xkq1M/uREFC2R9uwN5gcvIgjj4iOXo0YyeEXCMWBiW3j2GL9xN4d1MmAIcrYlAzVYh6kLlWaFWl/rNIneHIw=="; }; }; "@lerna/has-npm-version-3.10.0" = { @@ -1111,49 +1129,49 @@ let sha512 = "N4RRYxGeivuaKgPDzrhkQOQs1Sg4tOnxnEe3akfqu1wDA4Ng5V6Y2uW3DbkAjFL3aNJhWF5Vbf7sBsGtfgDQ8w=="; }; }; - "@lerna/import-3.10.0" = { + "@lerna/import-3.10.6" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.10.0.tgz"; - sha512 = "c8/s/ldaNVGuKnu600B3nbkwJTNElp1duJiZQ7EBChF+szbQBAiQUGNLvBbwClLBzVJhKTw6E4ku17HafQ4vqg=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.10.6.tgz"; + sha512 = "LlGxhfDhovoNoBJLF3PYd3j/G2GFTnfLh0V38+hBQ6lomMNJbjkACfiLVomQxPWWpYLk0GTlpWYR8YGv6L7Ifw=="; }; }; - "@lerna/init-3.10.0" = { + "@lerna/init-3.10.6" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.10.0.tgz"; - sha512 = "+zU1A870OOOqy3MPLcEoicN6dnIGZv/q0aqCVRRfCHAICciaswuIvdX0uDJx0NrUe0sW40dzIllxuUA39nPqcw=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.10.6.tgz"; + sha512 = "RIlEx+ofWLYRNjxCkkV3G0XQPM+/KA5RXRDb5wKQLYO1f+tZAaHoUh8fHDIvxGf/ohY/OIjYYGSsU+ysimfwiQ=="; }; }; - "@lerna/link-3.10.0" = { + "@lerna/link-3.10.6" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.10.0.tgz"; - sha512 = "uZvLxTSekqV8Kx0zMPgcxpTWyRkjnqnUzRiff9HQtOq+gBBifX079jGT7X73CO5eXFzp2TkOJtI1KNL0BNoNtA=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.10.6.tgz"; + sha512 = "dwD6qftRWitgLDYbqtDrgO7c8uF5C0fHVew5M6gU5m9tBJidqd7cDwHv/bXboLEI63U7tt5y6LY+wEpYUFsBRw=="; }; }; - "@lerna/list-3.10.1" = { + "@lerna/list-3.10.6" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.10.1.tgz"; - sha512 = "y2VwTeJ8tcQ0dmJJNhloGfhmCBUG3RXafqNkUVUG/ItoJlfzVniQOMdIDlkre86ZtnQv9yrB2vFaC2Vg++PklQ=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.10.6.tgz"; + sha512 = "3ElQBj2dOB4uUkpsjC1bxdeZwEzRBuV1pBBs5E1LncwsZf7D9D99Z32fuZsDaCHpEMgHAD4/j8juI3/7m5dkaQ=="; }; }; - "@lerna/listable-3.10.0" = { + "@lerna/listable-3.10.6" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.10.0.tgz"; - sha512 = "95EwogHBqJxrXOCkf3DAZQAzJes+I668Lg5BJDotfp9eZeJAbgGl6GPz5U+szPq0PrYfK+2kJv9xNXVnbfCZAw=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.10.6.tgz"; + sha512 = "F7ZuvesSgeuMiJf99eOum5p1MQGQStykcmHH1ek+LQRMiGGF1o3PkBxPvHTZBADGOFarek8bFA5TVmRAMX7NIw=="; }; }; "@lerna/log-packed-3.6.0" = { @@ -1237,13 +1255,13 @@ let sha512 = "8A5hN2CekM1a0Ix4VUO/g+REo+MsnXb8lnQ0bGjr1YGWzSL5NxYJ0Z9+0pwTfDpvRDYlFYO0rMVwBUW44b4dUw=="; }; }; - "@lerna/package-graph-3.10.0" = { + "@lerna/package-graph-3.10.6" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "3.10.0"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.10.0.tgz"; - sha512 = "9LX8I8KxzCMjfNPWvN/CxHW51s89S3Mnx2EYsbo8c8Gh8I6InA6e+Xur6uuCyZ6/0LKqQ/cXwrP3J81A4nIDSQ=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.10.6.tgz"; + sha512 = "mpIOJbhi+xLqT9BcUrLVD4We8WUdousQf/QndbEWl8DWAW1ethtRHVsCm9ufdBB3F9nj4PH/hqnDWWwqE+rS4w=="; }; }; "@lerna/project-3.10.0" = { @@ -1264,13 +1282,13 @@ let sha512 = "nyAjPMolJ/ZRAAVcXrUH89C4n1SiWvLh4xWNvWYKLcf3PI5yges35sDFP/HYrM4+cEbkNFuJCRq6CxaET4PRsg=="; }; }; - "@lerna/publish-3.10.5" = { + "@lerna/publish-3.10.6" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.10.5.tgz"; - sha512 = "26wjTtRbcUXlG8Na7goI0X1trMYivbuLT1bAXHNvuDaHYs7iE6LRjU4NCTNAmrdVnqagHkTxMuGRFn3r1NgcKg=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.10.6.tgz"; + sha512 = "Wrmgf82rtZWdHSrTzZGOi1/QbkPJduUSmVMhZsdnLC814WHrNGYKbayvFBOo1RAAJ4EKggZ2ReOWXKhg/IZYUw=="; }; }; "@lerna/pulse-till-done-3.7.1" = { @@ -1300,13 +1318,13 @@ let sha512 = "RSKSfxPURc58ERCD/PuzorR86lWEvIWNclXYGvIYM76yNGrWiDF44pGHQvB4J+Lxa5M+52ZtZC/eOC7A7YCH4g=="; }; }; - "@lerna/run-3.10.1" = { + "@lerna/run-3.10.6" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.10.1"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.10.1.tgz"; - sha512 = "g9YIcpk87Gok+zjicru/KsuZ1lcyuG5oERyAii3RSmpLaiwTh/SOSnxilrvDOYWwxYU5rPzvaCalkQI/i31Itw=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.10.6.tgz"; + sha512 = "KS2lWbu/8WUUscQPi9U8sPO6yYpzf/0GmODjpruR1nRi1u/tuncdjTiG+hjGAeFC1BD7YktT9Za6imIpE8RXmA=="; }; }; "@lerna/run-lifecycle-3.10.5" = { @@ -1363,13 +1381,13 @@ let sha512 = "MWltncGO5VgMS0QedTlZCjFUMF/evRjDMMHrtVorkIB2Cp5xy0rkKa8iDBG43qpUWeG1giwi58yUlETBcWfILw=="; }; }; - "@lerna/version-3.10.5" = { + "@lerna/version-3.10.6" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.10.5.tgz"; - sha512 = "I6KynsrWvtusylggw+XmlfUud26ncfUctbn8hUQsofkxiouuElx1fUU4rEsOaonxvNk09bwlsGmfbIFsPeN6Hg=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.10.6.tgz"; + sha512 = "77peW2ROlHHl1e/tHBUmhpb8tsO6CIdlx34XapZhUuIVykrkOuqVFFxqMecrGG8SJe0e3l1G+Fah7bJTQcG0kw=="; }; }; "@lerna/write-log-file-3.6.0" = { @@ -1579,6 +1597,105 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; + "@textlint/ast-node-types-4.2.1" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.1.tgz"; + sha512 = "Pqg1LTJpF929Ovi/lCaPqlyz8yDwBFbQulC0jyQcbRAoTxYS4AZMc48Ug2yk0so5hISQXKrlAxyVBmBVl9EKGA=="; + }; + }; + "@textlint/ast-traverse-2.1.2" = { + name = "_at_textlint_slash_ast-traverse"; + packageName = "@textlint/ast-traverse"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.2.tgz"; + sha512 = "0VIx7Ql8OVHPOWKqHvgUDfyNlhZdG+0sn5bOhHJcbJs8HiSIdErO5pV1fPc2Apro3G15v6gq1rmjUR36ScwwdQ=="; + }; + }; + "@textlint/feature-flag-3.1.2" = { + name = "_at_textlint_slash_feature-flag"; + packageName = "@textlint/feature-flag"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.1.2.tgz"; + sha512 = "vtD/LXZoUHx++ExUvnUZKvl76+6kFHlHl0XLnyP6ZQSVoXF9ElVdFvvRaptPrpXu8SZYqCN2Hcz5iamXZP0hLQ=="; + }; + }; + "@textlint/fixer-formatter-3.1.2" = { + name = "_at_textlint_slash_fixer-formatter"; + packageName = "@textlint/fixer-formatter"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.2.tgz"; + sha512 = "Z+OHngp9dKN5zP5Yqerj//UYnhGPYjf6tYx/LcUT1eMZMk3JQMX6jENBVzO9cEVDbrARmV1zAtM0yO4x5UrpIQ=="; + }; + }; + "@textlint/kernel-3.1.2" = { + name = "_at_textlint_slash_kernel"; + packageName = "@textlint/kernel"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.2.tgz"; + sha512 = "dTeYpVUqUX7CPaZKFEMZzHiDUrbMrJnwreLTML820t9/nAHq4CL+Gvh+3FutWLu8vs65ek1R86rBjmD5SjRdCA=="; + }; + }; + "@textlint/linter-formatter-3.1.2" = { + name = "_at_textlint_slash_linter-formatter"; + packageName = "@textlint/linter-formatter"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.2.tgz"; + sha512 = "yYMh8ZrMJpNS1wTc4fuYz/urfD/ooe1sHE8aLIJkYX6ND09oRWi3gsx/fsdsy6KIwscadzetudK61FmWPr6nSg=="; + }; + }; + "@textlint/markdown-to-ast-6.1.2" = { + name = "_at_textlint_slash_markdown-to-ast"; + packageName = "@textlint/markdown-to-ast"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.2.tgz"; + sha512 = "we9n29GfopUUA0j91xRVQ75ME5YhdnWQZcjfpXQK98DQ//xwVzteMuZe1Og8CArA/aDoTRq0EYFkN2oGu3v20Q=="; + }; + }; + "@textlint/text-to-ast-3.1.2" = { + name = "_at_textlint_slash_text-to-ast"; + packageName = "@textlint/text-to-ast"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.1.2.tgz"; + sha512 = "ge8O9p3HYLy2vni0k4Qh12fRKsJySp/wiuJlvGqemA+hJvSC0164N8I61aHBqgTWTciHHhKBH4ofqCOdSbwKTg=="; + }; + }; + "@textlint/textlint-plugin-markdown-5.1.2" = { + name = "_at_textlint_slash_textlint-plugin-markdown"; + packageName = "@textlint/textlint-plugin-markdown"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.2.tgz"; + sha512 = "J7lyu1FY17EyMna5ouioK3wxhly4D9CPKmsIZnKFYKKBPfb/Prmz7iONbR0h0RCf4GSiKwCuttl0BkOv1eWFXA=="; + }; + }; + "@textlint/textlint-plugin-text-4.1.2" = { + name = "_at_textlint_slash_textlint-plugin-text"; + packageName = "@textlint/textlint-plugin-text"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.2.tgz"; + sha512 = "jELCMWVWxxegeY5oy3GmP7eWT5G/6lfG1bpEFUGvcVz70l4GAtV9mvZ0SV4344w4qzk0fgahlS0ZJ/0EAsmEig=="; + }; + }; + "@textlint/types-1.1.2" = { + name = "_at_textlint_slash_types"; + packageName = "@textlint/types"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/types/-/types-1.1.2.tgz"; + sha512 = "XNsS9GTi3lrhKYbqrZZIaYOXxi1DUeMdNyg9bbcRG9yZUD6T6TVEFI0s2fCvPpUFk31JSsOyWpEBLcd/TwrsNQ=="; + }; + }; "@types/accepts-1.3.5" = { name = "_at_types_slash_accepts"; packageName = "@types/accepts"; @@ -1588,13 +1705,13 @@ let sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; - "@types/async-2.0.50" = { - name = "_at_types_slash_async"; - packageName = "@types/async"; - version = "2.0.50"; + "@types/bluebird-3.5.25" = { + name = "_at_types_slash_bluebird"; + packageName = "@types/bluebird"; + version = "3.5.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz"; - sha512 = "VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q=="; + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.25.tgz"; + sha512 = "yfhIBix+AIFTmYGtkC0Bi+XGjSkOINykqKvO/Wqdz/DuXlAKK7HmhLAXdPIGsV4xzKcL3ev/zYc4yLNo+OvGaw=="; }; }; "@types/body-parser-1.17.0" = { @@ -3010,13 +3127,13 @@ let sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; - "apollo-cache-1.1.22" = { + "apollo-cache-1.1.25" = { name = "apollo-cache"; packageName = "apollo-cache"; - version = "1.1.22"; + version = "1.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.22.tgz"; - sha512 = "8PoxhQLISj2oHwT7i/r4l+ly4y3RKZls+dtXzAewu3U77P9dNZKhYkRNAhx9iEfsrNoHgXBV8vMp64hb1uYh+g=="; + url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz"; + sha512 = "9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA=="; }; }; "apollo-cache-control-0.4.0" = { @@ -3028,22 +3145,22 @@ let sha512 = "WuriaNQIugTE8gYwfBWWCbbQTSKul/cV4JMi5UgqNIUvjHvnKZQLKbt5uYWow6QQNMkLT9hey8QPYkWpogkeSA=="; }; }; - "apollo-cache-inmemory-1.3.12" = { + "apollo-cache-inmemory-1.4.2" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.3.12"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.12.tgz"; - sha512 = "jxWcW64QoYQZ09UH6v3syvCCl3MWr6bsxT3wYYL6ORi8svdJUpnNrHTcv5qXqJYVg/a+NHhfEt+eGjJUG2ytXA=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz"; + sha512 = "fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA=="; }; }; - "apollo-client-2.4.8" = { + "apollo-client-2.4.12" = { name = "apollo-client"; packageName = "apollo-client"; - version = "2.4.8"; + version = "2.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.8.tgz"; - sha512 = "OAFbCTnGPtaIv0j+EZYzY20d+MD2JNbJ/YXZ4s0/oZlSg87bb0gjcIbccw2lnytipymZcZNr5ArFFeh0saGEwA=="; + url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz"; + sha512 = "E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w=="; }; }; "apollo-codegen-0.20.2" = { @@ -3289,13 +3406,13 @@ let sha512 = "ZN5gsbBjImEZTWWTUHpCEGDasnoBGbaODpznQ5EawyNHceuFYSNJbbft+ZZ841vZAcj9XZdKUKoaLBlMZ/r7nw=="; }; }; - "apollo-utilities-1.0.27" = { + "apollo-utilities-1.1.2" = { name = "apollo-utilities"; packageName = "apollo-utilities"; - version = "1.0.27"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.27.tgz"; - sha512 = "nzrMQ89JMpNmYnVGJ4t8zN75gQbql27UDhlxNi+3OModp0Masx5g+fQmQJ5B4w2dpRuYOsdwFLmj3lQbwOKV1Q=="; + url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz"; + sha512 = "EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ=="; }; }; "app-builder-5.2.0" = { @@ -4180,13 +4297,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.389.0" = { + "aws-sdk-2.391.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.389.0"; + version = "2.391.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.389.0.tgz"; - sha512 = "4KBH2o4f/ncTJfKzUsMNxxPNWkF7eFVZlYLRpeFAYEgw+r8xE//0YBReNnySS5Y5oQTOtg376bOlQSWtFhKv1g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.391.0.tgz"; + sha512 = "2xL59xW/bosjccZdrPwV9MfMJ7vkg2dn83m4LTgk+p+y8IOE4DdCP9dE+toz0frtVatriPDIXCA0dyOVYFt8EA=="; }; }; "aws-sign2-0.6.0" = { @@ -5557,13 +5674,22 @@ let sha1 = "55fa64920d9670087d44150404525d59f9511c20"; }; }; - "bower-1.8.4" = { + "boundary-1.0.1" = { + name = "boundary"; + packageName = "boundary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz"; + sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; + }; + }; + "bower-1.8.7" = { name = "bower"; packageName = "bower"; - version = "1.8.4"; + version = "1.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; - sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.7.tgz"; + sha512 = "M0yrA0IkpXP4v2taRkmowyUHTCFAvtfTVtRDAXBnhZM02xh8fP3wlrdOiXPs/5CYBCdj20WyGKZuYA0g3h3Y1w=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -5863,13 +5989,13 @@ let sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9"; }; }; - "browserslist-4.4.0" = { + "browserslist-4.4.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.4.0.tgz"; - sha512 = "tQkHS8VVxWbrjnNDXgt7/+SuPJ7qDvD0Y2e6bLtoQluR2SPvlmPUcfcU75L1KAalhqULlIFJlJ6BDfnYyJxJsw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz"; + sha512 = "pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A=="; }; }; "buffer-3.6.0" = { @@ -8680,13 +8806,13 @@ let sha512 = "NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g=="; }; }; - "core-js-3.0.0-beta.8" = { + "core-js-3.0.0-beta.9" = { name = "core-js"; packageName = "core-js"; - version = "3.0.0-beta.8"; + version = "3.0.0-beta.9"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.8.tgz"; - sha512 = "ex9wpitprNDuK6bPRljFW0z0IBatqtmqeuZ1HpcFcSkdOQSGNu3XdZSTshEuAIeYgLarHpw55P3SQlKAnXmpuQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.9.tgz"; + sha512 = "OGLbGro2f0s8UXVyu2s9kIW42pcuRoNEqJsmn8a4rAOO9G5A2t96l++rf+4mHNw9GKrbdozZ9G5ieDKOBl68zQ=="; }; }; "core-util-is-1.0.2" = { @@ -10057,13 +10183,13 @@ let sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; }; }; - "defer-to-connect-1.0.1" = { + "defer-to-connect-1.0.2" = { name = "defer-to-connect"; packageName = "defer-to-connect"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.1.tgz"; - sha512 = "2e0FJesseUqQj671gvZWfUyxpnFx/5n4xleamlpCD3U6Fm5dh5qzmmLNxNhtmHF06+SYVHH8QU6FACffYTnj0Q=="; + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz"; + sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="; }; }; "deferred-leveldown-0.2.0" = { @@ -10417,6 +10543,15 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; + "diff-2.2.3" = { + name = "diff"; + packageName = "diff"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; + sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + }; + }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; @@ -11174,13 +11309,13 @@ let sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw=="; }; }; - "elmi-to-json-0.19.0" = { + "elmi-to-json-0.19.1" = { name = "elmi-to-json"; packageName = "elmi-to-json"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-0.19.0.tgz"; - sha512 = "qNrxc1m2KAYbxT22rHyWBjzhYjJkENYgl6Ya7XVL1uxcZPiaINwFEJ7OdpGnLsM79xsWPT0z9yesQtYXKrWE7w=="; + url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-0.19.1.tgz"; + sha512 = "O0Z3YsYU9OTb1hTDGORWxi69QjQFEIPfZVq/oc1D5lhL3swduHKY8vdKGuo+WlKVdTas99oNIsgL7yojWdYcsQ=="; }; }; "email-validator-2.0.4" = { @@ -11868,13 +12003,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.12.0" = { + "eslint-5.12.1" = { name = "eslint"; packageName = "eslint"; - version = "5.12.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.12.0.tgz"; - sha512 = "LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz"; + sha512 = "54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -12192,6 +12327,15 @@ let sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="; }; }; + "events-3.0.0" = { + name = "events"; + packageName = "events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz"; + sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="; + }; + }; "events.node-0.4.9" = { name = "events.node"; packageName = "events.node"; @@ -12867,6 +13011,15 @@ let sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; }; }; + "fault-1.0.2" = { + name = "fault"; + packageName = "fault"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz"; + sha512 = "o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw=="; + }; + }; "faye-websocket-0.11.1" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -13434,13 +13587,13 @@ let sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b"; }; }; - "flumedb-1.0.1" = { + "flumedb-1.0.4" = { name = "flumedb"; packageName = "flumedb"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/flumedb/-/flumedb-1.0.1.tgz"; - sha512 = "mT0v0dY9EkWRGwDtTfavYNv2Z6nrMNlVZCNJD7qxjfPJymfv8kNYB4UvDdBHleHegvzjufjnE73IkRG5DgMjww=="; + url = "https://registry.npmjs.org/flumedb/-/flumedb-1.0.4.tgz"; + sha512 = "zTB3OI8RxFe2AtDlEXZtvDCJkw02/MSdKMYYnr9bYWuwQ4fYcnInGkDwxQU5L7OQswzM/brhdl3XYNGWpMxF1w=="; }; }; "flumelog-offset-3.3.2" = { @@ -13632,6 +13785,15 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "format-0.2.2" = { + name = "format"; + packageName = "format"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/format/-/format-0.2.2.tgz"; + sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; + }; + }; "format-util-1.0.3" = { name = "format-util"; packageName = "format-util"; @@ -13947,13 +14109,13 @@ let sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg=="; }; }; - "fsevents-1.2.6" = { + "fsevents-1.2.7" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.6.tgz"; - sha512 = "BalK54tfK0pMC0jQFb2oHn1nz7JNQD/2ex5pBnCHgBi2xG7VV0cAOGy2RS2VbCqUXx5/6obMrMcQTJ8yjcGzbg=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz"; + sha512 = "Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw=="; }; }; "fsevents-2.0.1" = { @@ -14858,13 +15020,13 @@ let sha512 = "C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q=="; }; }; - "graphql-anywhere-4.1.24" = { + "graphql-anywhere-4.1.27" = { name = "graphql-anywhere"; packageName = "graphql-anywhere"; - version = "4.1.24"; + version = "4.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.24.tgz"; - sha512 = "g81K7FqXSF3q1iqFWlwiwD+g0SDkPUUa9+Wa+7BOrAe5+7R4BdNWL4dw9BRsJxt0Xx6nOaI2E+VM7QMAucQFvA=="; + url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.27.tgz"; + sha512 = "ErASfs9siEMrmroHU0V4heh6cIdA8K/SoYpahJFgEM6YDAwUZuycTAKIrMaK8XJI37sHZWcujF/ySuYnIkP5vw=="; }; }; "graphql-cli-prepare-1.4.19" = { @@ -14993,13 +15155,13 @@ let sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ=="; }; }; - "graphql-tag-2.10.0" = { + "graphql-tag-2.10.1" = { name = "graphql-tag"; packageName = "graphql-tag"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz"; - sha512 = "9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w=="; + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz"; + sha512 = "jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="; }; }; "graphql-tools-4.0.3" = { @@ -16208,13 +16370,13 @@ let sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ=="; }; }; - "immutable-tuple-0.4.9" = { + "immutable-tuple-0.4.10" = { name = "immutable-tuple"; packageName = "immutable-tuple"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.9.tgz"; - sha512 = "LWbJPZnidF8eczu7XmcnLBsumuyRBkpwIRPCZxlojouhBo5jEBO4toj6n7hMy6IxHU/c+MqDSWkvaTpPlMQcyA=="; + url = "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.10.tgz"; + sha512 = "45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q=="; }; }; "import-fresh-2.0.0" = { @@ -16604,6 +16766,15 @@ let sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q=="; }; }; + "interop-require-1.0.0" = { + name = "interop-require"; + packageName = "interop-require"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interop-require/-/interop-require-1.0.0.tgz"; + sha1 = "e53103679944c88d7e6105b62a9f4475c783971e"; + }; + }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -17594,6 +17765,15 @@ let sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df"; }; }; + "is-whitespace-character-1.0.2" = { + name = "is-whitespace-character"; + packageName = "is-whitespace-character"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; + sha512 = "SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -17603,6 +17783,15 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; + "is-word-character-1.0.2" = { + name = "is-word-character"; + packageName = "is-word-character"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz"; + sha512 = "T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA=="; + }; + }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -20772,6 +20961,15 @@ let sha512 = "p+NIGQbEBxlw/qWwG+NME98G/9kjOQI70hmaH8QEZtIWfTmfMYLKQW4PJChP4izPHNAxlOfv/qefP0+2ZXn84A=="; }; }; + "map-like-2.0.0" = { + name = "map-like"; + packageName = "map-like"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-like/-/map-like-2.0.0.tgz"; + sha1 = "94496d49ad333c0dc3234b27adbbd1e8535953b4"; + }; + }; "map-merge-1.1.0" = { name = "map-merge"; packageName = "map-merge"; @@ -20826,6 +21024,15 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; + "markdown-escapes-1.0.2" = { + name = "markdown-escapes"; + packageName = "markdown-escapes"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; + sha512 = "lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA=="; + }; + }; "markdown-it-8.4.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -22819,13 +23026,13 @@ let sha512 = "FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w=="; }; }; - "node-libs-browser-2.1.0" = { + "node-libs-browser-2.2.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; - sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg=="; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz"; + sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA=="; }; }; "node-modules-regexp-1.0.0" = { @@ -24035,13 +24242,13 @@ let sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; }; }; - "optimism-0.6.8" = { + "optimism-0.6.9" = { name = "optimism"; packageName = "optimism"; - version = "0.6.8"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/optimism/-/optimism-0.6.8.tgz"; - sha512 = "bN5n1KCxSqwBDnmgDnzMtQTHdL+uea2HYFx1smvtE+w2AMl0Uy31g0aXnP/Nt85OINnMJPRpJyfRQLTCqn5Weg=="; + url = "https://registry.npmjs.org/optimism/-/optimism-0.6.9.tgz"; + sha512 = "xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ=="; }; }; "optimist-0.2.8" = { @@ -24656,13 +24863,13 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.1" = { + "parse-asn1-5.1.3" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.1"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; - sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz"; + sha512 = "VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg=="; }; }; "parse-entities-1.2.0" = { @@ -25124,6 +25331,15 @@ let sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; }; }; + "path-to-glob-pattern-1.0.2" = { + name = "path-to-glob-pattern"; + packageName = "path-to-glob-pattern"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-1.0.2.tgz"; + sha1 = "473e6a3a292a9d13fbae3edccee72d3baba8c619"; + }; + }; "path-to-regexp-0.1.3" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -25592,6 +25808,15 @@ let sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; + "pluralize-2.0.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-2.0.0.tgz"; + sha1 = "72b726aa6fac1edeee42256c7d8dc256b335677f"; + }; + }; "pluralize-7.0.0" = { name = "pluralize"; packageName = "pluralize"; @@ -27258,13 +27483,13 @@ let sha1 = "437344aeb2189f65e678ed1af37f0f760a5453ef"; }; }; - "pull-ws-3.3.1" = { + "pull-ws-3.3.2" = { name = "pull-ws"; packageName = "pull-ws"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.1.tgz"; - sha512 = "kJodbLQT+oKjcRIQO+vQNw6xWBuEo7Kxp51VMOvb6cvPvHYA+aNLzm+NmkB/5dZwbuTRYGMal9QPvH52tzM1ZA=="; + url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.2.tgz"; + sha512 = "Bn4bcJsSzJGOQl4RBulDhG1FkcbDHSCXteI8Jg5k4X6X5TxVzZzKilWJ1WV2v4OnRXl2eYbtHFGsPl8Cr1xJzw=="; }; }; "pump-0.3.5" = { @@ -28338,6 +28563,15 @@ let sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f"; }; }; + "remark-frontmatter-1.3.1" = { + name = "remark-frontmatter"; + packageName = "remark-frontmatter"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.1.tgz"; + sha512 = "Zj/fDMYnSVgMCeKp8fXIhtMoZq4G6E1dnwfMoO8fVXrm/+oVSiN8YMREtwN2cctgK9EsnYSeS1ExX2hcX/fE1A=="; + }; + }; "remark-html-2.0.2" = { name = "remark-html"; packageName = "remark-html"; @@ -28347,6 +28581,15 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; + "remark-parse-5.0.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz"; + sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA=="; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -31227,13 +31470,13 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-blobs-1.1.8" = { + "ssb-blobs-1.1.9" = { name = "ssb-blobs"; packageName = "ssb-blobs"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.8.tgz"; - sha512 = "WcYjqv8F383QvgCTdNdYp+xzJACLL+OiVLD8Got5qmcevbwv2nrUNtQOhe5zJ5Qfl4o+Y/RYqEFGrUUq9oTCvg=="; + url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.9.tgz"; + sha512 = "CkI12tt5looI54X2dhsMNwoVqVcff471ZgEhew69g2EPByfejryuoOnAZUuQhgYDBLISQj5oID2R+7wCH6yOyQ=="; }; }; "ssb-client-4.6.0" = { @@ -31524,6 +31767,15 @@ let sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; }; }; + "state-toggle-1.0.1" = { + name = "state-toggle"; + packageName = "state-toggle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz"; + sha512 = "Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="; + }; + }; "static-eval-2.0.0" = { name = "static-eval"; packageName = "static-eval"; @@ -32271,6 +32523,15 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; + "structured-source-3.0.2" = { + name = "structured-source"; + packageName = "structured-source"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz"; + sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + }; + }; "stylehacks-4.0.1" = { name = "stylehacks"; packageName = "stylehacks"; @@ -33667,6 +33928,15 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; + "trough-1.0.3" = { + name = "trough"; + packageName = "trough"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz"; + sha512 = "fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw=="; + }; + }; "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; @@ -33685,6 +33955,15 @@ let sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; }; + "try-resolve-1.0.1" = { + name = "try-resolve"; + packageName = "try-resolve"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz"; + sha1 = "cfde6fabd72d63e5797cfaab873abbe8e700e912"; + }; + }; "ts-node-7.0.1" = { name = "ts-node"; packageName = "ts-node"; @@ -34261,6 +34540,15 @@ let sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba"; }; }; + "unified-6.2.0" = { + name = "unified"; + packageName = "unified"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz"; + sha512 = "1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA=="; + }; + }; "union-0.4.6" = { name = "union"; packageName = "union"; @@ -34297,6 +34585,15 @@ let sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; }; }; + "unique-concat-0.2.2" = { + name = "unique-concat"; + packageName = "unique-concat"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-concat/-/unique-concat-0.2.2.tgz"; + sha1 = "9210f9bdcaacc5e1e3929490d7c019df96f18712"; + }; + }; "unique-filename-1.1.1" = { name = "unique-filename"; packageName = "unique-filename"; @@ -34351,6 +34648,24 @@ let sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; }; }; + "unist-util-remove-position-1.1.2" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; + sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; + }; + }; + "unist-util-stringify-position-1.1.2" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz"; + sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; + }; + }; "unist-util-visit-1.4.0" = { name = "unist-util-visit"; packageName = "unist-util-visit"; @@ -34810,6 +35125,15 @@ let sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; }; }; + "util-0.11.1" = { + name = "util"; + packageName = "util"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; + }; + }; "util-0.4.9" = { name = "util"; packageName = "util"; @@ -35179,6 +35503,15 @@ let sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; }; }; + "vfile-2.3.0" = { + name = "vfile"; + packageName = "vfile"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz"; + sha512 = "ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w=="; + }; + }; "vfile-find-down-1.0.0" = { name = "vfile-find-down"; packageName = "vfile-find-down"; @@ -35197,6 +35530,24 @@ let sha1 = "5604da6fe453b34350637984eb5fe4909e280390"; }; }; + "vfile-location-2.0.4" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.4.tgz"; + sha512 = "KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w=="; + }; + }; + "vfile-message-1.1.1" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz"; + sha512 = "1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA=="; + }; + }; "vfile-reporter-1.5.0" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -36115,6 +36466,15 @@ let sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; }; }; + "x-is-string-0.1.0" = { + name = "x-is-string"; + packageName = "x-is-string"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz"; + sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; + }; + }; "xcode-1.1.0" = { name = "xcode"; packageName = "xcode"; @@ -36169,6 +36529,15 @@ let sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"; }; }; + "xml-escape-1.1.0" = { + name = "xml-escape"; + packageName = "xml-escape"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz"; + sha1 = "3904c143fa8eb3a0030ec646d2902a2f1b706c44"; + }; + }; "xml-name-validator-2.0.1" = { name = "xml-name-validator"; packageName = "xml-name-validator"; @@ -36910,10 +37279,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.4"; + version = "1.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; - sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.7.tgz"; + sha512 = "M0yrA0IkpXP4v2taRkmowyUHTCFAvtfTVtRDAXBnhZM02xh8fP3wlrdOiXPs/5CYBCdj20WyGKZuYA0g3h3Y1w=="; }; buildInputs = globalBuildInputs; meta = { @@ -36936,7 +37305,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.0" - sources."bower-1.8.4" + sources."bower-1.8.7" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -37165,7 +37534,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.8" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -38134,7 +38503,7 @@ in sources."package-json-4.0.1" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."parseurl-1.3.2" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" @@ -39588,7 +39957,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.389.0" + sources."aws-sdk-2.391.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -39796,7 +40165,7 @@ in sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-base-0.3.0" @@ -40125,10 +40494,10 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.0-rev3"; + version = "0.19.0-rev4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev3.tgz"; - sha512 = "+zcutibM0LOG6uT48bMsSGzyPnptgenxBUjNMJFRYuddTrOFVH1dFCKUu512lsvihBUJixaxjIG+DjQbWlpO/Q=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev4.tgz"; + sha512 = "PWRg9rOc7R2W1lREG5ZaVDywORXO9TYCJzfkK3KEcyiqBr+NpBONp25VhPQKm5mfQvXEtiCWVvqn54/q0bKx9g=="; }; dependencies = [ sources."ajv-6.7.0" @@ -40208,7 +40577,7 @@ in }) sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."elmi-to-json-0.19.0" + sources."elmi-to-json-0.19.1" sources."escape-string-regexp-1.0.5" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -40812,10 +41181,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.12.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.12.0.tgz"; - sha512 = "LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz"; + sha512 = "54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -40984,7 +41353,7 @@ in sources."deep-is-0.1.3" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - sources."eslint-5.12.0" + sources."eslint-5.12.1" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -41594,7 +41963,7 @@ in sources."forever-monitor-1.7.1" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-base-0.3.0" @@ -42044,7 +42413,7 @@ in sources."looper-3.0.0" ]; }) - sources."pull-ws-3.3.1" + sources."pull-ws-3.3.2" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."rc-1.2.8" @@ -43151,7 +43520,7 @@ in sources."fragment-cache-0.2.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-value-2.0.6" @@ -45579,7 +45948,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."glob-7.1.3" (sources."glob-parent-3.1.0" // { @@ -46183,43 +46552,43 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.10.5"; + version = "3.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.10.5.tgz"; - sha512 = "rJ67oqEiF8AVw+9phKbGkC0k0oqu1rdnmzrIfVS40EQCwEtzBC1ABX1886PBV0N40Pt9wCy6a0Jhrd+PV4IiIQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.10.6.tgz"; + sha512 = "qdoyEpozHKQQnrpaDWbhiFG85/CBAyz2rkcj78JQVl2g400n9FFqS2Zweol5wusRnUzmpQKxFFll4P9DzIzSIA=="; }; dependencies = [ - sources."@lerna/add-3.10.5" - sources."@lerna/batch-packages-3.10.0" - sources."@lerna/bootstrap-3.10.5" - sources."@lerna/changed-3.10.5" + sources."@lerna/add-3.10.6" + sources."@lerna/batch-packages-3.10.6" + sources."@lerna/bootstrap-3.10.6" + sources."@lerna/changed-3.10.6" sources."@lerna/check-working-tree-3.10.0" sources."@lerna/child-process-3.3.0" - sources."@lerna/clean-3.10.1" - sources."@lerna/cli-3.10.0" + sources."@lerna/clean-3.10.6" + sources."@lerna/cli-3.10.6" sources."@lerna/collect-updates-3.10.1" - sources."@lerna/command-3.10.0" + sources."@lerna/command-3.10.6" sources."@lerna/conventional-commits-3.10.0" - (sources."@lerna/create-3.10.0" // { + (sources."@lerna/create-3.10.6" // { dependencies = [ sources."camelcase-4.1.0" ]; }) sources."@lerna/create-symlink-3.6.0" sources."@lerna/describe-ref-3.10.0" - sources."@lerna/diff-3.10.0" - sources."@lerna/exec-3.10.1" - sources."@lerna/filter-options-3.10.1" + sources."@lerna/diff-3.10.6" + sources."@lerna/exec-3.10.6" + sources."@lerna/filter-options-3.10.6" sources."@lerna/filter-packages-3.10.0" sources."@lerna/get-npm-exec-opts-3.6.0" sources."@lerna/get-packed-3.7.0" - sources."@lerna/global-options-3.1.3" + sources."@lerna/global-options-3.10.6" sources."@lerna/has-npm-version-3.10.0" - sources."@lerna/import-3.10.0" - sources."@lerna/init-3.10.0" - sources."@lerna/link-3.10.0" - sources."@lerna/list-3.10.1" - sources."@lerna/listable-3.10.0" + sources."@lerna/import-3.10.6" + sources."@lerna/init-3.10.6" + sources."@lerna/link-3.10.6" + sources."@lerna/list-3.10.6" + sources."@lerna/listable-3.10.6" sources."@lerna/log-packed-3.6.0" sources."@lerna/npm-conf-3.7.0" sources."@lerna/npm-dist-tag-3.8.5" @@ -46229,21 +46598,21 @@ in sources."@lerna/output-3.6.0" sources."@lerna/pack-directory-3.10.5" sources."@lerna/package-3.7.2" - sources."@lerna/package-graph-3.10.0" + sources."@lerna/package-graph-3.10.6" sources."@lerna/project-3.10.0" sources."@lerna/prompt-3.6.0" - sources."@lerna/publish-3.10.5" + sources."@lerna/publish-3.10.6" sources."@lerna/pulse-till-done-3.7.1" sources."@lerna/resolve-symlink-3.6.0" sources."@lerna/rimraf-dir-3.10.0" - sources."@lerna/run-3.10.1" + sources."@lerna/run-3.10.6" sources."@lerna/run-lifecycle-3.10.5" sources."@lerna/run-parallel-batches-3.0.0" sources."@lerna/symlink-binary-3.10.0" sources."@lerna/symlink-dependencies-3.10.0" sources."@lerna/timer-3.5.0" sources."@lerna/validation-error-3.6.0" - sources."@lerna/version-3.10.5" + sources."@lerna/version-3.10.6" sources."@lerna/write-log-file-3.6.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -47238,7 +47607,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -47587,7 +47956,7 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.2.1" @@ -48226,7 +48595,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.4.0" + sources."browserslist-4.4.1" sources."buffer-3.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -48367,7 +48736,7 @@ in sources."clone-1.0.4" ]; }) - sources."defer-to-connect-1.0.1" + sources."defer-to-connect-1.0.2" sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ @@ -48409,7 +48778,7 @@ in sources."estraverse-4.2.0" sources."estree-walker-0.5.2" sources."esutils-2.0.2" - sources."events-1.1.1" + sources."events-3.0.0" sources."evp_bytestokey-1.0.3" (sources."execa-1.0.0" // { dependencies = [ @@ -48550,7 +48919,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-proxy-2.1.0" @@ -48756,7 +49125,7 @@ in }) sources."nice-try-1.0.5" sources."node-fetch-2.3.0" - (sources."node-libs-browser-2.1.0" // { + (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."base64-js-1.3.0" sources."buffer-4.9.1" @@ -48826,7 +49195,7 @@ in sources."pako-1.0.8" sources."parallel-transform-1.1.0" sources."paredit.js-0.3.4" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."parse-glob-3.0.4" sources."parse-json-2.2.0" sources."parse-passwd-1.0.0" @@ -49165,7 +49534,7 @@ in sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" - sources."util-0.10.4" + sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" sources."v8-compile-cache-2.0.2" @@ -51011,7 +51380,7 @@ in }) sources."for-in-1.0.2" sources."fragment-cache-0.2.1" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-stream-3.0.0" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { @@ -51681,10 +52050,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.5.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.5.0.tgz"; - sha512 = "SPq8zG2Kto+Xrq55E97O14Jla13PmQT5kSnvwBj88BmJZ5Nvw++OmlWfhjkB67pcgP5UEXljEtnGFKZtOgt6MQ=="; + url = "https://registry.npmjs.org/npm/-/npm-6.6.0.tgz"; + sha512 = "Q6Lb4YPWIGsyVzfxcZrTu6VQcMEvCHOBlSE0fbuNHj6CYCUuanMUf6HgNyj4QekWTORxQpOgOgaca2YEQ721Ug=="; }; buildInputs = globalBuildInputs; meta = { @@ -52810,10 +53179,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.1"; + version = "2.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.1.tgz"; - sha512 = "VlDIaWSEQJuIQOFzhcg4YQ7enQMrJHb11eUclMj1VxIOxCZX51e/EDu+PZ0IO/4iQsgifiVoQcBbacBKi55jDA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.2.tgz"; + sha512 = "DB1IFfFf4bxb2nVveQ+Xi4KXO/5uR/53w6GCBRWaej0SZnrHeK+6Lp+/dh0S3THMnX88TJLniTOkAUBco2AItA=="; }; buildInputs = globalBuildInputs; meta = { @@ -53000,7 +53369,7 @@ in sources."pako-1.0.8" ]; }) - sources."browserslist-4.4.0" + sources."browserslist-4.4.1" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -53154,7 +53523,7 @@ in sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."etag-1.8.1" - sources."events-1.1.1" + sources."events-3.0.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -53179,7 +53548,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-port-3.2.0" sources."get-value-2.0.6" @@ -53391,7 +53760,7 @@ in sources."nice-try-1.0.5" sources."node-addon-api-1.6.2" sources."node-forge-0.7.6" - sources."node-libs-browser-2.1.0" + sources."node-libs-browser-2.2.0" sources."node-releases-1.1.3" sources."nopt-4.0.1" sources."normalize-path-2.1.1" @@ -53418,7 +53787,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."pako-0.2.9" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."parse-json-4.0.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" @@ -53749,7 +54118,7 @@ in ]; }) sources."use-3.1.1" - sources."util-0.10.4" + sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" sources."v8-compile-cache-2.0.2" @@ -53965,7 +54334,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-value-2.0.6" @@ -54086,7 +54455,7 @@ in sources."os-tmpdir-1.0.2" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -54684,7 +55053,7 @@ in sources."level-codec-6.2.0" ]; }) - (sources."flumedb-1.0.1" // { + (sources."flumedb-1.0.4" // { dependencies = [ sources."pull-cont-0.0.0" ]; @@ -54727,7 +55096,7 @@ in sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-value-2.0.6" @@ -55048,7 +55417,7 @@ in ]; }) sources."pull-write-file-0.2.4" - sources."pull-ws-3.3.1" + sources."pull-ws-3.3.2" sources."pump-2.0.1" sources."push-stream-10.0.4" sources."push-stream-to-pull-stream-1.0.3" @@ -55195,7 +55564,7 @@ in sources."source-map-url-0.4.0" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - sources."ssb-blobs-1.1.8" + sources."ssb-blobs-1.1.9" (sources."ssb-client-4.6.0" // { dependencies = [ sources."multiserver-1.13.7" @@ -56761,7 +57130,7 @@ in sources."fresh-0.5.2" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.3" @@ -57250,6 +57619,227 @@ in production = true; bypassCache = true; }; + textlint = nodeEnv.buildNodePackage { + name = "textlint"; + packageName = "textlint"; + version = "11.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint/-/textlint-11.2.1.tgz"; + sha512 = "BXknewyTyypmC7vBvY+2SY5uXmHPG8jnnbiV7f4PBOX8xRciMX7qU5ilGiOb8qDI0NBaNRcwn3lHUqW/90GBIg=="; + }; + dependencies = [ + sources."@azu/format-text-1.0.1" + sources."@azu/style-format-1.0.0" + sources."@textlint/ast-node-types-4.2.1" + sources."@textlint/ast-traverse-2.1.2" + sources."@textlint/feature-flag-3.1.2" + sources."@textlint/fixer-formatter-3.1.2" + sources."@textlint/kernel-3.1.2" + sources."@textlint/linter-formatter-3.1.2" + sources."@textlint/markdown-to-ast-6.1.2" + sources."@textlint/text-to-ast-3.1.2" + sources."@textlint/textlint-plugin-markdown-5.1.2" + sources."@textlint/textlint-plugin-text-4.1.2" + sources."@textlint/types-1.1.2" + sources."@types/bluebird-3.5.25" + sources."ajv-4.11.8" + sources."ajv-keywords-1.5.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."argparse-1.0.10" + sources."bail-1.0.3" + sources."balanced-match-1.0.0" + sources."bluebird-3.5.3" + sources."boundary-1.0.1" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."builtin-modules-1.1.1" + sources."chalk-1.1.3" + sources."character-entities-1.2.2" + sources."character-entities-legacy-1.1.2" + sources."character-reference-invalid-1.1.2" + sources."charenc-0.0.2" + sources."circular-json-0.3.3" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.4" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."crypt-0.0.2" + sources."debug-4.1.1" + sources."deep-equal-1.0.1" + sources."deep-is-0.1.3" + sources."define-properties-1.1.3" + sources."diff-2.2.3" + sources."error-ex-1.3.2" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."extend-3.0.2" + sources."fast-levenshtein-2.0.6" + sources."fault-1.0.2" + sources."file-entry-cache-2.0.0" + sources."find-up-2.1.0" + sources."flat-cache-1.3.4" + sources."format-0.2.2" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-stdin-5.0.1" + sources."glob-7.1.3" + sources."graceful-fs-4.1.15" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-symbols-1.0.0" + sources."hosted-git-info-2.7.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."interop-require-1.0.0" + sources."is-alphabetical-1.0.2" + sources."is-alphanumerical-1.0.2" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-decimal-1.0.2" + sources."is-file-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-hexadecimal-1.0.2" + sources."is-plain-obj-1.1.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" + sources."is-utf8-0.2.1" + sources."is-whitespace-character-1.0.2" + sources."is-word-character-1.0.2" + sources."isarray-1.0.0" + sources."js-yaml-3.12.1" + sources."json-parse-better-errors-1.0.2" + sources."json-stable-stringify-1.0.1" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."jsonify-0.0.0" + sources."levn-0.3.0" + sources."load-json-file-1.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.11" + sources."log-symbols-1.0.2" + sources."map-like-2.0.0" + sources."markdown-escapes-1.0.2" + sources."md5-2.2.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.1.1" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-keys-1.0.12" + sources."once-1.4.0" + sources."optionator-0.8.2" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-entities-1.2.0" + sources."parse-json-2.2.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-to-glob-pattern-1.0.2" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pluralize-2.0.0" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.0" + (sources."rc-config-loader-2.0.2" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) + sources."read-pkg-1.1.0" + (sources."read-pkg-up-3.0.0" // { + dependencies = [ + sources."load-json-file-4.0.0" + sources."parse-json-4.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."read-pkg-3.0.0" + sources."strip-bom-3.0.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."remark-frontmatter-1.3.1" + sources."remark-parse-5.0.0" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."require-from-string-2.0.2" + sources."rimraf-2.6.3" + sources."safe-buffer-5.1.2" + sources."semver-5.6.0" + sources."slice-ansi-0.0.4" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.3" + sources."sprintf-js-1.0.3" + sources."state-toggle-1.0.1" + sources."string-width-1.0.2" + sources."string.prototype.padstart-3.0.0" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."structured-source-3.0.2" + sources."supports-color-2.0.0" + (sources."table-3.8.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."text-table-0.2.0" + sources."traverse-0.6.6" + sources."trim-0.0.1" + sources."trim-trailing-lines-1.1.1" + sources."trough-1.0.3" + sources."try-resolve-1.0.1" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."unherit-1.1.1" + sources."unified-6.2.0" + sources."unique-concat-0.2.2" + sources."unist-util-is-2.1.2" + sources."unist-util-remove-position-1.1.2" + sources."unist-util-stringify-position-1.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."vfile-2.3.0" + sources."vfile-location-2.0.4" + sources."vfile-message-1.1.1" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."x-is-string-0.1.0" + sources."xml-escape-1.1.0" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The pluggable linting tool for text and markdown."; + homepage = https://github.com/textlint/textlint/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; @@ -57492,10 +58082,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz"; - sha512 = "VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; + sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; }; buildInputs = globalBuildInputs; meta = { @@ -58287,7 +58877,6 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/accepts-1.3.5" - sources."@types/async-2.0.50" sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" sources."@types/cors-2.8.4" @@ -58318,14 +58907,14 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" - sources."apollo-cache-1.1.22" + sources."apollo-cache-1.1.25" (sources."apollo-cache-control-0.4.0" // { dependencies = [ sources."graphql-extensions-0.4.0" ]; }) - sources."apollo-cache-inmemory-1.3.12" - sources."apollo-client-2.4.8" + sources."apollo-cache-inmemory-1.4.2" + sources."apollo-client-2.4.12" sources."apollo-datasource-0.2.1" (sources."apollo-engine-reporting-0.2.0" // { dependencies = [ @@ -58353,7 +58942,7 @@ in ]; }) sources."apollo-upload-client-9.1.0" - sources."apollo-utilities-1.0.27" + sources."apollo-utilities-1.1.2" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -58456,7 +59045,7 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.0.0-beta.8" + sources."core-js-3.0.0-beta.9" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."create-error-class-3.0.2" @@ -58611,7 +59200,7 @@ in sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."fswin-2.17.1227" sources."function-bind-1.1.1" sources."generate-function-1.1.0" @@ -58640,10 +59229,10 @@ in sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" sources."graphql-14.1.1" - sources."graphql-anywhere-4.1.24" + sources."graphql-anywhere-4.1.27" sources."graphql-extensions-0.4.1" sources."graphql-subscriptions-1.0.0" - sources."graphql-tag-2.10.0" + sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.3" sources."graphql-type-json-0.2.1" sources."graphql-upload-8.0.4" @@ -58670,7 +59259,7 @@ in sources."ieee754-1.1.12" sources."ignore-3.3.10" sources."ignore-by-default-1.0.1" - sources."immutable-tuple-0.4.9" + sources."immutable-tuple-0.4.10" sources."import-global-0.1.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -58840,7 +59429,7 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.4.0" - sources."optimism-0.6.8" + sources."optimism-0.6.9" sources."ora-3.0.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" @@ -59491,7 +60080,7 @@ in sources."eslint-scope-4.0.0" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" - sources."events-1.1.1" + sources."events-3.0.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -59538,7 +60127,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" sources."get-value-2.0.6" sources."glob-7.1.3" (sources."glob-parent-3.1.0" // { @@ -59616,7 +60205,7 @@ in sources."nan-2.12.1" sources."nanomatch-1.2.13" sources."neo-async-2.6.0" - (sources."node-libs-browser-2.1.0" // { + (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."punycode-1.4.1" ]; @@ -59644,7 +60233,7 @@ in sources."p-try-2.0.0" sources."pako-1.0.8" sources."parallel-transform-1.1.0" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.3" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-dirname-1.0.2" @@ -59805,7 +60394,7 @@ in ]; }) sources."use-3.1.1" - sources."util-0.10.4" + sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" @@ -60614,7 +61203,7 @@ in sources."cheerio-1.0.0-rc.2" (sources."chokidar-2.0.4" // { dependencies = [ - sources."fsevents-1.2.6" + sources."fsevents-1.2.7" ]; }) sources."circular-json-0.3.3" diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index aef59ba2ab91..24fe4a2458d6 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }: +{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { version = "2.1.11"; @@ -9,12 +9,15 @@ buildPythonPackage rec { sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; }; - checkInputs = [ mock nose ddt ]; - propagatedBuildInputs = [ gitdb2 ]; + patches = [ + (substituteAll { + src = ./hardcode-git-path.patch; + inherit git; + }) + ]; - postPatch = '' - sed -i "s|^refresh()$|refresh(path='${git}/bin/git')|" git/__init__.py - ''; + checkInputs = [ nose ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ gitdb2 ddt ]; # Tests require a git repo doCheck = false; diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch new file mode 100644 index 000000000000..937479959926 --- /dev/null +++ b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch @@ -0,0 +1,13 @@ +diff --git a/git/cmd.py b/git/cmd.py +index a4faefe..51ad442 100644 +--- a/git/cmd.py ++++ b/git/cmd.py +@@ -175,7 +175,7 @@ class Git(LazyMixin): + + # CONFIGURATION + +- git_exec_name = "git" # default that should work on linux and windows ++ git_exec_name = "@git@/bin/git" + + # Enables debugging of GitPython's git commands + GIT_PYTHON_TRACE = os.environ.get("GIT_PYTHON_TRACE", False) diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix new file mode 100644 index 000000000000..f898c9313e1f --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: + +buildPythonPackage rec { + pname = "aiohttp-socks"; + version = "0.2.2"; + + src = fetchPypi { + inherit version; + pname = "aiohttp_socks"; + sha256 = "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Checks needs internet access + doCheck = false; + + disabled = pythonOlder "3.5.3"; + + meta = { + description = "SOCKS proxy connector for aiohttp"; + license = lib.licenses.asl20; + homepage = https://github.com/romis2012/aiohttp-socks; + }; +} diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix new file mode 100644 index 000000000000..1c5d651264e0 --- /dev/null +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, attrs }: + +buildPythonPackage rec { + pname = "aiorpcx"; + version = "0.10.2"; + + src = fetchPypi { + inherit version; + pname = "aiorpcX"; + sha256 = "1p88k15jh0d2a18pnnbfcamsqi2bxvmmhpizmdlxfdxf8vy5ggyj"; + }; + + propagatedBuildInputs = [ attrs ]; + + disabled = pythonOlder "3.6"; + + # Checks needs internet access + doCheck = false; + + meta = { + description = "Transport, protocol and framing-independent async RPC client and server implementation"; + license = lib.licenses.mit; + homepage = https://github.com/kyuupichan/aiorpcX; + }; +} diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix new file mode 100644 index 000000000000..d83e2fdbf443 --- /dev/null +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pyfiglet +, pillow +, wcwidth +, future +, mock +, nose +}: + +buildPythonPackage rec { + pname = "asciimatics"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9101b0b6885542f324980bbe13a772475cd6a12678f601228eaaea412db919ab"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + pyfiglet + pillow + wcwidth + future + ]; + + checkInputs = [ + mock + nose + ]; + + # tests require a pty emulator + # which is too complicated to setup here + doCheck = false; + + meta = with lib; { + description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform"; + homepage = https://github.com/peterbrittain/asciimatics; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix new file mode 100644 index 000000000000..633daab7d4e3 --- /dev/null +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, attrs +, bidict +, bitstruct +, more-itertools +, pprintpp +}: + +buildPythonPackage rec { + pname = "audio-metadata"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jd0wzhh9as2qyiwggqmvsbsm5nlb73qnxix2mcar53cddvwrvj7"; + }; + + propagatedBuildInputs = [ + attrs + bidict + bitstruct + more-itertools + pprintpp + ]; + + # No tests + doCheck = false; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/audio-metadata; + description = "A library for reading and, in the future, writing metadata from audio files"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix new file mode 100644 index 000000000000..9a84a7326850 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-storage-common +, isPy3k +, futures +}: + +buildPythonPackage rec { + pname = "azure-storage-blob"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "65ebe2e54460566c2077c6b3773a2a0623eabc7b95602010cb51b84077087fda"; + }; + + propagatedBuildInputs = [ + azure-common + azure-storage-common + ] ++ lib.optional (!isPy3k) futures; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing the blob service APIs"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-blob; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-common/default.nix b/pkgs/development/python-modules/azure-storage-common/default.nix new file mode 100644 index 000000000000..6561163c3a2b --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-common/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, cryptography +, python-dateutil +, requests +, isPy3k +, azure-storage-nspkg +}: + +buildPythonPackage rec { + pname = "azure-storage-common"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7ab607f9b8fd27b817482194b1e7d43484c65dcf2605aae21ad8706c6891934d"; + }; + + propagatedBuildInputs = [ + azure-common + cryptography + python-dateutil + requests + ] ++ lib.optional (!isPy3k) azure-storage-nspkg; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing common code shared by blob, file and queue"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-common; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix new file mode 100644 index 000000000000..ffdb2f656c1d --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-file/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-storage-common +, isPy3k +, futures +}: + +buildPythonPackage rec { + pname = "azure-storage-file"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5217b0441b671246a8d5f506a459fa3af084eeb9297c5be3bbe95d75d23bac2f"; + }; + + propagatedBuildInputs = [ + azure-common + azure-storage-common + ] ++ lib.optional (!isPy3k) futures; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing the file service APIs"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-file; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-nspkg/default.nix b/pkgs/development/python-modules/azure-storage-nspkg/default.nix new file mode 100644 index 000000000000..5efef893a756 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-nspkg/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-nspkg +}: + +buildPythonPackage rec { + pname = "azure-storage-nspkg"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f3bbe8652d5f542767d8433e7f96b8df7f518774055ac7c92ed7ca85f653811"; + }; + + propagatedBuildInputs = [ + azure-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services owning the azure.storage namespace, user should not use this directly"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-nspkg; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix new file mode 100644 index 000000000000..1ca1288e9b44 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-storage-common +}: + +buildPythonPackage rec { + pname = "azure-storage-queue"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bafe9e61c0ce7b3f3ecadea21e931dab3248bd4989dc327a8666c5deae7f7ed"; + }; + + propagatedBuildInputs = [ + azure-common + azure-storage-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Client library for Microsoft Azure Storage services containing the queue service APIs"; + homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-queue; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix new file mode 100644 index 000000000000..ed99686ed27b --- /dev/null +++ b/pkgs/development/python-modules/bidict/default.nix @@ -0,0 +1,42 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm +, sphinx +, hypothesis +, py +, pytest +, pytest-benchmark +, sortedcollections +, sortedcontainers +}: + +buildPythonPackage rec { + pname = "bidict"; + version = "0.17.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1icj0fnfx47n6i33pj5gfrmd1rzpvah1jihhdhqiqx2cy9rs6x4c"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ sphinx ]; + + checkInputs = [ + hypothesis + py + pytest + pytest-benchmark + sortedcollections + sortedcontainers + ]; + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://github.com/jab/bidict; + description = "Efficient, Pythonic bidirectional map data structures and related functionality"; + license = licenses.mpl20; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix new file mode 100644 index 000000000000..2bc4a5bbb616 --- /dev/null +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bitstruct"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1znqgy2ikdqn6n6mv1ccfbl0q7x65bh3i9ph0yjl4rihwvxyg9fg"; + }; + + meta = with lib; { + homepage = https://github.com/eerimoq/bitstruct; + description = "Python bit pack/unpack package"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix new file mode 100644 index 000000000000..5bd545db51cc --- /dev/null +++ b/pkgs/development/python-modules/braintree/default.nix @@ -0,0 +1,27 @@ +{ lib, + fetchPypi, + requests, + buildPythonPackage +}: + +buildPythonPackage rec { + pname = "braintree"; + version = "3.50.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d1d7a6854b623f2c616451fa474113ac7fb8a2cbeb7dfad36dd3312113484030"; + }; + + propagatedBuildInputs = [ requests ]; + + # pypi release does not include tests + doCheck = false; + + meta = with lib; { + description = "Python library for integration with Braintree"; + homepage = https://github.com/braintree/braintree_python; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 844aebbbb965..b2b10671f2b9 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi , mock, unittest2, nose , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six -, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future15 }: +, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future }: buildPythonPackage rec { pname = "bugwarrior"; @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; propagatedBuildInputs = [ twiggy requests offtrac bugzilla taskw dateutil pytz keyring six - jinja2 pycurl dogpile_cache lockfile click pyxdg future15 + jinja2 pycurl dogpile_cache lockfile click pyxdg future ]; # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix deleted file mode 100644 index 05f3afe758a6..000000000000 --- a/pkgs/development/python-modules/cachetools/1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: - -buildPythonPackage rec { - pname = "cachetools"; - version = "2.1.0"; - disabled = isPyPy; # a test fails - - src = fetchPypi { - inherit pname version; - sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/tkem/cachetools"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix new file mode 100644 index 000000000000..673a570c61f0 --- /dev/null +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: + +buildPythonPackage rec { + pname = "click-default-group"; + version = "1.2"; + + # No tests in Pypi tarball + src = fetchFromGitHub { + owner = "click-contrib"; + repo = "click-default-group"; + rev = "v${version}"; + sha256 = "0lm2k4jvy4ilvv91niawklfnp5mp7wa8c1bicsqdfzrxmw7jliwp"; + }; + + propagatedBuildInputs = [ click ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + homepage = https://github.com/click-contrib/click-default-group; + description = "Group to invoke a command without explicit subcommand name"; + license = licenses.bsd3; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 603f92336c05..ab4aa8e89fd1 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -66,4 +66,18 @@ buildPythonPackage rec { # IOKit's dependencies are inconsistent between OSX versions, so this is the best we # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; + + meta = with stdenv.lib; { + description = "A package which provides cryptographic recipes and primitives"; + longDescription = '' + Cryptography includes both high level recipes and low level interfaces to + common cryptographic algorithms such as symmetric ciphers, message + digests, and key derivation functions. + Our goal is for it to be your "cryptographic standard library". It + supports Python 2.7, Python 3.4+, and PyPy 5.3+. + ''; + homepage = https://github.com/pyca/cryptography; + license = with licenses; [ asl20 bsd3 psfl ]; + maintainers = with maintainers; [ primeos ]; + }; } diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index bcb60eb0d8dd..6fc4d5a69efb 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -1,6 +1,4 @@ -{ buildPythonPackage -, fetchPypi -}: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { # also bump cryptography @@ -14,4 +12,12 @@ buildPythonPackage rec { # No tests included doCheck = false; -} \ No newline at end of file + + meta = with lib; { + description = "Test vectors for the cryptography package"; + homepage = https://cryptography.io/en/latest/development/test-vectors/; + # Source: https://github.com/pyca/cryptography/tree/master/vectors; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index 7fbdaa8909d6..48f932086cc6 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage, isPy3k , agate, agate-excel, agate-dbf, agate-sql, six -, argparse, ordereddict, simplejson +, ordereddict, simplejson , glibcLocales, nose, mock, unittest2 }: @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate agate-excel agate-dbf agate-sql six ] ++ lib.optionals (!isPy3k) [ - argparse ordereddict simplejson + ordereddict simplejson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index d575c1b674b0..32d85cfadd71 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -1,36 +1,31 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python, - django, django_nose, six + django, six }: buildPythonPackage rec { pname = "django-compat"; - version = "1.0.14"; + version = "1.0.15"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { owner = "arteria"; repo = "django-compat"; rev = "v${version}"; - sha256 = "11g6ra6djkchqk44v8k7biaxd1v69qyyyask5l92vmrvb0qiwvm8"; + sha256 = "1pr6v38ahrsvxlgmcx69s4b5q5082f44gzi4h3c32sccdc4pwqxp"; }; checkPhase = '' runHook preCheck - # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the - # source directory - mkdir -p testbase/compat - pushd testbase - # note we're not copying the direct contents of compat/ (notably __init__.py) so python won't recognize this as a - # package, but the tests need to be in a specific path for the test templates to get picked up. - cp -r ../compat/tests compat/ - cp ../runtests.py . - ${python.interpreter} runtests.py compat/tests - popd + # to convince the tests to run against the installed package, not the source directory, we extract the + # tests directory from it then dispose of the actual source + mv compat/tests . + rm -r compat + substituteInPlace runtests.py --replace compat.tests tests + ${python.interpreter} runtests.py runHook postCheck ''; - checkInputs = [ django_nose ]; propagatedBuildInputs = [ django six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix new file mode 100644 index 000000000000..21f5b841adb8 --- /dev/null +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -0,0 +1,27 @@ +{ lib, + fetchPypi, + django, + buildPythonPackage +}: + +buildPythonPackage rec { + pname = "django-cors-headers"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qfa9awsj3f0nwygb0vdh4ilcsfi6zinzng73cd5864x2fbyxhn4"; + }; + + propagatedBuildInputs = [ django ]; + + # pypi release does not include tests + doCheck = false; + + meta = with lib; { + description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; + homepage = https://github.com/OttoYiu/django-cors-headers; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index e6cd5a3482fe..005d61acab9b 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -2,14 +2,14 @@ django_hijack, django_nose }: buildPythonPackage rec { pname = "django-hijack-admin"; - version = "2.1.5"; + version = "2.1.10"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { owner = "arteria"; repo = "django-hijack-admin"; rev = "v${version}"; - sha256 = "02j75blvkjiz5mv5wc4jxl27rgmjsrl6l67a3p8342jwazzsm6jg"; + sha256 = "0m98lchp2y43886n67j4s7miyd50pg2r5r966vjnxmd7nx7qkihf"; }; checkInputs = [ django_nose ]; @@ -17,13 +17,21 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + + # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the + # source directory + mkdir testbase + pushd testbase + mv ../runtests.py . ${python.interpreter} runtests.py hijack_admin + popd + runHook postCheck ''; meta = with stdenv.lib; { description = "Admin integration for django-hijack"; - homepage = https://github.com/arteria/django-hijack; + homepage = https://github.com/arteria/django-hijack-admin; license = licenses.mit; maintainers = with maintainers; [ lsix ]; }; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index bdf503cd8492..f41e7d146c97 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -3,15 +3,14 @@ }: buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.9"; - name = pname + "-" + version; + version = "2.1.10"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { owner = "arteria"; repo = "django-hijack"; rev = "v${version}"; - sha256 = "109xi93xj37ycdsvainybhg89pcb5sawv6w80px4r6fjvaq4732c"; + sha256 = "01fwkjdzvw0yx2spwi7zc1yy64ndq1y72bfmk7kxnq5x803m2ak6"; }; checkInputs = [ django_nose ]; @@ -24,7 +23,7 @@ buildPythonPackage rec { # source directory mkdir testbase pushd testbase - cp ../runtests.py . + mv ../runtests.py . ${python.interpreter} runtests.py hijack popd diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix new file mode 100644 index 000000000000..696376b3e4bd --- /dev/null +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -0,0 +1,29 @@ +{ lib, + fetchPypi, + django, + djangorestframework, + six, + buildPythonPackage +}: + +buildPythonPackage rec { + pname = "django-rest-auth"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "ad155a0ed1061b32e3e46c9b25686e397644fd6acfd35d5c03bc6b9d2fc6c82a"; + }; + + propagatedBuildInputs = [ django djangorestframework six ]; + + # pypi release does not include tests + doCheck = false; + + meta = with lib; { + description = "Django app that makes registration and authentication easy"; + homepage = https://github.com/Tivix/django-rest-auth; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 18fbbe2da311..35879a7bfb49 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -13,6 +13,9 @@ buildPythonPackage rec { sha256 = "9b8a245917e1bae131d3210c9ca7efbc066e60f32efa436e391c9803c3f4b61b"; }; + # tests assume the availability of a mysql/postgresql database + doCheck = false; + propagatedBuildInputs = [ django ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/djangorestframework-jwt/default.nix b/pkgs/development/python-modules/djangorestframework-jwt/default.nix new file mode 100644 index 000000000000..f50fd3ff9b61 --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework-jwt/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchPypi +, django +, pyjwt +, djangorestframework +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "djangorestframework-jwt"; + version = "1.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "19rng6v1sw14mbjp5cplnrgxjnhlj8faalfw02iihi9s5w1k7zjy"; + }; + + propagatedBuildInputs = [ pyjwt django djangorestframework ]; + + # ./runtests.py fails because the project must be tested against a django + # installation, there are missing database tables for User, that don't exist. + doCheck = false; + + meta = with lib; { + description = "JSON Web Token Authentication support for Django REST Framework"; + homepage = https://github.com/GetBlimp/django-rest-framework-jwt; + license = licenses.mit; + maintainers = [ maintainers.ivegotasthma ]; + }; +} diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 20f4bc7e0c33..09faabb98cc6 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -2,12 +2,13 @@ buildPythonPackage rec { pname = "dugong"; - version = "3.5"; + version = "3.7.4"; disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 src = fetchPypi { inherit pname version; - sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; + extension = "tar.bz2"; + sha256 = "1fb9kwib6jsd09bxiz70av6g0blscygkx7xzaz1b7ibd28ms77zd"; }; } diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 94d47073764e..805bacbd716a 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "6.2.1"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0f0w23kzyym0fkzisdkcl4xpnm8fsi97v1kskyvfrhj3mxy179fh"; + sha256 = "1gh8a0shqi105k325hgwb9avrpdjh0mc6mxwfg9ba7g6lssb702z"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 9a46d9611e08..548c7a59bc6f 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "067mdy9p1vbkypr3vazmrb0sga6maqbk542hr7hmzcb5lp3dr8sj"; + sha256 = "0v1pjzn9z20ckgv3kji7c8nwcsm7670z4i43ic9skjrdbcqylwfq"; }; buildInputs = [ pytestrunner ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { ] ++ lib.optional (pythonOlder "3.3") ipaddress; postPatch = '' + find tests -type d -name "__pycache__" | xargs rm -r substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" ''; diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix new file mode 100644 index 000000000000..7091799decab --- /dev/null +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: + +buildPythonPackage rec { + pname = "fuzzywuzzy"; + version = "0.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f49de47db00e1c71d40ad16da42284ac357936fa9b66bea1df63fed07122d62"; + }; + + propagatedBuildInputs = [ python-Levenshtein ]; + checkInputs = [ pycodestyle hypothesis pytest ]; + + meta = with stdenv.lib; { + description = "Fuzzy string matching for Python"; + homepage = https://github.com/seatgeek/fuzzywuzzy; + license = licenses.gpl2; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix index f25723e7ec72..9670428a3e5f 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/development/python-modules/glances/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { name = "glances-${version}"; - version = "3.0.2"; + version = "3.1.0"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1jkjblfk4gbr00j7lny7ajiizzqnp0p1yhzfi14074gwk38z0q14"; + sha256 = "0zjpp017i8b8bijdaj85rya7rmdqh4g8vkb42q14q2sw6agxz3zi"; }; patches = lib.optional doCheck ./skip-failing-tests.patch; diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix new file mode 100644 index 000000000000..b2196c8748ce --- /dev/null +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, attrs +, audio-metadata +, marshmallow +, pendulum +, protobuf +}: + +buildPythonPackage rec { + pname = "google-music-proto"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "008nap32hcrlnkkqkf462vwnm6xzrn6fj71lbryfmrakad7rz7bc"; + }; + + propagatedBuildInputs = [ + attrs + audio-metadata + marshmallow + pendulum + protobuf + ]; + + # No tests + doCheck = false; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/google-music-proto; + description = "Sans-I/O wrapper of Google Music API calls"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix new file mode 100644 index 000000000000..d7fb8a917076 --- /dev/null +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, audio-metadata, multidict, wrapt +, pytest +}: + +buildPythonPackage rec { + pname = "google-music-utils"; + version = "2.0.0"; + + # Pypi tarball doesn't contain tests + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = "google-music-utils"; + rev = version; + sha256 = "0i5zcr1ypnxizi41s3lrplz9m9rmb56s5iihjx61kbybxcq2b6gk"; + }; + + propagatedBuildInputs = [ + audio-metadata multidict wrapt + ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/google-music-utils; + description = "A set of utility functionality for google-music and related projects"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix new file mode 100644 index 000000000000..b0fe0f8a2544 --- /dev/null +++ b/pkgs/development/python-modules/google-music/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, appdirs +, audio-metadata +, google-music-proto +, protobuf +, requests_oauthlib +, tenacity +}: + +buildPythonPackage rec { + pname = "google-music"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "13i9nd62wqfg0f5r7ykr15q83397vdpw0js50fy5nbgs33sbf6b7"; + }; + + propagatedBuildInputs = [ + appdirs + audio-metadata + google-music-proto + protobuf + requests_oauthlib + tenacity + ]; + + # No tests + doCheck = false; + + disabled = pythonOlder "3.6"; + + meta = with lib; { + homepage = https://github.com/thebigmunch/google-music; + description = "A Google Music API wrapper"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix new file mode 100644 index 000000000000..79413b26544f --- /dev/null +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyparsing +, future +, pytest +, pytestrunner +}: + +buildPythonPackage rec { + pname = "grandalf"; + version = "0.6"; + + # fetch from github to acquire tests + src = fetchFromGitHub { + owner = "bdcht"; + repo = "grandalf"; + rev = "v${version}"; + sha256 = "1f1l288sqna0bca7dwwvyw7wzg9b2613g6vc0g0vfngm7k75b2jg"; + }; + + propagatedBuildInputs = [ + pyparsing + future + ]; + + checkInputs = [ pytest pytestrunner ]; + + patches = [ ./no-setup-requires-pytestrunner.patch ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "A python package made for experimentations with graphs and drawing algorithms"; + homepage = https://github.com/bdcht/grandalf; + license = licenses.gpl2; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch b/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch new file mode 100644 index 000000000000..80e12e246ebb --- /dev/null +++ b/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch @@ -0,0 +1,15 @@ +diff --git a/setup.py b/setup.py +index 0470622..d574ceb 100755 +--- a/setup.py ++++ b/setup.py +@@ -75,8 +75,8 @@ setup( + # your project is installed. For an analysis of "install_requires" vs pip's + # requirements files see: + # https://packaging.python.org/en/latest/requirements.html +- setup_requires=['pytest-runner',], +- tests_require=['pytest',], ++ setup_requires=[], ++ tests_require=['pytest','pytest-runner',], + + install_requires=['pyparsing','future'], + diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 22376b7e0cfc..249054581fab 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -1,14 +1,26 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm -, inflect, more-itertools, six }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm +, inflect, more-itertools, six, pytest, pytest-flake8 }: buildPythonPackage rec { pname = "jaraco.itertools"; - version = "3.0.0"; + version = "4.0.0"; + src = fetchPypi { inherit pname version; - sha256 = "19d8557a25c08f7a7b8f1cfa456ebfd615bafa0f045f89bbda55f99661b0626d"; + sha256 = "1d09zpi593bhr56rwm41kzffr18wif98plgy6xdy0zrbdwfarrxl"; }; - doCheck = false; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; + checkInputs = [ pytest pytest-flake8 ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Tools for working with iterables"; + homepage = https://github.com/jaraco/jaraco.itertools; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix new file mode 100644 index 000000000000..adcdd2b9d823 --- /dev/null +++ b/pkgs/development/python-modules/jq/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, fetchPypi, lib, cython, jq }: + +buildPythonPackage rec { + pname = "jq"; + version = "0.1.6"; + + srcs = fetchPypi { + inherit pname version; + sha256 = "34bdf9f9e49e522e1790afc03f3584c6b57329215ea0567fb2157867d6d6f602"; + }; + patches = [ ./jq-py-setup.patch ]; + + nativeBuildInputs = [ cython ]; + + preBuild = '' + cython jq.pyx + ''; + + buildInputs = [ jq ]; + + meta = { + description = "Python bindings for jq, the flexible JSON processor"; + homepage = "https://github.com/mwilliamson/jq.py"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ benley ]; + }; +} diff --git a/pkgs/development/python-modules/jq/jq-py-setup.patch b/pkgs/development/python-modules/jq/jq-py-setup.patch new file mode 100644 index 000000000000..7d7d825e9f18 --- /dev/null +++ b/pkgs/development/python-modules/jq/jq-py-setup.patch @@ -0,0 +1,130 @@ +From 3f369cf8b9f7134d0792f6b141d39b5342a8274f Mon Sep 17 00:00:00 2001 +From: Benjamin Staffin <benley@gmail.com> +Date: Mon, 14 Jan 2019 17:27:06 -0500 +Subject: [PATCH] Vastly simplify setup.py for distro compatibility + +--- + setup.py | 81 +------------------------------------------------------- + 1 file changed, 1 insertion(+), 80 deletions(-) + +diff --git a/setup.py b/setup.py +index 77933f2..2b71e25 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,10 +1,6 @@ + #!/usr/bin/env python + + import os +-import platform +-import subprocess +-import tarfile +-import shutil + + try: + import sysconfig +@@ -14,88 +10,15 @@ except ImportError: + + from setuptools import setup + from distutils.extension import Extension +-from distutils.command.build_ext import build_ext +- +-try: +- from urllib import urlretrieve +-except ImportError: +- from urllib.request import urlretrieve +- +-def path_in_dir(relative_path): +- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path)) + + def read(fname): + return open(os.path.join(os.path.dirname(__file__), fname)).read() + + +-jq_lib_tarball_path = path_in_dir("_jq-lib-1.5.tar.gz") +-jq_lib_dir = path_in_dir("jq-jq-1.5") +- +-oniguruma_lib_tarball_path = path_in_dir("_onig-5.9.6.tar.gz") +-oniguruma_lib_build_dir = path_in_dir("onig-5.9.6") +-oniguruma_lib_install_dir = path_in_dir("onig-install-5.9.6") +- +-class jq_build_ext(build_ext): +- def run(self): +- self._build_oniguruma() +- self._build_libjq() +- build_ext.run(self) +- +- def _build_oniguruma(self): +- self._build_lib( +- source_url="https://github.com/kkos/oniguruma/releases/download/v5.9.6/onig-5.9.6.tar.gz", +- tarball_path=oniguruma_lib_tarball_path, +- lib_dir=oniguruma_lib_build_dir, +- commands=[ +- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir], +- ["make"], +- ["make", "install"], +- ]) +- +- +- def _build_libjq(self): +- self._build_lib( +- source_url="https://github.com/stedolan/jq/archive/jq-1.5.tar.gz", +- tarball_path=jq_lib_tarball_path, +- lib_dir=jq_lib_dir, +- commands=[ +- ["autoreconf", "-i"], +- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], +- ["make"], +- ]) +- +- def _build_lib(self, source_url, tarball_path, lib_dir, commands): +- self._download_tarball(source_url, tarball_path) +- +- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") +- if macosx_deployment_target: +- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target +- +- def run_command(args): +- print("Executing: %s" % ' '.join(args)) +- subprocess.check_call(args, cwd=lib_dir) +- +- for command in commands: +- run_command(command) +- +- def _download_tarball(self, source_url, tarball_path): +- if os.path.exists(tarball_path): +- os.unlink(tarball_path) +- urlretrieve(source_url, tarball_path) +- +- if os.path.exists(jq_lib_dir): +- shutil.rmtree(jq_lib_dir) +- tarfile.open(tarball_path, "r:gz").extractall(path_in_dir(".")) +- +- + jq_extension = Extension( + "jq", + sources=["jq.c"], +- include_dirs=[jq_lib_dir], +- extra_objects=[ +- os.path.join(jq_lib_dir, ".libs/libjq.a"), +- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), +- ], ++ libraries=["jq"], + ) + + setup( +@@ -107,7 +30,6 @@ setup( + url='http://github.com/mwilliamson/jq.py', + license='BSD 2-Clause', + ext_modules = [jq_extension], +- cmdclass={"build_ext": jq_build_ext}, + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', +@@ -123,4 +45,3 @@ setup( + 'Programming Language :: Python :: 3.5', + ], + ) +- +-- +2.19.2 + diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 425a3b29f13e..455f90a01644 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -6,20 +6,22 @@ buildPythonPackage rec { pname = "kaptan"; - version = "0.5.10"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "44df200d030975650a3a832c13b48cafdeb1a237b23de181d6a2346107e39da3"; + sha256 = "8403d6e48200c3f49cb6d6b3dcb5898aa5ab9d820831655bf9a2403e00cd4207"; }; propagatedBuildInputs = [ pyyaml ]; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { description = "Configuration manager for python applications"; - homepage = https://emre.github.io/kaptan/; + homepage = https://kaptan.readthedocs.io/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 417baed95603..43b75b30f5a4 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { description = "Scripting library for tmux"; homepage = https://libtmux.readthedocs.io/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; } - diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/pkgs/development/python-modules/limitlessled/default.nix new file mode 100644 index 000000000000..c2029aa6d6bd --- /dev/null +++ b/pkgs/development/python-modules/limitlessled/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "limitlessled"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pd71wxqjvznx10brsj1sgy3420bz7awbzk9jlj422rrdxql754j"; + }; + + meta = with lib; { + description = "Control LimitlessLED products"; + homepage = https://github.com/happyleavesaoc/python-limitlessled/; + license = licenses.mit; + maintainers = with maintainers; [ sephalon ]; + }; +} diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix new file mode 100644 index 000000000000..098d9f3e06d8 --- /dev/null +++ b/pkgs/development/python-modules/logzero/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "logzero"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hli2wgwxxackrk1ybmlpdd0rzms6blm11zzwlvrzykd8cp1xyil"; + }; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://github.com/metachris/logzero; + description = "Robust and effective logging for Python 2 and 3"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 6dbfa1fae603..388e0148d0a0 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six +{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six , fetchPypi }: @@ -18,7 +18,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" nosetests ''; - propagatedBuildInputs = [ argparse jinja2 six ]; + propagatedBuildInputs = [ jinja2 six ]; meta = with stdenv.lib; { homepage = https://github.com/domenkozar/mr.bob; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 579fc4631f66..2c0a83c62e3e 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.13"; + version = "8.0.14"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1qb6m3cp6zxmr49bp6g5g5b75yszgac1h26i2hza61mrvd235688"; + sha256 = "1cf0ic2mx339j62579xjlaw5q5sz61dac379c7lsy3ln3krsw3y9"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix new file mode 100644 index 000000000000..b6e323ff9c69 --- /dev/null +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: + +buildPythonPackage rec { + pname = "nanomsg-python"; + version = "1.0.20190114"; + + src = fetchFromGitHub { + owner = "tonysimpson"; + repo = "nanomsg-python"; + rev = "3acd9160f90f91034d4a43ce603aaa19fbaf1f2e"; + sha256 = "1qgybcpmm9xxrn39alcgdcpvwphgm1glkbnwx0ljpz4nd1jsnyrl"; + }; + + buildInputs = [ nanomsg ]; + + # Tests requires network connections + doCheck = false; + + meta = with stdenv.lib; { + description = "Bindings for nanomsg"; + homepage = https://github.com/tonysimpson/nanomsg-python; + license = licenses.mit; + maintainers = with maintainers; [ bgamari ]; + }; +} diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix new file mode 100644 index 000000000000..8dd520a04e9a --- /dev/null +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "nanotime"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c7cc231fc5f6db401b448d7ab51c96d0a4733f4b69fabe569a576f89ffdf966b"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + # tests currently fail + doCheck = false; + + meta = with lib; { + description = "Provides a time object that keeps time as the number of nanoseconds since the UNIX epoch"; + homepage = https://github.com/jbenet/nanotime/tree/master/python; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 1b14657d5061..7d7f7da753e1 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.0.6"; + version = "0.6.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "1i5p4ia4qcqmfb9k90g3ssbr090q555fdpc32sl4x6rgqfw5ddj4"; + sha256 = "0ncclbj9qdd88fs26mvgf217m7kgfcy1zgsyzi1j65b6z2wywl9a"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index c183442e0e9e..41aa7f7a0c8a 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -7,7 +7,6 @@ , isPy3k , numpy , llvmlite -, argparse , funcsigs , singledispatch , libcxx @@ -24,7 +23,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; # Copy test script into $out and run the test suite. checkPhase = '' diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 2f435201d21d..8abd3f22ea3d 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchgit , pyptlib -, argparse , twisted , pycrypto , pyyaml @@ -23,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "argparse" "" ''; - propagatedBuildInputs = [ pyptlib argparse twisted pycrypto pyyaml ]; + propagatedBuildInputs = [ pyptlib twisted pycrypto pyyaml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix deleted file mode 100644 index c481aa0dfea7..000000000000 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, stdenv -, pytest -, glibcLocales -, cython -, dateutil -, scipy -, numexpr -, pytz -, xlrd -, bottleneck -, sqlalchemy -, lxml -, html5lib -, beautifulsoup4 -, openpyxl -, tables -, xlwt -, libcxx ? null -}: - -let - inherit (stdenv.lib) optional optionalString; - inherit (stdenv) isDarwin; -in buildPythonPackage rec { - pname = "pandas"; - version = "0.17.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx; - propagatedBuildInputs = [ - cython - dateutil - scipy - numexpr - pytz - xlrd - bottleneck - sqlalchemy - lxml - html5lib - beautifulsoup4 - openpyxl - tables - xlwt - ]; - - doCheck = false; - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = optionalString isDarwin '' - cpp_sdk="${libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - ''; - - meta = { - # https://github.com/pandas-dev/pandas/issues/14866 - # pandas devs are no longer testing i686 so safer to assume it's broken - broken = stdenv.isi686; - homepage = http://pandas.pydata.org/; - description = "Python Data Analysis Library"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 3507729ee94e..ac85b4be1200 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -6,7 +6,6 @@ , paste , PasteDeploy , cheetah -, argparse }: buildPythonPackage rec { @@ -19,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ six paste PasteDeploy cheetah argparse ]; + propagatedBuildInputs = [ six paste PasteDeploy cheetah ]; doCheck = false; diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix new file mode 100644 index 000000000000..daf9d0062fb2 --- /dev/null +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchpatch, buildPythonPackage, fetchPypi, python, nose, parameterized }: + +buildPythonPackage rec { + pname = "pprintpp"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00v4pkyiqc0y9qjnp3br58a4k5zwqdrjjxbcsv39vx67w84630pa"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/wolever/pprintpp/commit/873217674cc824b4c1cfdad4867c560c60e8d806.patch"; + sha256 = "0rqxzxawr83215s84mfzh1gnjwjm2xv399ywwcl4q7h395av5vb3"; + }) + ]; + + checkInputs = [ nose parameterized ]; + checkPhase = '' + ${python.interpreter} test.py + ''; + + meta = with lib; { + homepage = https://github.com/wolever/pprintpp; + description = "A drop-in replacement for pprint that's actually pretty"; + license = licenses.bsd2; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 18fb14c3aa9a..362e73c0d71e 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,39 +1,38 @@ { stdenv , python , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pytest , python-utils , sphinx -, coverage -, execnet , flake8 , pytestpep8 , pytestflakes , pytestcov , pytestcache -, pep8 , pytestrunner +, freezegun }: buildPythonPackage rec { pname = "progressbar2"; - version = "3.12.0"; + version = "3.39.2"; - # Use source from GitHub, PyPI is missing tests - # https://github.com/WoLpH/python-progressbar/issues/151 - src = fetchFromGitHub { - owner = "WoLpH"; - repo = "python-progressbar"; - rev = "v${version}"; - sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f"; + src = fetchPypi { + inherit pname version; + sha256 = "6eb5135b987caca4212d2c7abc2923d4ad5ba18bb34ccbe7044b3628f52efc2c"; }; + postPatch = '' + rm -r tests/__pycache__ + rm tests/*.pyc + ''; + propagatedBuildInputs = [ python-utils ]; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ - pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov - pytestcache pep8 + pytest sphinx flake8 pytestpep8 pytestflakes pytestcov + pytestcache freezegun ]; # ignore tests on the nix wrapped setup.py and don't flake .eggs directory checkPhase = '' diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index d588ebb12e47..a66d8f7a0250 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,10 +13,15 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ pandas pytest ]; + checkInputs = [ hypothesis pandas pytest ]; PYARROW_BUILD_TYPE = "release"; - PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" + + # for some reason cmake won't set -std=c++11 for clang + "-DPYARROW_CXXFLAGS=-std=c++11" + ]; preCheck = '' rm pyarrow/tests/test_jvm.py diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 0721c0d449c7..c5be26bd9b73 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; homepage = https://github.com/appknox/pyaxmlparser; - license = licenses.mit; + # Files from Androguard are licensed ASL 2.0 + license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 2494407766c7..bda05a58e150 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -1,19 +1,20 @@ -{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf, casttube }: +{ lib, fetchPypi, buildPythonPackage, requests, zeroconf, protobuf, casttube, isPy3k }: buildPythonPackage rec { pname = "PyChromecast"; - version = "2.3.0"; - name = pname + "-" + version; + version = "2.4.0"; - src = fetchurl { - url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38"; + src = fetchPypi { + inherit pname version; + sha256 = "0q012ghssk2xhm17v28sc2lv62vk7wd5p7zzdbgxk6kywfx8yvm2"; }; - propagatedBuildInputs = [ requests six zeroconf protobuf casttube ]; + disabled = !isPy3k; + + propagatedBuildInputs = [ requests zeroconf protobuf casttube ]; meta = with lib; { - description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; + description = "Library for Python 3.4+ to communicate with the Google Chromecast"; homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix deleted file mode 100644 index 1d8ba697f38b..000000000000 --- a/pkgs/development/python-modules/pygame/git.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, lib, fetchFromBitbucket, buildPythonPackage, python, smpeg, libX11 -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi -}: - -buildPythonPackage rec { - pname = "pygame"; - version = "2016-05-17"; - name = pname + "-" + version; - - src = fetchFromBitbucket { - owner = "pygame"; - repo = "pygame"; - rev = "575c7a74d85a37db7c645421c02cf0b6b78a889f"; - sha256 = "1i5xqmw93kfidcji2wacgkm5y4mcnbksy8iimih0729k19rbhznc"; - }; - - buildInputs = [ - SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg - smpeg portmidi libX11 - ]; - - # Tests fail because of no audio device and display. - doCheck = false; - - preConfigure = '' - sed \ - -e "s/^origincdirs = .*/origincdirs = []/" \ - -e "s/^origlibdirs = .*/origlibdirs = []/" \ - -i config_unix.py - ${lib.concatMapStrings (dep: '' - sed \ - -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \ - -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \ - -i config_unix.py - '') buildInputs - } - LOCALBASE=/ ${python.interpreter} config.py - ''; - - meta = with stdenv.lib; { - description = "Python library for games"; - homepage = http://www.pygame.org/; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/python-modules/pymongo/2_9_1.nix b/pkgs/development/python-modules/pymongo/2_9_1.nix deleted file mode 100644 index 8e0b0858754d..000000000000 --- a/pkgs/development/python-modules/pymongo/2_9_1.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "pymongo"; - version = "2.9.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70"; - }; - - # Tests call a running mongodb instance - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/mongodb/mongo-python-driver; - license = licenses.asl20; - description = "Python driver for MongoDB "; - }; - -} diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 392a0ec580fe..792b8b1bd5b4 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pymongo"; version = "3.7.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "8c74e2a9b594f7962c62cef7680a4cb92a96b4e6e3c2f970790da67cc0213a7e"; }; + # Tests call a running mongodb instance doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; - description = "Python driver for MongoDB "; + description = "Python driver for MongoDB"; }; } diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 0f3475f715d0..0a361627e8e9 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pytest-benchmark"; - version = "3.1.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "ionelmc"; repo = pname; rev = "v${version}"; - sha256 = "1ch079dlc6c9ag74dh4dg6plkmh0h8kn78ari3fgadc75bald71m"; + sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj"; }; propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optional (pythonOlder "3.4") [ pathlib statistics ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index dc928130cbb1..9412a750a9ab 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,59 +2,46 @@ , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2 }: +buildPythonPackage rec { + version = "3.9.3"; + pname = "pytest"; -let generic = { version, sha256 }: - buildPythonPackage rec { - pname = "pytest"; - inherit version; + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - src = fetchPypi { - inherit pname version sha256; - }; - - checkInputs = [ hypothesis mock ]; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] - ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; - - checkPhase = '' - runHook preCheck - $out/bin/py.test -x testing/ - runHook postCheck - ''; - - # Remove .pytest_cache when using py.test in a Nix build - setupHook = writeText "pytest-hook" '' - pytestcachePhase() { - find $out -name .pytest_cache -type d -exec rm -rf {} + - } - - preDistPhases+=" pytestcachePhase" - ''; - - meta = with stdenv.lib; { - homepage = https://docs.pytest.org; - description = "Framework for writing tests"; - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; - license = licenses.mit; - platforms = platforms.unix; - }; - }; - -in { - pytest_39 = generic { - version = "3.9.3"; + src = fetchPypi { + inherit pname version; sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db"; }; - pytest_37 = generic { - version = "3.7.4"; - sha256 = "2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349"; + checkInputs = [ hypothesis mock ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + + preDistPhases+=" pytestcachePhase" + ''; + + meta = with stdenv.lib; { + homepage = https://docs.pytest.org; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 24ab69f1a0bc..8c030ec8639b 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "20ceb9232f9a412ce6554056a6b5039013d0755261d57b5c8ada7035773de795"; + sha256 = "17nh09c28vf2daamyq97bdzgr685lyh668haisqbbp5lkn9gh7j0"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 86e58d489a61..1ecf5fe10618 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,17 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi, gnupg1 }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "python-gnupg"; - version = "0.4.3"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "2d158dfc6b54927752b945ebe57e6a0c45da27747fa3b9ae66eccc0d2147ac0d"; + sha256 = "45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e"; }; - propagatedBuildInputs = [ gnupg1 ]; - # Let's make the library default to our gpg binary patchPhase = '' substituteInPlace gnupg.py \ diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index b7744ce79c3b..7aa776540061 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,29 +1,23 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: buildPythonPackage rec { pname = "python-utils"; version = "2.3.0"; - name = pname + "-" + version; - src = fetchFromGitHub { - owner = "WoLpH"; - repo = "python-utils"; - rev = "v${version}"; - sha256 = "14gyphcqwa77wfbnrzj363v3fdkxy08378lgd7l3jqnpvr8pfp5c"; + src = fetchPypi { + inherit pname version; + sha256 = "34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3"; }; - checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; - postPatch = '' - # pytest-runner is only actually required in checkPhase - substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "" + rm -r tests/__pycache__ + rm tests/*.pyc ''; - # Tests failing - doCheck = false; + checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; checkPhase = '' - py.test + py.test tests ''; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 13ea7b75ae3f..b7c38c512652 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -5,7 +5,6 @@ , setuptoolsTrial , simplejson , zbase32 -, argparse , twisted , isPyPy }: @@ -20,7 +19,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); - propagatedBuildInputs = [ argparse twisted ]; + propagatedBuildInputs = [ twisted ]; # Tests fail because they try to write new code into the twisted # package, apparently some kind of plugin. diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 00691e65225c..7f908c943aef 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, imagemagick, feh }: +{ lib, buildPythonPackage, fetchPypi, imagemagick, feh, isPy3k }: -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { pname = "pywal"; version = "3.2.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; }; @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { ./feh.patch ]; + # Invalid syntax + disabled = !isPy3k; + postPatch = '' substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh" diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 2078a04be063..f6965fd6cd93 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -1,26 +1,30 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest -, sphinx -, CommonMark_54 +, CommonMark , docutils +, sphinx }: buildPythonPackage rec { pname = "recommonmark"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; + # PyPI tarball is missing some test files: https://github.com/rtfd/recommonmark/pull/128 + src = fetchFromGitHub { + owner = "rtfd"; + repo = pname; + rev = version; + sha256 = "04bjqx2hczmg7rnj2rpsjk7h24diwk83s6fhgrxk00k40w2bpz5j"; }; - checkInputs = [ pytest sphinx ]; - propagatedBuildInputs = [ CommonMark_54 docutils ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ CommonMark docutils sphinx ]; - # No tests in archive - doCheck = false; + checkPhase = '' + py.test + ''; meta = { description = "A docutils-compatibility bridge to CommonMark"; @@ -28,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index 2102cf064250..a4d1dcc485ec 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, argparse, pyres, nose +{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose , preggy, numpy, yanc, nose-focus, mock, opencv }: buildPythonPackage rec { pname = "remotecv"; version = "2.2.2"; - propagatedBuildInputs = [ pillow argparse pyres ]; + propagatedBuildInputs = [ pillow pyres ]; checkInputs = [ nose preggy numpy yanc nose-focus mock opencv ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index f29cafb7aeed..58a767432a22 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyparsing, argparse, robotframework, allpairspy }: +{ stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: buildPythonPackage rec { pname = "RoboMachine"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; - propagatedBuildInputs = [ pyparsing argparse robotframework allpairspy ]; + propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; # Remove Windows .bat files postInstall = '' diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 8027688c9ea5..4e607799d229 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pbr, six, argparse }: +{ stdenv, buildPythonPackage, fetchPypi, pbr, six }: buildPythonPackage rec { pname = "stevedore"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ pbr six argparse ]; + propagatedBuildInputs = [ pbr six ]; meta = with stdenv.lib; { description = "Manage dynamic plugins for Python applications"; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix new file mode 100644 index 000000000000..596fa6b825fc --- /dev/null +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, pbr, six, futures, monotonic +, pytest, sphinx, tornado +}: + +buildPythonPackage rec { + pname = "tenacity"; + version = "5.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rjbj9wks7b7n75mbm01y0g2ngyai8yi05ck9gicmcdyix7vw42c"; + }; + + nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ six ] + ++ lib.optionals isPy27 [ futures monotonic ]; + + checkInputs = [ pytest sphinx tornado ]; + checkPhase = (if isPy27 then '' + pytest --ignore='tenacity/tests/test_asyncio.py' + '' else '' + pytest + '') + '' + sphinx-build -a -E -W -b doctest doc/source doc/build + ''; + + meta = with lib; { + homepage = https://github.com/jd/tenacity; + description = "Retrying library for Python"; + license = licenses.asl20; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 878de1875190..7808eb359326 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,27 +1,48 @@ -{ lib, fetchPypi, buildPythonPackage, - protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp, isPy3k +{ lib, fetchPypi, buildPythonPackage, isPy3k, python, pytest +, typing-extensions +, protobuf +, hidapi +, ecdsa +, mnemonic +, requests +, pyblake2 +, click +, construct +, libusb1 +, rlp }: buildPythonPackage rec { pname = "trezor"; - version = "0.10.2"; + version = "0.11.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4dba4d5c53d3ca22884d79fb4aa68905fb8353a5da5f96c734645d8cf537138d"; + sha256 = "6043f321d856e1b45b9df0c37810264f08d065bb56cd999f61a05fe2906e9e18"; }; - propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; + propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; - # There are no actual tests: "ImportError: No module named tests" - doCheck = false; + # build requires UTF-8 locale + LANG = "en_US.UTF-8"; + + checkInputs = [ + pytest + ]; + + # disable test_tx_api.py as it requires being online + checkPhase = '' + runHook preCheck + ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py + runHook postCheck + ''; meta = { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = https://github.com/trezor/python-trezor; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np ]; + maintainers = with lib.maintainers; [ np prusnak ]; }; } diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 215f39da30b4..3e6109133bac 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.9.0"; + version = "0.10.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6d905d950dfa1db3fad6b5ef5637c221947123fd2b0e112033fecfc582318c3b"; + sha256 = "1c1snnhjg8l87ygf5p9z2qjcq090mws5w7pr9aaiava0yqawq8yk"; }; checkInputs = [ pytest pyopenssl trustme jedi pylint ]; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 0a49c2566409..cdb60946079d 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -7,7 +7,6 @@ , pyplatec , protobuf , purepng -, argparse , h5py , gdal }: @@ -35,7 +34,7 @@ buildPythonPackage rec { ''; buildInputs = [ nose ]; - propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng argparse h5py gdal ]; + propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ]; prePatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix new file mode 100644 index 000000000000..d7f212f22844 --- /dev/null +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k +, pytest, requests }: + +buildPythonPackage rec { + pname = "zm-py"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hq83svprd21r74palhs3xq15g34135349y4lrgr7c76i3f37j2q"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + PYTHONPATH="./zoneminder:$PYTHONPATH" pytest + ''; + + meta = with lib; { + description = "A loose python wrapper around the ZoneMinder REST API"; + homepage = https://github.com/rohankapoorcom/zm-py; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index fd841563005e..724435c01ca2 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -94,6 +94,10 @@ in ''; }; + digest-sha3 = attrs: { + hardeningDisable = [ "format" ]; + }; + ethon = attrs: { dontBuild = false; postPatch = '' @@ -354,6 +358,10 @@ in ''; } else {}; + semian = attrs: { + buildInputs = [ openssl ]; + }; + sequel_pg = attrs: { buildInputs = [ postgresql ]; }; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0827807afef3..b011cb0b918a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.90.0"; + version = "0.91.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "12y34l4nhcmdcv91gzdrxw0cvd8w0cg69c5km1nkydgayk82a3x2"; + sha256 = "14snr65pbnczkv49lmhgyjzlgrrlfwsxkd7g6xbv9y5xl4sp0309"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index eac1bc7b51ed..a72ef7937c50 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -101,17 +101,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20315"; - gittap = "3.1.3"; - gittip = "57dd0b4e7ec70cc95f859651b1b63b076b8df7a7"; - rev = "3.1.3"; - version = "3.1.3"; - sha256 = "17bd7i9lbr0nxa3llw354mppx44xi7bjwif7g7wxw0zcjlfxnk5d"; - cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a"; - cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y"; + version_commit = "20591"; + gittap = "3.2.1"; + gittip = "25913f4745cb3b635d52f1aafc4d8ff2aad3988a"; + rev = "3.2.1"; + version = "3.2.1"; + sha256 = "1c4zj96386sc9lvfcsdh9lhyh0rvv4zzfr6218gvjkg9fy6cc91y"; + cs_tip = "0ff8220adef16a942697afd245afc5ab0f70cbf8"; + cs_sha256 = "1ak8ysgivq28d23r77881p0z5v65jhpap5plm10p9j3y2x00n3zn"; }; r2-for-cutter = generic { - version_commit = "20315"; + version_commit = "20591"; gittap = "2.9.0-310-gcb62c376b"; gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index a59b452b432b..fbb7eca0ef51 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -7,15 +7,16 @@ let in stdenv.mkDerivation rec { name = "spin-${version}"; - version = "6.4.8"; + version = "6.4.9"; url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. # Dropbox mirror from developers: # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa - url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADya1lOBJZDbgWGrUSq-dfHa/spin${url-version}.tar.gz?raw=1"; - sha256 = "1rvamdsf0igzpndlr4ck7004jw9x1bg4xyf78zh5k9sp848vnd80"; + # (note that this URL doesn't work aross versions and hash should come from official site) + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AABtxFePMJmPxsxSvU5cpxh8a/spin${url-version}.tar.gz?raw=1"; + sha256 = "07b7wk3qyfnp4pgwicqd33l7i1krzyihx0cf9zkv81ywaklf5vll"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +25,8 @@ in stdenv.mkDerivation rec { sourceRoot = "Spin/Src${version}"; installPhase = '' + install -Dm644 ../Man/spin.1 $out/share/man/man1/spin.1 + install -Dm755 spin $out/bin/spin wrapProgram $out/bin/spin \ --prefix PATH : ${binPath} diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index 5433725b3050..12eee5f80862 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { pname = "ansible-lint"; - version = "3.4.23"; + version = "3.5.1"; src = fetchFromGitHub { owner = "willthames"; repo = "ansible-lint"; rev = "v${version}"; - sha256 = "0cnfgxh5m7alzm811hc95jigbca5vc1pf8fjazmsakmhdjyfbpb7"; + sha256 = "09qixiaqhm6dbl74s1rwxbsg31nr6jjsvr4fxfnxl9ccbxcrpzn2"; }; propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index eb805dcce7a9..68f00be342c3 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -9,12 +9,9 @@ python.pkgs.buildPythonApplication rec { sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; }; - argparse = null; - doCheck = false; propagatedBuildInputs = [ python.pkgs.requests - python.pkgs.argparse python.pkgs.pyyaml ]; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index c20431c5e7e0..624821613465 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, lua5, python }: +{ stdenv, fetchFromGitHub, lua5_3, python }: stdenv.mkDerivation rec { name = "bam-${version}"; - version = "0.4.0"; + version = "0.5.1"; - src = fetchurl { - url = "http://github.com/downloads/matricks/bam/${name}.tar.bz2"; - sha256 = "0z90wvyd4nfl7mybdrv9dsd4caaikc6fxw801b72gqi1m9q0c0sn"; + src = fetchFromGitHub { + owner = "matricks"; + repo = "bam"; + rev = "v${version}"; + sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"; }; - buildInputs = [ lua5 python ]; + buildInputs = [ lua5_3 python ]; buildPhase = ''${stdenv.shell} make_unix.sh''; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { raskin ]; platforms = platforms.linux; - license = licenses.free; + license = licenses.zlib; downloadPage = "http://matricks.github.com/bam/"; }; } diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix new file mode 100644 index 000000000000..3bbab475c573 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -0,0 +1,42 @@ +{ stdenv, writeText, runCommandCC, bazel }: + +# Tests that certain executables are available in bazel-executed bash shells. + +let + WORKSPACE = writeText "WORKSPACE" '' + workspace(name = "our_workspace") + ''; + + fileIn = writeText "input.txt" '' + one + two + three + ''; + + fileBUILD = writeText "BUILD" '' + genrule( + name = "tool_usage", + srcs = [ ":input.txt" ], + outs = [ "output.txt" ], + cmd = "cat $(location :input.txt) | gzip - | gunzip - | awk '/t/' > $@", + ) + ''; + + runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script; + + workspaceDir = runLocal "our_workspace" '' + mkdir $out + cp ${WORKSPACE} $out/WORKSPACE + cp ${fileIn} $out/input.txt + cp ${fileBUILD} $out/BUILD + ''; + + testBazel = runLocal "bazel-test-bash-tools" '' + export HOME=$(mktemp -d) + cp -r ${workspaceDir} wd && chmod +w wd && cd wd + ${bazel}/bin/bazel build :tool_usage + cp bazel-genfiles/output.txt $out + echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK" + ''; + +in testBazel diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index be85213b8c20..15ef2abd0946 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils -, which, python, perl, gnused, gnugrep, findutils +, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils # Apple dependencies , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -23,7 +23,35 @@ let for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done ''; - defaultShellPath = lib.makeBinPath [ bash coreutils findutils gnugrep gnused which unzip ]; + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ]; in stdenv.mkDerivation rec { @@ -38,9 +66,14 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; - # additional tests that check bazel’s functionality + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. passthru.tests = { - python_bin_path = callPackage ./python-bin-path-test.nix {}; + pythonBinPath = callPackage ./python-bin-path-test.nix {}; + bashTools = callPackage ./bash-tools-test.nix {}; }; name = "bazel-${version}"; @@ -125,9 +158,11 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute python's stub shebang to plain python path. (see TODO add pr URL) + # See also `postFixup` where python is added to $out/nix-support substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ --replace "/usr/bin/env python" "${python}/bin/python" \ --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \ + # substituteInPlace is rather slow, so prefilter the files with grep grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! @@ -262,7 +297,10 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + echo "${python}" >> $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index 478ba8eaa712..54ae154a6207 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -42,8 +42,10 @@ let testBazel = runLocal "bazel-test-builtin-rules" '' export HOME=$(mktemp -d) - cp -r ${workspaceDir}/* . - ${bazel}/bin/bazel --output_base=/tmp/bazel-tests/wd\ + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + ${bazel}/bin/bazel \ test \ --test_output=errors \ --host_javabase='@local_jdk//:jdk' \ diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index d5559768d6fc..8c1b55fc5c9a 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin, writeText -, git, ninja, python }: +, git, ninja, python2 }: let rev = "96ff462cddf35f98e25fd5d098fc27bc81eab94a"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace "NSArray<NSString*>*" "NSArray*" ''; - nativeBuildInputs = [ ninja python git ]; + nativeBuildInputs = [ ninja python2 git ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 17938ab47b37..96e044073259 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -44,6 +44,13 @@ python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) + ] ++ lib.optionals stdenv.isDarwin [ + # We use custom Clang, which makes Meson think *not Apple*, while still + # relying on system linker. When it detects standard Clang, Meson will + # pass it `-Wl,-O1` flag but optimizations are not recognized by + # Mac linker. + # https://github.com/mesonbuild/meson/issues/4784 + ./fix-objc-linking.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch new file mode 100644 index 000000000000..60a205828f5d --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch @@ -0,0 +1,20 @@ +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -795,7 +795,7 @@ + compiler_type = self.get_gnu_compiler_type(defines) + version = self.get_gnu_version_from_defines(defines) + return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM'): ++ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) +@@ -822,7 +822,7 @@ + compiler_type = self.get_gnu_compiler_type(defines) + version = self.get_gnu_version_from_defines(defines) + return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM'): ++ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index d9bfb40b46e7..2d0bf244370f 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -7,8 +7,8 @@ in { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; - scons_3_0_3 = mkScons { - version = "3.0.3"; - sha256 = "1wwn0534d83ryfxjihvqk2ncj8wh5210pi3jxjd2cvjqa9mpkv6q"; + scons_latest = mkScons { + version = "3.0.4"; + sha256 = "06lv3pmdz5l23rx3kqsi1k712bdl36i942hgbjh209s94mpb7f72"; }; } diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index e350e475f73c..1feaf2c79a9d 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform +{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform , CoreServices, Security }: rustPlatform.buildRustPackage rec { name = "cargo-web-${version}"; - version = "0.6.15"; + version = "0.6.23"; src = fetchFromGitHub { owner = "koute"; repo = "cargo-web"; rev = version; - sha256 = "076g7cd9v53vi8xvd4kfsiyzw1m2hhd1lwlwcv2dx2s5vlw4dxzh"; + sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr"; }; - cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si"; + cargoSha256 = "16wzgyn3k0yn70y0ciliyx1sjgppmkv9b4bn9p4x0qi6l0ah7fdp"; - nativeBuildInputs = [ openssl pkgconfig ]; + nativeBuildInputs = [ openssl perl pkgconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 02ea20d8bad7..8722d49eb32e 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -19,7 +19,7 @@ in checkInputs = with python3Packages; [ vcrpy mock hiro ]; buildInputs = [ libffi openssl ]; propagatedBuildInputs = with python3Packages; [ - argparse ordereddict requests six suds-jurko termcolor keyring + ordereddict requests six suds-jurko termcolor keyring jira keyrings-alt ]; diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index d051e1d57592..d7cea5c3d4ed 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2018.03.13"; + version = "2019.01.06"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1"; + sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p"; }; buildInputs = [ xz ]; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index afe026359e53..8b9bf453c468 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,11 @@ -{stdenv, fetchurl, lua, curl, makeWrapper, which, unzip}: +{stdenv, fetchurl +, curl, makeWrapper, which, unzip +, lua +# for 'luarocks pack' +, zip +# some packages need to be compiled with cmake +, cmake +}: let s = # Generated upstream information rec { @@ -36,17 +43,33 @@ stdenv.mkDerivation { for i in "$out"/bin/*; do test -L "$i" || { wrapProgram "$i" \ - --prefix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ - --prefix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ + --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" } done ''; - meta = { + + propagatedBuildInputs = [ zip unzip cmake ]; + + # unpack hook for src.rock and rockspec files + setupHook = ./setup-hook.sh; + + # cmake is just to compile packages with "cmake" buildType, not luarocks itself + dontUseCmakeConfigure = true; + + shellHook = '' + export PATH="src/bin:''${PATH:-}" + export LUA_PATH="src/?.lua;''${LUA_PATH:-}" + ''; + + meta = with stdenv.lib; { inherit (s) version; description = ''A package manager for Lua''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.mit ; + maintainers = with maintainers; [raskin teto]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix new file mode 100644 index 000000000000..3728caf193ae --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -0,0 +1,9 @@ +{ luarocks, fetchFromGitHub }: +luarocks.overrideAttrs(old: { + src = fetchFromGitHub { + owner = "teto"; + repo = "luarocks"; + rev = "d669e8e118e6ca8bff05f32dbc9e5589e6ac45d2"; + sha256 = "1lay3905a5sx2a4y68lbys0913qs210hcj9kn2lbqinw86c1vyc3"; + }; +}) diff --git a/pkgs/development/tools/misc/luarocks/setup-hook.sh b/pkgs/development/tools/misc/luarocks/setup-hook.sh new file mode 100644 index 000000000000..593ee8bbe83e --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/setup-hook.sh @@ -0,0 +1,20 @@ +unpackCmdHooks+=(_trySourceRock) +unpackCmdHooks+=(_tryRockSpec) + +_tryRockSpec() { + if ! [[ "$curSrc" =~ \.rockspec$ ]]; then return 1; fi +} + +_trySourceRock() { + + if ! [[ "$curSrc" =~ \.src.rock$ ]]; then return 1; fi + + export PATH=${unzip}/bin:$PATH + + # luarocks expects a clean <name>.rock.spec name to be the package name + # so we have to strip the hash + renamed="$(stripHash $curSrc)" + cp "$curSrc" "$renamed" + luarocks unpack --force "$renamed" +} + diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 8e89dd3fadd2..b3e9e71ebc05 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -11,8 +11,8 @@ let sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; cppo = fetchurl { - url = "https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz"; - sha256 = "0jdb7d21lfa3ck4k59mrqs5pljzq5rb504jq57nnrc6klljm42j7"; + url = "https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz"; + sha256 = "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf"; }; cudf = fetchurl { url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; @@ -22,42 +22,46 @@ let url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; + dune-local = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz"; + sha256 = "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9"; + }; extlib = fetchurl { url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; - jbuilder = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/1.0+beta20/jbuilder-1.0.beta20.tbz"; - sha256 = "07hl9as5llffgd6hbw41rs76i1ibgn3n9r0dba5h0mdlkapcwb10"; - }; mccs = fetchurl { - url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+8.tar.gz"; - sha256 = "0xavfvxfrcf3lmry8ymma1yzy0hw3ijbx94c9zq3pzlwnylrapa4"; + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+9.tar.gz"; + sha256 = "0gf86c65jdxxcwd96kcmrqxrmnnzc0570gb9ad6c57rl3fyy8yhv"; }; ocamlgraph = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; }; opam-file-format = fetchurl { - url = "https://github.com/ocaml/opam-file-format/archive/2.0.0-rc2.tar.gz"; - sha256 = "1mgk08msp7hxn0hs0m82vky3yv6hcq4pw5402b3vhx4c49431jsb"; + url = "https://github.com/ocaml/opam-file-format/archive/2.0.0.tar.gz"; + sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m"; }; re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.7.3/re-1.7.3.tbz"; - sha256 = "0nv933qfl8y9i19cqvhsalwzif3dkm28vg478rpnr4hgfqjlfryr"; + url = "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz"; + sha256 = "0qkv42a4hpqpxvqa4kdkkcbhbg7aym9kv4mqgm3m51vxbd0pq0lv"; }; result = fetchurl { url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; }; + seq = fetchurl { + url = "https://github.com/c-cube/seq/archive/0.1.tar.gz"; + sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; + }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.0.zip"; - sha256 = "0m4ilsldrfkkn0vlvl119bk76j2pwvqvdi8mpg957z4kqflfbfp8"; + url = "https://github.com/ocaml/opam/archive/2.0.2.zip"; + sha256 = "0hxf0ns3si03rl7dxix7i30limbl50ffyvdyk9bqqms4ir8dcza6"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "2.0.0"; + version = "2.0.2"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -68,16 +72,17 @@ in stdenv.mkDerivation rec { ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz + ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz - ln -sv ${srcs.jbuilder} $sourceRoot/src_ext/jbuilder.tbz ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz + ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz ''; - patches = [ ./opam-pull-3487.patch ./opam-shebangs.patch ./opam-mccs-darwin.patch ]; + patches = [ ./opam-shebangs.patch ]; preConfigure = '' substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" @@ -98,7 +103,8 @@ in stdenv.mkDerivation rec { mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store $out/bin/opam-installer --prefix=$installer opam-installer.install ''; @@ -111,4 +117,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.0 -p opam-pull-3487.patch,opam-shebangs.patch,opam-mccs-darwin.patch +# Generated by: ./opam.nix.pl -v 2.0.2 -p opam-shebangs.patch diff --git a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch deleted file mode 100644 index 501242c40a01..000000000000 --- a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src_ext/patches/mccs/build-on-darwin.patch b/src_ext/patches/mccs/build-on-darwin.patch -new file mode 100644 -index 00000000..157e2094 ---- /dev/null -+++ b/src_ext/patches/mccs/build-on-darwin.patch -@@ -0,0 +1,12 @@ -+diff --git a/src/context_flags.ml b/src/context_flags.ml -+index 7470030..6e07370 100644 -+--- a/src/context_flags.ml -++++ b/src/context_flags.ml -+@@ -24,6 +24,7 @@ let ifc c x = if c then x else [] -+ -+ let cxxflags = -+ let flags = -++ (ifc (Config.system = "macosx") ["-x"; "c++"]) @ -+ (ifc (Sys.win32 && Config.ccomp_type = "msvc") ["/EHsc"]) @ -+ (ifc useGLPK ["-DUSEGLPK"]) @ -+ (ifc useCOIN ["-DUSECOIN"]) @ diff --git a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch deleted file mode 100644 index e047c8298bc3..000000000000 --- a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh -index 6f5d7dbea..3e1a3e1b4 100755 ---- a/src/state/shellscripts/bwrap.sh -+++ b/src/state/shellscripts/bwrap.sh -@@ -1,4 +1,6 @@ --#!/bin/bash -ue -+#!/usr/bin/env bash -+ -+set -ue - - if ! command -v bwrap >/dev/null; then - echo "The 'bwrap' command was not found. Install 'bubblewrap' on your system, or" >&2 -@@ -11,7 +13,9 @@ fi - - ARGS=(--unshare-net --new-session) - ARGS=("${ARGS[@]}" --proc /proc --dev /dev) --ARGS=("${ARGS[@]}" --bind /tmp /tmp --tmpfs /run --tmpfs /var) -+ARGS=("${ARGS[@]}" --bind "${TMPDIR:-/tmp}" /tmp) -+ARGS=("${ARGS[@]}" --setenv TMPDIR /tmp --setenv TMP /tmp --setenv TEMPDIR /tmp --setenv TEMP /tmp) -+ARGS=("${ARGS[@]}" --tmpfs /run --tmpfs /var) - - add_mounts() { - case "$1" in diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 1862add452d6..537997eb8a45 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -113,7 +113,8 @@ print <<'EOF'; mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 25ec443be42b..5e54a8b37058 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.3.1"; + version = "1.3.3"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0aif4ilzfv8qyqk4mn525r38xw2w34ryknzd2vrg6mcjcarm8myq"; + sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 8b42ed124360..1ade2b353868 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, jre, gawk }: +{ stdenv, fetchurl, makeWrapper, jre_headless, gawk }: stdenv.mkDerivation rec { name = "nexus-${version}"; - version = "3.14.0-04"; + version = "3.15.0-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "1ql707672xhybmfajjmli9w0wcf1f26skq8i5kqirms2364wg35f"; + sha256 = "0akizdljcjl1nh25k01wxvp5wp4i2jphsj0hh5rqbd0fk1pjivkv"; }; sourceRoot = name; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rm -fv $out/bin/nexus.bat wrapProgram $out/bin/nexus \ - --set JAVA_HOME ${jre} \ + --set JAVA_HOME ${jre_headless} \ --set ALTERNATIVE_NAME "nexus" \ --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}" diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5ad9a7c58efb..90d36c71caa9 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; buildInputs = [ lua ]; - patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ]; preConfigure = '' substituteInPlace config_posix.py \ diff --git a/pkgs/development/tools/toluapp/headers.patch b/pkgs/development/tools/toluapp/headers.patch new file mode 100644 index 000000000000..59a47bb989a9 --- /dev/null +++ b/pkgs/development/tools/toluapp/headers.patch @@ -0,0 +1,15 @@ +diff --git a/include/tolua++.h b/include/tolua++.h +index ed53449..f57d56d 100644 +--- a/include/tolua++.h ++++ b/include/tolua++.h +@@ -43,8 +43,8 @@ extern "C" { + + typedef int lua_Object; + +-#include "lua.h" +-#include "lauxlib.h" ++#include <lua.h> ++#include <lauxlib.h> + + struct tolua_Error + { diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 7d5569b4376b..cb10a252d121 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "uftrace-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "1jb4dp6crvfzxzmi5iflc7p13b7p2v1djyj6smbf9ns4wr515y6b"; + sha256 = "0s7yfnf7kcqlfw3zzv4y8akkd12f8di69c4sranympnl7z5srfam"; }; postUnpack = '' diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 04810f792e34..cb46b8d9ba27 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -2,9 +2,9 @@ let - major = "2018"; - minor = "11"; - patch = "16"; + major = "2019"; + minor = "01"; + patch = "19"; version = "${major}.${minor}.${patch}"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "0848rxa9xwbz573b5r5qc5bpcf6pipis4gkkszfgkj1zmdhyib6b"; + sha256 = "082v27w3n4jdm4a5884607rwsw4s00cnpqmh7bsdg9q3l29jpygn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index 3b0aca6df285..edc73eeac922 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -1,34 +1,32 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext, - gcc_multi, libressl }: + gcc_multi, libressl, gnome3, steam }: let - version = "0.7.2"; - steamBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ steam ])}/steam"; - zenityBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ gnome3.zenity ])}/zenity"; + version = "0.7.3"; in stdenv.mkDerivation rec { name = "linux-steam-integration-${version}"; - nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; - buildInputs = [ gtk libressl ]; - src = fetchFromGitHub { - owner = "solus-project"; + owner = "clearlinux"; repo = "linux-steam-integration"; rev = "v${version}"; - sha256 = "0yn71fvjqi63dxk04jsndb26pgipl0nla10sy94bi7q95pk3sdf6"; + sha256 = "0brv3swx8h170ycxksb31sf5jvj85csfpx7gjlf6yrfz7jw2j6vp"; fetchSubmodules = true; }; + nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; + buildInputs = [ gtk libressl ]; + # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c # Patch path to lsi-steam in lsi-steam.desktop # Patch path to zenity in lsi.c postPatch = '' - sed -i -e "s|/usr/|$out/|g" src/shim/shim.c - sed -i -e "s|/usr/|$out/|g" data/lsi-steam.desktop - sed -i -e "s|zenity|${zenityBinPath}|g" src/lsi/lsi.c - sed -i -e "s|Name=Linux Steam Integration|Name=Linux Steam Integration Settings|" data/lsi-settings.desktop.in - + substituteInPlace src/shim/shim.c --replace "/usr/" $out + substituteInPlace data/lsi-steam.desktop --replace "/usr/" $out + substituteInPlace src/lsi/lsi.c --replace zenity ${gnome3.zenity}/bin/zenity + substituteInPlace data/lsi-settings.desktop.in \ + --replace "Name=Linux Steam Integration" "Name=Linux Steam Integration Settings" ''; configurePhase = '' @@ -36,7 +34,7 @@ in stdenv.mkDerivation rec { meson build \ -Dwith-shim=co-exist \ -Dwith-frontend=true \ - -Dwith-steam-binary=${steamBinPath} \ + -Dwith-steam-binary=${steam}/bin/steam \ -Dwith-new-libcxx-abi=true \ -Dwith-libressl-mode=native \ --prefix / \ @@ -74,7 +72,7 @@ in stdenv.mkDerivation rec { various workarounds to get games working, and fixes long standing bugs in both games and the client ''; - homepage = https://github.com/solus-project/linux-steam-integration; + homepage = https://github.com/clearlinux/linux-steam-integration; license = licenses.lgpl21; maintainers = [ maintainers.etu ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index fd662fe9743e..a03599b50895 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -20,13 +20,13 @@ let categories = "Game;"; }; in stdenv.mkDerivation rec { - name = "OpenJK-2017-08-11"; + name = "OpenJK-2018-09-17"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "a0828f06e0181c62e110f2f78d30acb5036b4113"; - sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m"; + rev = "cc4094c8fa989663eb8087b33d97bb2749295b9f"; + sha256 = "1fzijlf4izpm6n92cwv951c10nb18pg5zhc5xx7pw3i4sy8h9nyk"; }; dontAddPrefix = true; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index aba92ac087e8..a3ad0e637e5a 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,73 +1,59 @@ { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }: +, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }: let - mygui_ = mygui.override { - inherit stdenv; - }; - terra_ = symlinkJoin { - name = "terra"; - paths = [ terra.static terra.dev ]; - }; + version = "0.7.0-alpha"; TES3MP = fetchFromGitHub { owner = "TES3MP"; repo = "openmw-tes3mp"; - rev = "f61664ff6d521e10db761a550c97c6edce8f0046"; - sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb"; + rev = version; + sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q"; }; CallFF = fetchFromGitHub { owner = "Koncord"; repo = "CallFF"; - rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9"; - sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57"; + rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b"; + sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm"; }; - RakNet = fetchFromGitHub { + CrabNet = fetchFromGitHub { owner = "TES3MP"; - repo = "RakNet"; - rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba"; - sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q"; + repo = "CrabNet"; + rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567"; + sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0"; }; - PluginExamples = fetchFromGitHub { + CoreScripts = fetchFromGitHub { owner = "TES3MP"; - repo = "PluginExamples"; - rev = "213e72f315a8029eec71437e56de0eaeba5b3670"; - sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b"; + repo = "CoreScripts"; + rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea"; + sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg"; }; fakegit = writeScriptBin "git" '' #! ${stdenv.shell} - if [ "$*" = "rev-list --tags --max-count=1" ] || - [ "$*" = "rev-parse HEAD" ]; then - echo "${TES3MP.rev}" - else - exit 1 - fi ''; in stdenv.mkDerivation rec { - version = "0.6.0"; + inherit version; name = "tes3mp-${version}"; src = fetchFromGitHub { owner = "GrimKriegor"; repo = "TES3MP-deploy"; - rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45"; - sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6"; + rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325"; + sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn"; }; dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake makeWrapper fakegit ]; - buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt - ncurses libGL ]; + buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt + ncurses libGL luajit ]; buildPhase = '' mkdir dependencies keepers cp --no-preserve=mode -r ${TES3MP} code - mkdir code/.git cp --no-preserve=mode -r ${CallFF} dependencies/callff - cp --no-preserve=mode -r ${RakNet} dependencies/raknet - cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples - ln -s ${terra_} dependencies/terra + cp --no-preserve=mode -r ${CrabNet} dependencies/raknet + cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts substituteInPlace tes3mp-deploy.sh \ --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out" @@ -86,6 +72,8 @@ in stdenv.mkDerivation rec { mv build/resources $prefix/build mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw mv keepers $prefix + mv build/tes3mp-credits.md $prefix/build + mv -f $prefix/keepers/version $prefix/build/resources for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh do @@ -100,8 +88,8 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tes3mp-server \ --run "mkdir -p ~/.config/openmw" \ --run "cd ~/.config/openmw" \ - --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \ - --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg" + --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \ + --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" ''; meta = with stdenv.lib; { diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 6f69c6469503..4cd073869dc8 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "vkquake-${version}"; - majorVersion = "1.00"; + majorVersion = "1.01"; version = "${majorVersion}.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "1h7ac5bh6h6cpvkx5bvp17lv5m24hmdykcdppkivblikpxhml70s"; + sha256 = "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39"; }; sourceRoot = "source/Quake"; diff --git a/pkgs/games/spring/fix-certs.patch b/pkgs/games/spring/fix-certs.patch new file mode 100644 index 000000000000..b31160a05cc6 --- /dev/null +++ b/pkgs/games/spring/fix-certs.patch @@ -0,0 +1,11 @@ +--- a/src/downloader/lib/src/Downloader/CurlWrapper.cpp ++++ b/src/downloader/lib/src/Downloader/CurlWrapper.cpp +@@ -108,7 +108,6 @@ + if (res != CURLE_OK) { + LOG_WARN("Error setting CURLOPT_CAPATH: %d", res); + } +- return; + } + + const std::string cafile = GetCAFilePath(); + diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index fa7fad3ecd92..8df4450d13d1 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure ]; - patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed + patches = [ ./revert_58b423e.patch ./fix-certs.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed enableParallelBuilding = true; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 58b04821e129..846054765e00 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,30 +1,42 @@ -{ fetchurl, stdenv, cmake, pkgconfig, makeWrapper, python, alsaLib -, libX11, libGLU, SDL, lua5, zlib, freetype, wavpack +{ fetchFromGitHub, fetchurl, stdenv, bam, pkgconfig, makeWrapper, python, alsaLib +, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack }: stdenv.mkDerivation rec { - name = "teeworlds-0.6.5"; + name = "teeworlds-0.7.2"; - src = fetchurl { - url = "https://downloads.teeworlds.com/teeworlds-0.6.5-src.tar.gz"; - sha256 = "07llxjc47d1gd9jqj3vf08cmw26ha6189mwcix1khwa3frfbilqb"; + src = fetchFromGitHub { + owner = "teeworlds"; + repo = "teeworlds"; + rev = "0.7.2"; + sha256 = "15l988qcsqgb6rjais0qd5sd2rjanm2708jmzvkariqzz0d6pb93"; }; postPatch = '' - # we always want to use system libs instead of these - rm -r other/{freetype,sdl}/{include,mac,windows} - # set compiled-in DATA_DIR so resources can be found substituteInPlace src/engine/shared/storage.cpp \ --replace '#define DATA_DIR "data"' \ '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ bam pkgconfig ]; + + configurePhase = '' + bam config + ''; + + buildPhase = '' + bam conf=release + ''; + installPhase = '' + mkdir -p $out/bin $out/share/teeworlds + cp build/x86_64/release/teeworlds{,_srv} $out/bin + cp -r build/x86_64/release/data $out/share/teeworlds + ''; buildInputs = [ - python alsaLib libX11 libGLU SDL lua5 zlib freetype wavpack + python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack ]; postInstall = '' @@ -45,6 +57,6 @@ stdenv.mkDerivation rec { homepage = https://teeworlds.com/; license = "BSD-style, see `license.txt'"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + platforms = ["x86_64-linux" "i686-linux"]; }; } diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 6bfaa2a2f274..73e2a96d0cde 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPackages }: +{ stdenv, fetchFromGitHub, pkgsCross, buildPackages }: let buildArmTrustedFirmware = { filesToInstall @@ -6,7 +6,7 @@ let , platform , extraMakeFlags ? [] , extraMeta ? {} - , version ? "1.5" + , version ? "2.0" , ... } @ args: stdenv.mkDerivation (rec { @@ -17,11 +17,14 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "refs/tags/v${version}"; - sha256 = "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"; + sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; + # For Cortex-M0 firmware in RK3399 + nativeBuildInputs = [ pkgsCross.arm-embedded.stdenv.cc ]; + makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" "PLAT=${platform}" @@ -83,4 +86,11 @@ in rec { extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; }; + + armTrustedFirmwareRK3399 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "rk3399"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; + }; } diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 643977d829db..3892c37a1d5b 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -88,6 +88,46 @@ let plugins = { meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; }; }; + s80 = stdenv.mkDerivation rec { + pname = "iscan-gt-s80-bundle"; + version = "1.0.1"; + esciPluginVersion = "0.2.1-1"; + esdipPluginVersion = "1.0.0-5"; + + buildInputs = [ patchelf ]; + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "14j11znx5ga2ykpyg6kjg7lbrddyr9pwxrsa82dmdishd1j7zji9"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-${esciPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio iscan-plugin-esdip-${esdipPluginVersion}.ltdl7.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mkdir $out/share/esci + ''; + preFixup = '' + rpath=${gcc.cc.lib}/lib/ + patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s80.so + patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s50.so + patchelf --set-rpath $rpath $out/lib/iscan/esdip + patchelf --set-rpath $rpath $out/lib/iscan/libesdtr.so.0 + patchelf --set-rpath $rpath $out/lib/iscan/libesdtr2.so.0 + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" + $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" + $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" + $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" + ''; + hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; + }; + + meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; + }; }; in diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix new file mode 100644 index 000000000000..e877629bcb03 --- /dev/null +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1 }: + +stdenv.mkDerivation { + pname = "rkdeveloptool"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "rockchip-linux"; + repo = "rkdeveloptool"; + rev = "081d237ad5bf8f03170c9d60bd94ceefa0352aaf"; + sha256 = "05hh7j3xgb8l1k1v2lis3nvlc0gp87ihzg6jci7m5lkkm5qgv3ji"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libusb1 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/rockchip-linux/rkdeveloptool; + description = "A tool from Rockchip to communicate with Rockusb devices"; + license = licenses.gpl2; + maintainers = [ maintainers.lopsided98 ]; + }; +} diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index ac77df8d7cd2..084cb33a7a21 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig +{ stdenv, lib, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, swig , armTrustedFirmwareAllwinner , buildPackages }: let - buildUBoot = { filesToInstall + buildUBoot = { version ? "2018.09" + , filesToInstall , installDir ? "$out" , defconfig + , extraConfig ? "" , extraPatches ? [] , extraMakeFlags ? [] , extraMeta ? {} , ... } @ args: stdenv.mkDerivation (rec { - name = "uboot-${defconfig}-${version}"; - version = "2018.09"; + pname = "uboot-${defconfig}"; + inherit version; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; @@ -23,10 +25,6 @@ let patches = [ (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-07.patch; - sha256 = "096zqrlr8m9lxjma0iv7y6x78qswfs3q1w2irjkbmcvniz1azbs8"; - }) - (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8"; }) @@ -36,7 +34,15 @@ let patchShebangs tools ''; - nativeBuildInputs = [ bc bison dtc flex openssl python2 swig ]; + nativeBuildInputs = [ + bc + bison + dtc + flex + openssl + (buildPackages.python2.withPackages (p: [ p.libfdt ])) + swig + ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; hardeningDisable = [ "all" ]; @@ -46,11 +52,15 @@ let "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ extraMakeFlags; + passAsFile = [ "extraConfig" ]; + configurePhase = '' runHook preConfigure make ${defconfig} + cat $extraConfigPath >> .config + runHook postConfigure ''; @@ -58,7 +68,7 @@ let runHook preInstall mkdir -p ${installDir} - cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + cp ${lib.concatStringsSep " " filesToInstall} ${installDir} runHook postInstall ''; @@ -68,7 +78,7 @@ let dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://www.denx.de/wiki/U-Boot/; description = "Boot loader for embedded systems"; license = licenses.gpl2; @@ -84,7 +94,7 @@ in rec { installDir = "$out/bin"; hardeningDisable = []; dontStrip = false; - extraMeta.platforms = stdenv.lib.platforms.linux; + extraMeta.platforms = lib.platforms.linux; extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ]; postConfigure = '' sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config @@ -238,10 +248,8 @@ in rec { extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-with-nand-spl.imx"]; buildFlags = "u-boot-with-nand-spl.imx"; - postConfigure = '' - cat >> .config << EOF + extraConfig = '' CONFIG_CMD_SETEXPR=y - EOF ''; # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx # sf probe; sf update $loadaddr 0 80000 diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix index 623c6015534a..af8d044387a4 100644 --- a/pkgs/misc/uboot/rock64.nix +++ b/pkgs/misc/uboot/rock64.nix @@ -2,25 +2,24 @@ rkbin = fetchFromGitHub { owner = "ayufan-rock64"; repo = "rkbin"; - rev = "d8b90685b3d93c358936babdd854f1018bc6d35e"; - sha256 = "0wrh3xa968sdp0j9n692jnv3071ymab719zc56vllba0aaabiaxr"; + rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; + sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; }; in buildUBoot rec { - name = "uboot-${defconfig}-${version}"; - version = "2018.01"; + version = "2017.09"; src = fetchFromGitHub { owner = "ayufan-rock64"; repo = "linux-u-boot"; - rev = "19e31fac0dee3c4f6b2ea4371e4321f79db0f495"; - sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg"; + rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; + sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; }; extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ]; - # So close to being blob free... But U-Boot TPL causes the kernel to hang + # Close to being blob free, but the U-Boot TPL causes the kernel to hang after a few minutes postBuild = '' - ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.06.bin idbloader.img + ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.13.bin idbloader.img cat spl/u-boot-spl.bin >> idbloader.img dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc ''; diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix new file mode 100644 index 000000000000..d8802e6d5f55 --- /dev/null +++ b/pkgs/misc/uboot/rockpro64.nix @@ -0,0 +1,36 @@ +{ lib, buildUBoot, fetchFromGitHub }: let + rkbin = fetchFromGitHub { + owner = "ayufan-rock64"; + repo = "rkbin"; + rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; + sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; + }; +in buildUBoot rec { + version = "2017.09"; + + src = fetchFromGitHub { + owner = "ayufan-rock64"; + repo = "linux-u-boot"; + rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; + sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; + }; + + # Upstream ATF hangs in SPL + extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.17.elf" "u-boot.itb" "all" ]; + + postBuild = '' + ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.13.bin idbloader.img + cat spl/u-boot-spl.bin >> idbloader.img + dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc + ''; + + defconfig = "rockpro64-rk3399_defconfig"; + filesToInstall = [ "spl/u-boot-spl.bin" "u-boot.itb" "idbloader.img"]; + + extraMeta = with lib; { + maintainers = [ maintainers.lopsided98 ]; + platforms = ["aarch64-linux"]; + # Because of the TPL and ATF (BL31) blobs + license = licenses.unfreeRedistributableFirmware; + }; +} diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index fe60ad21c752..b797f49df9e0 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -37,7 +37,7 @@ rec { # build help tags if [ -d "$target/doc" ]; then echo "Building help tags" - if ! ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $target/doc" +quit!; then + if ! ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -V1 -c "helptags $target/doc" +quit!; then echo "Failed to build help tags!" exit 1 fi diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c18ce070c1c0..56157d077d0c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -158,6 +158,17 @@ let }; }; + bufexplorer = buildVimPluginFrom2Nix { + pname = "bufexplorer"; + version = "2018-12-10"; + src = fetchFromGitHub { + owner = "jlanzarotta"; + repo = "bufexplorer"; + rev = "be69e397e502803db7d7f0a0e0491282ab2197a5"; + sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd"; + }; + }; + calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; version = "2018-11-02"; @@ -1607,6 +1618,16 @@ let }; }; + sved = buildVimPluginFrom2Nix { + name = "sved-2019-01-25"; + src = fetchFromGitHub { + owner = "peder2tm"; + repo = "sved"; + rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; + sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; + }; + }; + swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; version = "2018-09-12"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index febdd94e1198..c9785b66fbb4 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -4,6 +4,7 @@ , xkb-switch, fzf, skim , python3, boost, icu, ncurses , ycmd, rake +, gobject-introspection, glib, wrapGAppsHook , substituteAll , languagetool , Cocoa, CoreFoundation, CoreServices @@ -19,18 +20,21 @@ self: super: { vim2nix = buildVimPluginFrom2Nix { - name = "vim2nix"; + pname = "vim2nix"; + version = "1.0"; src = ./vim2nix; dependencies = with super; [ vim-addon-manager ]; }; fzfWrapper = buildVimPluginFrom2Nix { - name = fzf.name; + pname = "fzf"; + version = fzf.version; src = fzf.src; }; skim = buildVimPluginFrom2Nix { - name = skim.name; + pname = "skim"; + version = skim.version; src = skim.vim; }; @@ -54,7 +58,8 @@ self: super: { ''; }; in buildVimPluginFrom2Nix { - name = "LanguageClient-neovim-2018-09-07"; + pname = "LanguageClient-neovim"; + version = "2018-09-07"; src = LanguageClient-neovim-src; propogatedBuildInputs = [ LanguageClient-neovim-bin ]; @@ -67,7 +72,8 @@ self: super: { # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { - name = "vim-docbk-snippets-2017-11-02"; + pname = "vim-docbk-snippets"; + version = "2017-11-02"; src = fetchgit { url = "https://github.com/jhradilek/vim-snippets"; rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; @@ -167,6 +173,35 @@ self: super: { dependencies = with super; [ ultisnips ]; }); + sved = let + # we put the script in its own derivation to benefit the magic of wrapGAppsHook + svedbackend = stdenv.mkDerivation { + name = "svedbackend-${super.sved.name}"; + inherit (super.sved) src; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ + gobject-introspection + glib + (python3.withPackages(ps: with ps; [ pygobject3 pynvim dbus-python ])) + ]; + preferLocalBuild = true; + installPhase = '' + install -Dt $out/bin ftplugin/evinceSync.py + ''; + }; + in + super.sved.overrideAttrs(old: { + preferLocalBuild = true; + postPatch = '' + rm ftplugin/evinceSync.py + ln -s ${svedbackend}/bin/evinceSync.py ftplugin/evinceSync.py + ''; + meta = { + description = "synctex support between vim/neovim and evince"; + }; + }); + + vimshell-vim = super.vimshell-vim.overrideAttrs(old: { dependencies = with super; [ vimproc-vim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 262a32778878..101ac0a21121 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -110,6 +110,7 @@ jgdavey/tslime.vim jhradilek/vim-docbk jiangmiao/auto-pairs jistr/vim-nerdtree-tabs +jlanzarotta/bufexplorer jnurmine/zenburn jonbri/vim-colorstepper joonty/vim-xdebug @@ -221,6 +222,7 @@ osyo-manga/vim-watchdogs pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim +peder2tm/sved peterhoeg/vim-qml phanviet/vim-monokai-pro plasticboy/vim-markdown diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index cf5eeaec3e33..2a758aa98433 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -486,4 +486,12 @@ rec { }); vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; }; + + # system remote plugin manifest should be generated, deoplete should be usable + # without the user having to do `UpdateRemotePlugins`. To test, launch neovim + # and do `:call deoplete#enable()`. It will print an error if the remote + # plugin is not registered. + test_nvim_with_remote_plugin = neovim.override { + configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + }; } diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index c53b7e50b9f3..d7f7c64fc2d6 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -548,6 +548,12 @@ let NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; + column = netBSDDerivation { + path = "usr.bin/column"; + version = "8.0"; + sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; + }; + }; in nbPackages diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 369529d71675..62785f34fe84 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -45,6 +45,7 @@ in lib.makeExtensible (self: { xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; - xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; + xcode_9_4 = requireXcode "9.4" "132l92c702lm8yrc62w4b8n2iap1qzqvklqzi39x9832ajysn6vw"; + xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v"; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "8.2")}"; }) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index c9cf12912670..2ced9c6094ec 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx"; + sha256 = "1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 5f4efe943ca9..73bea1c7da69 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -106,5 +106,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; + priority = 10; }; } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 654e565140d1..9519e72e91cb 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -51,7 +51,7 @@ assert luaImlib2Support -> luaSupport && imlib2Support assert luaCairoSupport -> luaSupport && toluapp != null && cairo != null; assert luaCairoSupport || luaImlib2Support - -> lua.luaversion == "5.1"; + -> lua.luaversion == "5.3"; assert wirelessSupport -> wirelesstools != null; assert nvidiaSupport -> libXNVCtrl != null; @@ -66,13 +66,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "00ghxzg78mp7w2y9cxhsdmkab2n7vfg76p6zihiglb2x3h2gjm5x"; + sha256 = "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"; }; postPatch = '' @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { # Drop examples, since they contain non-ASCII characters that break docbook2x :( sed -i 's/ Example: .*$//' doc/config_settings.xml - substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)" + substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)" ''; NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1466b51b2616..ddd1e9828d51 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -688,6 +688,14 @@ let HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { + # Enable memory hotplug support + # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot + ACPI_HOTPLUG_MEMORY = yes; + MEMORY_HOTPLUG = yes; + MEMORY_HOTREMOVE = yes; + MIGRATION = yes; + SPARSEMEM = yes; + # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. NR_CPUS = "384"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 3f6479c572b8..30878d1b96c6 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -65,6 +65,7 @@ let netfilterRPFilter = true; grsecurity = false; xen_dom0 = false; + ia32Emulation = true; } // features) kernelPatches; intermediateNixConfig = import ./common-config.nix { diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index efcf6c0d5bf2..883c9868b05b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.94"; + version = "4.14.95"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1w933hd1ffd62znsha5z9qgjpsnh03f3r01f4b69l814n25m2a77"; + sha256 = "1r2qrgwp3dfsrqshp765jjfh3frdhn9pkwml7h7544m3zkijjryf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index fc51cb2bf698..08cee977da5d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.16"; + version = "4.19.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + sha256 = "0nfb5ipr6ay7ymvjm0nbk7mwxsvyyv43nl1lcg6jq99dgahr4bc7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix index f7636ae02d56..6d267d098920 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.3"; + version = "4.20.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ibz33xgmvyvaql2jbl9kagv13nar9pjar7pawxyga04hh9bvhdr"; + sha256 = "1l9lzpn5hp4y8xvc039xjc6ah8h4fb9db6337a0s754gzgmdfzyx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 09f6ccc1325a..0ce7536f8602 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.151"; + version = "4.9.152"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0p22xla6yq1zwhypfh1zkp0n12wjz5m806lmv8scwkbyh2amb5hm"; + sha256 = "0fcff0v488x0rylscl061dj8ylriwxg6hlg8mzppxx4sq22ppr4h"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 01e7e315393e..c3f3d3ce0cbc 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.0-rc2"; - modDirVersion = "5.0.0-rc2"; + version = "5.0-rc3"; + modDirVersion = "5.0.0-rc3"; extraMeta.branch = "5.0"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1204b15gkdb7hxaqx1x7kxn48p1gl8gl51vgifxn2saikzlzls7c"; + sha256 = "03xw2zfa6cxy5vdfrfh536mh3gcm8hvj69ggpqixm8d1gqg0nln6"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 787dcce9a38a..d76a1452455f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,14 +22,10 @@ rec { beta = stable; stable_415 = generic { - version = "415.25"; - sha256_64bit = "0jck3sjhkdf9j40fqa6hpm2m9i11bfka9diaxmk2apni4f4mpdk4"; - settingsSha256 = "0x5a9dhr29g67rbgl1w973fzgjfg1lyn3dpq7fpc7chfp91vxzrp"; - persistencedSha256 = "0z1d7hrz7zvi4x3ir1c3gcfpsj57wdr5pylvmjhdi3x47cb1w34f"; - - patches = lib.optional (kernel.meta.branch == "4.20") [ - ./atomic64_t.patch - ]; + version = "415.27"; + sha256_64bit = "12ylf1h1wpgkd0g7r30c33hhhialn315k5sbxyzks0rm42k7cay8"; + settingsSha256 = "0m8hfxb6fhanqlkkk4ayn1blgdsvnn0ipxdl19ifdl200ln6j053"; + persistencedSha256 = "0i6ik6xv6rnwcd6vg5xrxcd9g7nzca3vkiy2srbv0simw86nwgdz"; }; # Last one supporting x86 diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 703d13126a3f..2ff0e4cd38fd 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -14,12 +14,13 @@ systemd.overrideAttrs (p: { # As ninja install is not used here, the rpath needs to be manually fixed. # Otherwise the resulting binary doesn't properly link against systemd-shared.so postFixup = '' - sharedLib=libsystemd-shared-${p.version}.so for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + (patchelf --print-needed $prog | grep 'libsystemd-shared-.*\.so' > /dev/null) && ( patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog ) || true done + # test it's OK + "$out"/lib/systemd/systemd-cryptsetup ''; installPhase = '' diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index e92cd6175af1..b13c2cbee85d 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.9"; + version = "3.7.10"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "138hz19g4x562vm7aqdsxc98ay0aidn37isafzhkig8cjlygg2iq"; + sha256 = "03g9912640xxwwm078idrxqg8jwn3xc45lkyq5ixjqs0vhc7aw4v"; }; buildInputs = diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index c2b63184bec7..659f8d5dea43 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.7.5"; + version = "2.7.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "7d70d6d8f708285517d1d7c4ff2e5ddfd119cd2962c7a8d3f50a4c695209a086"; + sha256 = "a1cb1877f04f7c2549c977c2658cfafd07c7e0e924f8e8aa8d4ae4b707f697a2"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c28160b04a42..66dfc4069ed6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -21,7 +21,6 @@ "alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; - "alarm_control_panel.homekit_controller" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -118,7 +117,7 @@ "binary_sensor.iss" = ps: with ps; [ ]; "binary_sensor.isy994" = ps: with ps; [ ]; "binary_sensor.knx" = ps: with ps; [ ]; - "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors ]; + "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "binary_sensor.linode" = ps: with ps; [ linode-api ]; "binary_sensor.lupusec" = ps: with ps; [ ]; "binary_sensor.maxcube" = ps: with ps; [ ]; @@ -222,7 +221,7 @@ "camera.xeoma" = ps: with ps; [ ]; "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ]; "camera.yi" = ps: with ps; [ ha-ffmpeg ]; - "camera.zoneminder" = ps: with ps; [ ]; + "camera.zoneminder" = ps: with ps; [ zm-py ]; "canary" = ps: with ps; [ ]; "cast" = ps: with ps; [ PyChromecast ]; "climate" = ps: with ps; [ ]; @@ -420,10 +419,6 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue.hue_api" = ps: with ps; [ ]; "emulated_hue.upnp" = ps: with ps; [ ]; - "emulated_roku" = ps: with ps; [ ]; - "emulated_roku.binding" = ps: with ps; [ ]; - "emulated_roku.config_flow" = ps: with ps; [ ]; - "emulated_roku.const" = ps: with ps; [ ]; "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; "esphome" = ps: with ps; [ ]; @@ -517,7 +512,6 @@ "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; - "hue.light" = ps: with ps; [ aiohue ]; "hydrawise" = ps: with ps; [ ]; "idteck_prox" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -556,7 +550,7 @@ "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; - "konnected" = ps: with ps; [ aiohttp-cors ]; + "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "lametric" = ps: with ps; [ ]; "lcn" = ps: with ps; [ ]; "lifx" = ps: with ps; [ ]; @@ -584,6 +578,7 @@ "light.homematic" = ps: with ps; [ pyhomematic ]; "light.homematicip_cloud" = ps: with ps; [ ]; "light.homeworks" = ps: with ps; [ ]; + "light.hue" = ps: with ps; [ aiohue ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; "light.ihc" = ps: with ps; [ defusedxml ]; @@ -718,6 +713,7 @@ "media_player.mpchc" = ps: with ps; [ ]; "media_player.mpd" = ps: with ps; [ mpd2 ]; "media_player.nad" = ps: with ps; [ ]; + "media_player.nadtcp" = ps: with ps; [ ]; "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ]; "media_player.openhome" = ps: with ps; [ ]; "media_player.panasonic_bluray" = ps: with ps; [ ]; @@ -1226,7 +1222,7 @@ "sensor.zestimate" = ps: with ps; [ xmltodict ]; "sensor.zha" = ps: with ps; [ ]; "sensor.zigbee" = ps: with ps; [ ]; - "sensor.zoneminder" = ps: with ps; [ ]; + "sensor.zoneminder" = ps: with ps; [ zm-py ]; "sensor.zwave" = ps: with ps; [ ]; "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; @@ -1294,7 +1290,7 @@ "switch.isy994" = ps: with ps; [ ]; "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; - "switch.konnected" = ps: with ps; [ aiohttp-cors ]; + "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "switch.lightwave" = ps: with ps; [ ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; @@ -1362,7 +1358,7 @@ "switch.xiaomi_miio" = ps: with ps; [ construct ]; "switch.zha" = ps: with ps; [ ]; "switch.zigbee" = ps: with ps; [ ]; - "switch.zoneminder" = ps: with ps; [ ]; + "switch.zoneminder" = ps: with ps; [ zm-py ]; "switch.zwave" = ps: with ps; [ ]; "system_log" = ps: with ps; [ aiohttp-cors ]; "tado" = ps: with ps; [ ]; @@ -1462,7 +1458,6 @@ "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zha" = ps: with ps; [ ]; - "zha.api" = ps: with ps; [ ]; "zha.config_flow" = ps: with ps; [ ]; "zha.const" = ps: with ps; [ ]; "zha.entities" = ps: with ps; [ ]; @@ -1473,7 +1468,7 @@ "zone.config_flow" = ps: with ps; [ ]; "zone.const" = ps: with ps; [ ]; "zone.zone" = ps: with ps; [ ]; - "zoneminder" = ps: with ps; [ ]; + "zoneminder" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave.config_flow" = ps: with ps; [ ]; "zwave.const" = ps: with ps; [ ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index c35a8f22320b..064cbb407beb 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.566"; + version = "0.10.660"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "10rfddwbvf6qrf217vrvn3rjbmlffl86c0v63yi32fv8vchc12b0"; + sha256 = "04dh3cdd0k0xjrhifshniwnkhwddis6y7z6az1fg9gzm3ivwyyi7"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 5000e4c396c3..9e24ffe6313a 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,21 +1,18 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -}: +{ stdenv , buildGoPackage , fetchFromGitHub }: buildGoPackage rec { pname = "miniflux"; - version = "2.0.13"; + version = "2.0.14"; goPackagePath = "miniflux.app"; src = fetchFromGitHub { owner = "miniflux"; repo = "miniflux"; - rev = "refs/tags/${version}"; - sha256 = "16c9jszrz3153kr0xyj7na09hpqvnjsrmsbic7qkp5a9aa839b9s"; + rev = version; + sha256 = "1wd52zk7i07k0b5rlwqd4qszq42shdb4ss8871jqlf9zlbq85a0v"; }; - + goDeps = ./deps.nix; doCheck = true; @@ -32,7 +29,7 @@ buildGoPackage rec { description = "Minimalist and opinionated feed reader"; homepage = https://miniflux.app/; license = licenses.asl20; - maintainers = with maintainers; [ benpye ]; + maintainers = with maintainers; [ rvolosatovs benpye ]; }; } diff --git a/pkgs/servers/miniflux/deps.nix b/pkgs/servers/miniflux/deps.nix index 4ef30bec3b8d..2c87fb942e4c 100644 --- a/pkgs/servers/miniflux/deps.nix +++ b/pkgs/servers/miniflux/deps.nix @@ -6,8 +6,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "v1.4.1"; - sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; + rev = "v1.5.0"; + sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; }; } @@ -22,6 +22,36 @@ } { + goPackagePath = "github.com/cheekybits/is"; + fetch = { + type = "git"; + url = "https://github.com/cheekybits/is"; + rev = "68e9c0620927"; + sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"; + }; + } + + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + + { goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; @@ -62,22 +92,52 @@ } { - goPackagePath = "github.com/tdewolff/minify"; + goPackagePath = "github.com/matryer/try"; + fetch = { + type = "git"; + url = "https://github.com/matryer/try"; + rev = "9ac251b645a2"; + sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9"; + }; + } + + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + + { + goPackagePath = "github.com/tdewolff/minify/v2"; fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "v2.3.5"; - sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m"; + rev = "v2.3.8"; + sha256 = "1f179di7nlmybmgmm7sadqi60zwfizlbbj0ws5k8gcswkwwr7zzx"; }; } { - goPackagePath = "github.com/tdewolff/parse"; + goPackagePath = "github.com/tdewolff/parse/v2"; fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "v2.3.3"; - sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94"; + rev = "v2.3.5"; + sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz"; + }; + } + + { + goPackagePath = "github.com/tdewolff/test"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/test"; + rev = "v1.0.0"; + sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } @@ -86,8 +146,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "614d502a4dac"; - sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; }; } @@ -96,8 +156,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "8a410e7b638d"; - sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny"; + rev = "610586996380"; + sha256 = "1sqwmvf70rq1j65lv5jzyiy7gd53l37dxlnjf2xj6p2i4fcwkk4z"; }; } @@ -106,8 +166,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + rev = "d668ce993890"; + sha256 = "17m8d02fazil0dwvk33vpwvsb91asgbmmpqy05751csrfqhhdqna"; }; } @@ -126,8 +186,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "4910a1d54f87"; - sha256 = "0p2pp6mny34gjcvylx3ddzdaxn7hv008hppsr11w1bvyzj7s27by"; + rev = "ad97f365e150"; + sha256 = "0s0wymq1zv5ffrnngnzk9qk83sscq3wazm17rrqb96brs2r047mk"; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 99380fbae9cb..c6c52bcbda58 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.7.0"; + version = "1.9.2"; goPackagePath = "github.com/influxdata/telegraf"; excludedPackages = "test"; + subPackages = [ "cmd/telegraf" ]; + src = fetchFromGitHub { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1jinvncbn1srfmclhys6khvaczawy243vgmj2gsgm9szrnrf7klv"; + sha256 = "1416nx7mxa0b3bmnkarksicgvw6wja6s8xrf22yzak38qmmrpz2m"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix deleted file mode 100644 index 57a5ffd21b00..000000000000 --- a/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix +++ /dev/null @@ -1,894 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "code.cloudfoundry.org/clock"; - fetch = { - type = "git"; - url = "https://github.com/cloudfoundry/clock"; - rev = "e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71"; - sha256 = "1mwckqpg9qi5macfbx7lpc5frbd0dz8bzq78dl570j9j2aqp9hkf"; - }; - } - { - goPackagePath = "collectd.org"; - fetch = { - type = "git"; - url = "https://github.com/collectd/go-collectd"; - rev = "2ce144541b8903101fb8f1483cc0497a68798122"; - sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; - }; - } - { - goPackagePath = "github.com/Microsoft/ApplicationInsights-Go"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/ApplicationInsights-Go"; - rev = "3612f58550c1de70f1a110c78c830e55f29aa65d"; - sha256 = "11znwr0787171yv80r5jmdks6i0i3rwa03ir1kapm0ycwr8h4nvy"; - }; - } - { - goPackagePath = "github.com/Shopify/sarama"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "3b1b38866a79f06deddf0487d5c27ba0697ccd65"; - sha256 = "02qwlqd1kdgwlv39fimpbzjhgw8shzkkad82kfwdy8lppscb20br"; - }; - } - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "61e43dc76f7ee59a82bdf3d71033dc12bea4c77d"; - sha256 = "08kr7zvdgwv8vsakjzq1bla6cc6dlxlg1brlga69y69xw7cz5l9p"; - }; - } - { - goPackagePath = "github.com/aerospike/aerospike-client-go"; - fetch = { - type = "git"; - url = "https://github.com/aerospike/aerospike-client-go"; - rev = "95e1ad7791bdbca44707fedbb29be42024900d9c"; - sha256 = "034pirm1dzdblwadcd829qk2jqkr8hg9gpfph8ax7z0b3h2ah8xf"; - }; - } - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985"; - sha256 = "10lmpz5vf2ysw8gnl0z8ravl4vvy48nbh8xpk2zzgifb6yn3x192"; - }; - } - { - goPackagePath = "github.com/apache/thrift"; - fetch = { - type = "git"; - url = "https://github.com/apache/thrift"; - rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07"; - sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "783273d703149aaeb9897cf58613d5af48861c25"; - sha256 = "1ci4kh35zdh5gyjhci5gi324iqcq04nb3qh89h9w6spwqb91w0ln"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; - sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/bsm/sarama-cluster"; - fetch = { - type = "git"; - url = "https://github.com/bsm/sarama-cluster"; - rev = "abf039439f66c1ce78017f560b490612552f6472"; - sha256 = "16013ac7jv72mdiv84vhk4av1vb5q8xq3fhv253fz2a17h9ld78q"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3"; - sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc"; - }; - } - { - goPackagePath = "github.com/couchbase/go-couchbase"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/go-couchbase"; - rev = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28"; - sha256 = "0h59zzxcz3i8nd4ln89fi946ii8kscnqam67h3mxvjwvpnmcax9k"; - }; - } - { - goPackagePath = "github.com/couchbase/gomemcached"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/gomemcached"; - rev = "4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29"; - sha256 = "12h0wsimwmr0f398538g9ngasik4gisnac9vpn0ldy8hqdpa334d"; - }; - } - { - goPackagePath = "github.com/couchbase/goutils"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/goutils"; - rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6"; - sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; - sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "749f6afb4572201e3c37325d0ffedb6f32be8950"; - sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "f5ec1e2936dcbe7b5001c2b817188b095c700c27"; - sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; - sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/eapache/go-resiliency"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-resiliency"; - rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; - sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; - }; - } - { - goPackagePath = "github.com/eapache/go-xerial-snappy"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-xerial-snappy"; - rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c"; - sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4"; - }; - } - { - goPackagePath = "github.com/eapache/queue"; - fetch = { - type = "git"; - url = "https://github.com/eapache/queue"; - rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; - sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; - }; - } - { - goPackagePath = "github.com/eclipse/paho.mqtt.golang"; - fetch = { - type = "git"; - url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "aff15770515e3c57fc6109da73d42b0d46f7f483"; - sha256 = "1blfvrp1d5jqxxqdw7xd0ns1qiml45k0nch9jwpi0ddg7hckii2d"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "9144852efba7c4daf409943ee90767da62d55438"; - sha256 = "08jvki9id1wdca0j6kqb4fmipwvgmakg9yfavnbpyn3vsbx9vpbp"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "73b70592cdaa9e6abdfcfbf97b4a90d80728c836"; - sha256 = "0b6xwajnk65bdq98czv137gvypwnznkjnm2ksnxm87nyj2vyddm9"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; - sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a"; - sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; - sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "7db9049039a047d955fe8c19b83c8ff5abd765c7"; - sha256 = "09l3sc9z2fqnj5b040q320gwb4gqig6lnysxcayhwckrdp5bm8hs"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "53c1911da2b537f792e7cafcb446b05ffe33b996"; - sha256 = "10cvljpjgvkq1zqj82hr46dnddfcpmm18wabbv4pkxjrmvb9xkf7"; - }; - } - { - goPackagePath = "github.com/hailocab/go-hostpool"; - fetch = { - type = "git"; - url = "https://github.com/hailocab/go-hostpool"; - rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; - sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"; - sha256 = "0xm3gl8i7pgsbsc2397bwh9hp2dwnk4cmw5y05acqn3zpyp84sbv"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"; - sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; - sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; - sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "984a73625de3138f44deb38d00878fab39eb6447"; - sha256 = "1sk9sw7q9knp7yi4r5kcr8cgyi9jzvgb0kzbwa38p8h3w394izkk"; - }; - } - { - goPackagePath = "github.com/influxdata/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/go-syslog"; - rev = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"; - sha256 = "0zw8wswr3afb48mi510mql58gz818dp0mzq3vllqqhrz3x8w580r"; - }; - } - { - goPackagePath = "github.com/influxdata/tail"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/tail"; - rev = "c43482518d410361b6c383d7aebce33d0471d7bc"; - sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b"; - }; - } - { - goPackagePath = "github.com/influxdata/toml"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/toml"; - rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b"; - sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3"; - }; - } - { - goPackagePath = "github.com/influxdata/wlog"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/wlog"; - rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; - sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; - }; - } - { - goPackagePath = "github.com/jackc/pgx"; - fetch = { - type = "git"; - url = "https://github.com/jackc/pgx"; - rev = "63f58fd32edb5684b9e9f4cfaac847c6b42b3917"; - sha256 = "1n9cbdwzpagnrisxwq0frqdnkmyfg2qlxsr890527d32633hp0h2"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d"; - sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; - sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; - }; - } - { - goPackagePath = "github.com/kardianos/service"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/service"; - rev = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893"; - sha256 = "1cgqg6zbwwsn6lz2ms094q4w37x84vd9ixs50wsh3037q4sfhyll"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142"; - sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "99f84ae56e75126dd77e5de4fae2ea034a468ca1"; - sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; - }; - } - { - goPackagePath = "github.com/multiplay/go-ts3"; - fetch = { - type = "git"; - url = "https://github.com/multiplay/go-ts3"; - rev = "07477f49b8dfa3ada231afc7b7b17617d42afe8e"; - sha256 = "1z2cfqhm6g48vzscargw6vl9idfppdcm3wq1xfwy73l1s77q4n9n"; - }; - } - { - goPackagePath = "github.com/naoina/go-stringutil"; - fetch = { - type = "git"; - url = "https://github.com/naoina/go-stringutil"; - rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; - sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; - }; - } - { - goPackagePath = "github.com/nats-io/gnatsd"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/gnatsd"; - rev = "393bbb7c031433e68707c8810fda0bfcfbe6ab9b"; - sha256 = "1hnn4p24gm90siixdvj97csrxnr78svxmypglcjska474adhhnzz"; - }; - } - { - goPackagePath = "github.com/nats-io/go-nats"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/go-nats"; - rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898"; - sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "289cccf02c178dc782430d534e3c1f5b72af807f"; - sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4"; - }; - } - { - goPackagePath = "github.com/nsqio/go-nsq"; - fetch = { - type = "git"; - url = "https://github.com/nsqio/go-nsq"; - rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"; - sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "c9281466c8b2f606084ac71339773efd177436e7"; - sha256 = "1djdazssy27xn91pjhx3dgb0f11bnlzzbwkh7f8zwnpz011anasi"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; - sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; - }; - } - { - goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; - fetch = { - type = "git"; - url = "https://github.com/openzipkin/zipkin-go-opentracing"; - rev = "1cafbdfde94fbf2b373534764e0863aa3bd0bf7b"; - sha256 = "1vpl3mpvhljzpnll67ip3m9aazy3dvgi57n7w3pn8kg3b7kr4rwj"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df"; - sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj"; - }; - } - { - goPackagePath = "github.com/pierrec/xxHash"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/xxHash"; - rev = "5a004441f897722c627870a981d02b29924215fa"; - sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c317fb74746eac4fc65fe3909195f4cf67c5562a"; - sha256 = "1c3rqwkajkmhk5wh6agc5jnjbbfvpfxbiy8cprpw89khch428khp"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "dd2f054febf4a6c00f2343686efb775948a8bff4"; - sha256 = "0rhbgj51r105ax544mfg6wp4rsqpzn3776z1k82b21xwb3b51zr1"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1878d9fbb537119d24b21ca07effd591627cd160"; - sha256 = "0jqn5l31szmc0dv5invp5mdhndx3fcsda7zpy49zd7k95c1y20m7"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c"; - sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj"; - }; - } - { - goPackagePath = "github.com/samuel/go-zookeeper"; - fetch = { - type = "git"; - url = "https://github.com/samuel/go-zookeeper"; - rev = "1d7be4effb13d2d908342d349d71a284a7542693"; - sha256 = "002s19109spms9ndfwykf3ryy3fnk7b56frxlqmmv37mlqgrd5v9"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; - sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3"; - sha256 = "0rzfwhvwh58w1isr6jxq222xih578dsscdsfbh6bg1bxgbkz0x1m"; - }; - } - { - goPackagePath = "github.com/soniah/gosnmp"; - fetch = { - type = "git"; - url = "https://github.com/soniah/gosnmp"; - rev = "f15472a4cd6f6ea7929e4c7d9f163c49f059924f"; - sha256 = "1blhxq9sayfg7zih5rj0dg2qj9h10m6sbri57hxya9iz3jfgcx11"; - }; - } - { - goPackagePath = "github.com/streadway/amqp"; - fetch = { - type = "git"; - url = "https://github.com/streadway/amqp"; - rev = "63795daa9a446c920826655f26ba31c81c860fd6"; - sha256 = "1v6xwskb4dqyy2q1r7k12f9wky7v6cfb4f1mx94sr3qvx37zg2yj"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "facf9a85c22f48d2f52f2380e4efce1768749a89"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; - sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; - }; - } - { - goPackagePath = "github.com/tidwall/gjson"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/gjson"; - rev = "0623bd8fbdbf97cc62b98d15108832851a658e59"; - sha256 = "0g6rhilcmqpdvjdds7ykzhrlsjx234chf73l8sjah0rsd03207k0"; - }; - } - { - goPackagePath = "github.com/tidwall/match"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/match"; - rev = "173748da739a410c5b0b813b956f89ff94730b4c"; - sha256 = "0a4hp323gnjam3nfxfljq7d24m7rgk5vxbscjmi3ik3ph78r5avg"; - }; - } - { - goPackagePath = "github.com/vjeantet/grok"; - fetch = { - type = "git"; - url = "https://github.com/vjeantet/grok"; - rev = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe"; - sha256 = "09p70h5inycwrw3dmn6c7lhx4m11fvw7449wzq1k5w2jcws7amd5"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kafka"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kafka"; - rev = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee"; - sha256 = "0x86gnkpsr6gsc6mk2312ay8yqrzscvvdra2knhvwgaws6rzvj2l"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kazoo-go"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kazoo-go"; - rev = "968957352185472eacb69215fa3dbfcfdbac1096"; - sha256 = "07q37lmlc3vx620bklp93r368r73kgm2s9x7qcgcxk9701lqq7dc"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "66c871e454fcf10251c61bf8eff02d0978cae75a"; - sha256 = "1srcibhsl29cy8qih132iqigl4ss303nfmglrgc583nj9kz9sf8j"; - }; - } - { - goPackagePath = "github.com/zensqlmonitor/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/zensqlmonitor/go-mssqldb"; - rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363"; - sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "dc137beb6cce2043eb6b5f223ab8bf51c32459f4"; - sha256 = "0kia3rd0g0vkb9pf102kbg1agr1xq27bi2shkpxy9l718yvy9jwd"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "a337091b0525af65de94df2eb7e98bd9962dcbe2"; - sha256 = "11a6a3ah1f3jj6530q4hjqf79bv9fy62s5wgxpp28g8b3vlxxsyp"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "739734461d1c916b6c72a63d7efda2b27edb369f"; - sha256 = "0b0yh28ap1q0b8myg0gw4p9d6m71ry0d3n4hiycvd8sgk327379a"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "506f9d5c962f284575e88337e7d9296d27e729d3"; - sha256 = "1ghx5vv4zlkjzlx2gslvcwpvxjggpl6wz5n49nqxiz777psx218s"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "11c7f9e547da6db876260ce49ea7536985904c9b"; - sha256 = "1qdda2b31qhli71xc2rscm7hf219gr2mals3n24kgv9svmw1cxkq"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "de2209a968d48e8970546c8a710189f7461370f7"; - sha256 = "0jby05p1qhm4gik0ya9n14vhf9x83mxysd917k53x59jrwrkh9gr"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "4e86f4367175e39f69d9358a5f17b4dda270378d"; - sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"; - }; - } - { - goPackagePath = "gopkg.in/fatih/pool.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/fatih/pool.v2"; - rev = "6e328e67893eb46323ad06f0e92cb9536babbabc"; - sha256 = "1p1sljfpbg2bp4qv7ghvz1wcmmsbcfclsninxa97kr0v7na7jw5p"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb"; - sha256 = "0912q06l6mrrrc7jj7hlrsbglklxyp67z1vnmvmcm04ck6hx8dlm"; - }; - } - { - goPackagePath = "gopkg.in/gorethink/gorethink.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/gorethink/gorethink.v3"; - rev = "7ab832f7b65573104a555d84a27992ae9ea1f659"; - sha256 = "1pri52ac45aqf5a2kmsd4mfhyfbkd1snkjbvanrdgipikysxi696"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ldap.v2"; - rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; - sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; - sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v5"; - fetch = { - type = "git"; - url = "https://gopkg.in/olivere/elastic.v5"; - rev = "3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26"; - sha256 = "1zkwprs68q1r7pigb59n8zbw8610z9r1pi6r0s28kzdgiv30sfdm"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6"; - sha256 = "1ddwvmsfijgl09pbqrcx73fy5kh8y3888dd29lh7i50ds5a088cx"; - }; - } -] diff --git a/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix b/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix new file mode 100644 index 000000000000..f65115a8622e --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix @@ -0,0 +1,1146 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "c728a003b238b26cef9ab6753a5dc424b331c3ad"; + sha256 = "010bxkx0gkbsn7xi6632xp2nq0577zx7imw16irxv8hzvq49q38i"; + }; + } + { + goPackagePath = "code.cloudfoundry.org/clock"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/clock"; + rev = "02e53af36e6c978af692887ed449b74026d76fec"; + sha256 = "0bpfxf21flb9lqwjr95skaw58zajb54s62g3h68lcxxcp4gfdba4"; + }; + } + { + goPackagePath = "collectd.org"; + fetch = { + type = "git"; + url = "https://github.com/collectd/go-collectd"; + rev = "2ce144541b8903101fb8f1483cc0497a68798122"; + sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver"; + rev = "2b93072101d466aa4120b3c23c2e1b08af01541c"; + sha256 = "0qhxpfmzn5jsh1qrq7w2zkg87xvalqam2ciq65qfq38mfkssda3v"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "1f7cd6cfe0adea687ad44a512dfe76140f804318"; + sha256 = "0sh7c8lgjjwpaw6rka0j5wlg9dsz0swz4h7lc2xnzfv2wvgzliv8"; + }; + } + { + goPackagePath = "github.com/Microsoft/ApplicationInsights-Go"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/ApplicationInsights-Go"; + rev = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"; + sha256 = "0lr7cq5ghphm94y13injczg2fzxljql0xlw5sj61hfba50lvmbs5"; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "a6d595ae73cf27a1b8fc32930668708f45ce1c85"; + sha256 = "1plx73f1hm6czcdwcw2sl9xqyq3dnsrd92m2y2yzhcy5y369dijj"; + }; + } + { + goPackagePath = "github.com/Shopify/sarama"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/sarama"; + rev = "a6144ae922fd99dd0ea5046c8137acfb7fab0914"; + sha256 = "13x23kmjg7milzc34a0acll5b6q6yh9jfh7qjh6zran1inp9lnba"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; + sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; + }; + } + { + goPackagePath = "github.com/aerospike/aerospike-client-go"; + fetch = { + type = "git"; + url = "https://github.com/aerospike/aerospike-client-go"; + rev = "1dc8cf203d24cd454e71ce40ab4cd0bf3112df90"; + sha256 = "0mzw88fdggmrab6yavq702lq2x2k785gy6ag5ryl5n5k6bqnlp13"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + { + goPackagePath = "github.com/apache/thrift"; + fetch = { + type = "git"; + url = "https://github.com/apache/thrift"; + rev = "f2867c24984aa53edec54a138c03db934221bdea"; + sha256 = "1k72gjsxa2xzwn5rikc5pm5n025bkr3hl2nhv0x65i7rp3bda2qb"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "bf8067ceb6e7f51e150c218972dccfeeed892b85"; + sha256 = "0kxw0blzxr5vc5c0il7hh178vv86ib7af3j9pnzsfzhm3byw0ccx"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/bsm/sarama-cluster"; + fetch = { + type = "git"; + url = "https://github.com/bsm/sarama-cluster"; + rev = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"; + sha256 = "000rklq9jx66bbbdklsvm7l9fd9r8d6k3qxx18xfjklblk1v9y19"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "2ea60e5f094469f9e65adb9cd103795b73ae743e"; + sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; + }; + } + { + goPackagePath = "github.com/couchbase/go-couchbase"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/go-couchbase"; + rev = "16db1f1fe037412f12738fa4d8448c549c4edd77"; + sha256 = "0ivlzin23a3s9jj8764mr9rwy3hw5bd97gfv0zc2vzdd3psi28g2"; + }; + } + { + goPackagePath = "github.com/couchbase/gomemcached"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/gomemcached"; + rev = "0da75df145308b9a4e6704d762ca9d9b77752efc"; + sha256 = "0sscy1n3vpi1gcpzw2vh8a7mnvg8nlxc37b6580k6h7xbpx1mq9z"; + }; + } + { + goPackagePath = "github.com/couchbase/goutils"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/goutils"; + rev = "e865a1461c8ac0032bd37e2d4dab3289faea3873"; + sha256 = "1306m4gbm555akni5rwwgafkq7j1ps8k40lfrvib5jv5pgdygrcd"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "1eb28afdf9b6e56cf673badd47545f844fe81103"; + sha256 = "1p2x2k7azbp4cwdjn1nv0zzaf0fvxaysnjrlyxskqlm2cq5vp5ab"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/dimchansky/utfbom"; + fetch = { + type = "git"; + url = "https://github.com/dimchansky/utfbom"; + rev = "6c6132ff69f0f6c088739067407b5d32c52e1d0f"; + sha256 = "01qbwnglc019303qbr9x85d36svd0hrwd1qrld77fgw45ml6b2ib"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"; + sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "ed7b6428c133e7c59404251a09b7d6b02fa83cc2"; + sha256 = "0da19ndf29jsy3w0ddw05hnw8m5hmrr9p70g02z3icjydl387mrs"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; + sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + { + goPackagePath = "github.com/docker/libnetwork"; + fetch = { + type = "git"; + url = "https://github.com/docker/libnetwork"; + rev = "d7b61745d16675c9f548b19f06fda80d422a74f0"; + sha256 = "1mbdhgy14gl8263cynfv210ag6gm6i6yply9i022ib3y2s5ffxhd"; + }; + } + { + goPackagePath = "github.com/eapache/go-resiliency"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-resiliency"; + rev = "ea41b0fad31007accc7f806884dcdf3da98b79ce"; + sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx"; + }; + } + { + goPackagePath = "github.com/eapache/go-xerial-snappy"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-xerial-snappy"; + rev = "040cc1a32f578808623071247fdbd5cc43f37f5f"; + sha256 = "1y3gs5ghf8wza8k85hcy98g9ygcfb6k3zhiac4nnyrahwckf5whz"; + }; + } + { + goPackagePath = "github.com/eapache/queue"; + fetch = { + type = "git"; + url = "https://github.com/eapache/queue"; + rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; + sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; + }; + } + { + goPackagePath = "github.com/eclipse/paho.mqtt.golang"; + fetch = { + type = "git"; + url = "https://github.com/eclipse/paho.mqtt.golang"; + rev = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"; + sha256 = "1vgxdv4f1g92jx5sj143y3jc18sfd712il4rbaxckgrpsb7gq8ch"; + }; + } + { + goPackagePath = "github.com/ericchiang/k8s"; + fetch = { + type = "git"; + url = "https://github.com/ericchiang/k8s"; + rev = "d1bbc0cffaf9849ddcae7b9efffae33e2dd52e9a"; + sha256 = "1qv7iggr4144g4bwqm1slnnjp6zs2dh370p4yfqp7id3sxk3893n"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "358ee7663966325963d4e8b2e1fbd570c5195153"; + sha256 = "1zr51xaka7px1pmfndm12fvg6a3cr24kg77j28zczbfcc6h339gy"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; + sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; + }; + } + { + goPackagePath = "github.com/go-redis/redis"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "83fb42932f6145ce52df09860384a4653d2d332a"; + sha256 = "0zrp1w6jcbnhk8q5fl3fm11j9s4yjyks2hzi6kwjhngzhjmdn1sh"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "d523deb1b23d913de5bdada721a6071e71283618"; + sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; + sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "317e0006254c44a0ac427cc52a0e083ff0b9622f"; + sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + { + goPackagePath = "github.com/hailocab/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/hailocab/go-hostpool"; + rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; + sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; + }; + } + { + goPackagePath = "github.com/hashicorp/consul"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/consul"; + rev = "39f93f011e591c842acc8053a7f5972aa6e592fd"; + sha256 = "0l255iy37m3mycdzk90629n8zjvi3cj8k2sxpm40h2r539ayawly"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; + sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; + }; + } + { + goPackagePath = "github.com/hashicorp/serf"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/serf"; + rev = "d6574a5bb1226678d7010325fb6c985db20ee458"; + sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; + }; + } + { + goPackagePath = "github.com/influxdata/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/go-syslog"; + rev = "0cd00a9f0a5e5607d5ef9a294c260f77a74e3b5a"; + sha256 = "0a8xbghb1s59viiqs8s8vd4ydqrf7z7nh020si4aqwmsm9gchkzz"; + }; + } + { + goPackagePath = "github.com/influxdata/tail"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/tail"; + rev = "c43482518d410361b6c383d7aebce33d0471d7bc"; + sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b"; + }; + } + { + goPackagePath = "github.com/influxdata/toml"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/toml"; + rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b"; + sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3"; + }; + } + { + goPackagePath = "github.com/influxdata/wlog"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/wlog"; + rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; + sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; + }; + } + { + goPackagePath = "github.com/jackc/pgx"; + fetch = { + type = "git"; + url = "https://github.com/jackc/pgx"; + rev = "89f1e6ac7276b61d885db5e5aed6fcbedd1c7e31"; + sha256 = "0qln29f443m9sw6yf0xy8m45wag9jg87hbwiplb511d5783l7jwk"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/kardianos/service"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/service"; + rev = "615a14ed75099c9eaac6949e22ac2341bf9d3197"; + sha256 = "149hwk6nils3vff38znc89vzdnhppp227i7ds14hy1nighjwr77c"; + }; + } + { + goPackagePath = "github.com/kballard/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/kballard/go-shellquote"; + rev = "95032a82bc518f77982ea72343cc1ade730072f0"; + sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/leodido/ragel-machinery"; + fetch = { + type = "git"; + url = "https://github.com/leodido/ragel-machinery"; + rev = "299bdde78165d4ca4bc7d064d8d6a4f39ac6de8c"; + sha256 = "0ir7gf9a9p99pgsz3b5qijhkz41xqk4axlbx0cl4w2rwv2spvyw5"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "efc7eb8984d6655c26b5c9d2e65c024e5767c37c"; + sha256 = "02wzdl0hxkqvim1ymnp7s0d0ysw0ba2mdsrkhi7k93zs2wf1wswd"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"; + sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + }; + } + { + goPackagePath = "github.com/multiplay/go-ts3"; + fetch = { + type = "git"; + url = "https://github.com/multiplay/go-ts3"; + rev = "d0d44555495c8776880a17e439399e715a4ef319"; + sha256 = "04n2rkbbgs09m47w24i9x7ah2a3mdwq378ayhsizyzjv3a0xhd9b"; + }; + } + { + goPackagePath = "github.com/naoina/go-stringutil"; + fetch = { + type = "git"; + url = "https://github.com/naoina/go-stringutil"; + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + }; + } + { + goPackagePath = "github.com/nats-io/gnatsd"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/gnatsd"; + rev = "6608e9ac3be979dcb0614b772cc86a87b71acaa3"; + sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw"; + }; + } + { + goPackagePath = "github.com/nats-io/go-nats"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/go-nats"; + rev = "062418ea1c2181f52dc0f954f6204370519a868b"; + sha256 = "1sccsfvfhwaqpkr4j3c1sa1jkjwqhkhr35br3iaw2qzlidhdypml"; + }; + } + { + goPackagePath = "github.com/nats-io/nuid"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nuid"; + rev = "289cccf02c178dc782430d534e3c1f5b72af807f"; + sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4"; + }; + } + { + goPackagePath = "github.com/nsqio/go-nsq"; + fetch = { + type = "git"; + url = "https://github.com/nsqio/go-nsq"; + rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"; + sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x"; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + }; + } + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "d60099175f88c47cd379c4738d158884749ed235"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + }; + } + { + goPackagePath = "github.com/opentracing-contrib/go-observer"; + fetch = { + type = "git"; + url = "https://github.com/opentracing-contrib/go-observer"; + rev = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c"; + sha256 = "1q7z458m2vh3bzml4x9vm2paffqn1jcgiydbisl0zg2asfniq7k3"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"; + sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + }; + } + { + goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; + fetch = { + type = "git"; + url = "https://github.com/openzipkin/zipkin-go-opentracing"; + rev = "26cf9707480e6b90e5eff22cf0bbf05319154232"; + sha256 = "1yiyqh0k72985hxwc7hh639cyyg7igkx9bg9923x4knq635m2f32"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "1958fd8fff7f115e79725b1288e0b878b3e06b00"; + sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; + sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"; + sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "e2704e165165ec55d062f5919b4b29494e9fa790"; + sha256 = "1yvvwqyfdnnjgnc3j4y0g1b897ad0wwlgn6x4dx83s20ax2lyz2q"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"; + sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "8048a2e9c5773235122027dd585cf821b2af1249"; + sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29"; + }; + } + { + goPackagePath = "github.com/shirou/w32"; + fetch = { + type = "git"; + url = "https://github.com/shirou/w32"; + rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; + sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; + sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + }; + } + { + goPackagePath = "github.com/soniah/gosnmp"; + fetch = { + type = "git"; + url = "https://github.com/soniah/gosnmp"; + rev = "96b86229e9b3ffb4b954144cdc7f98fe3ee1003f"; + sha256 = "06al7bwl4hy8mc9l6q366sbpibad4n93xhdmifz133h6q9608djf"; + }; + } + { + goPackagePath = "github.com/streadway/amqp"; + fetch = { + type = "git"; + url = "https://github.com/streadway/amqp"; + rev = "e5adc2ada8b8efff032bf61173a233d143e9318e"; + sha256 = "0qc5h9h1fcyblpiprbijrlc92fdbbnzf87648k20afgfjv8kciab"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/tidwall/gjson"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/gjson"; + rev = "f123b340873a0084cb27267eddd8ff615115fbff"; + sha256 = "1axph65dv3l0mmr2iis4r5jk2qy5ffdvh4gdxz4pv92jyincf5fj"; + }; + } + { + goPackagePath = "github.com/tidwall/match"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/match"; + rev = "1731857f09b1f38450e2c12409748407822dc6be"; + sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "b2de5d10e38ecce8607e6b438b6d174f389a004e"; + sha256 = "06kic677b2q752sgvk3lyjfh8gmq7bpfl38h8k1jsz92fav1y8gl"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "13995c7128ccc8e51e9a6bd2b551020a27180abd"; + sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; + }; + } + { + goPackagePath = "github.com/vjeantet/grok"; + fetch = { + type = "git"; + url = "https://github.com/vjeantet/grok"; + rev = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"; + sha256 = "172j83ndkmh5dhglgskpsg5csz31ah5mnprqhcra5x7dczc2f8hv"; + }; + } + { + goPackagePath = "github.com/vmware/govmomi"; + fetch = { + type = "git"; + url = "https://github.com/vmware/govmomi"; + rev = "e3a01f9611c32b2362366434bcd671516e78955d"; + sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis"; + }; + } + { + goPackagePath = "github.com/wvanbergen/kafka"; + fetch = { + type = "git"; + url = "https://github.com/wvanbergen/kafka"; + rev = "e2edea948ddfee841ea9a263b32ccca15f7d6c2f"; + sha256 = "1m712xywbx6nja2rbmrphwxbwfzkhadq139k5d19m8964695sp10"; + }; + } + { + goPackagePath = "github.com/wvanbergen/kazoo-go"; + fetch = { + type = "git"; + url = "https://github.com/wvanbergen/kazoo-go"; + rev = "f72d8611297a7cf105da904c04198ad701a60101"; + sha256 = "05yx57kbjm9v54j46zi2c21zb3d239lzv996b2qqxpkfbqadqyxm"; + }; + } + { + goPackagePath = "github.com/yuin/gopher-lua"; + fetch = { + type = "git"; + url = "https://github.com/yuin/gopher-lua"; + rev = "46796da1b0b4794e1e341883a399f12cc7574b55"; + sha256 = "0yq5ks1smqx0kgmwyl6xxd2mn9bvdi8qz7di4xs0xy5cs7f2zanw"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "79993219becaa7e29e3b60cb67f5b8e82dee11d6"; + sha256 = "0y2jzm1b5dw8x5s9fjy2aj1gd0wwkhl71wj3ysby86g60ja5lp1z"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; + sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; + sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; + sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "19ff8768a5c0b8e46ea281065664787eefc24121"; + sha256 = "0b34xb74pnwawlf911w6f0dhb95i8vi20i799asnvrmyn1lm2ldk"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "fedd2861243fd1a8152376292b921b394c7bef7e"; + sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; + sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "379148ca0225df7a432012b8df0355c2a2063ac0"; + sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; + }; + } + { + goPackagePath = "gopkg.in/fatih/pool.v2"; + fetch = { + type = "git"; + url = "https://github.com/fatih/pool"; + rev = "010e0b745d12eaf8426c95f9c3924d81dd0b668f"; + sha256 = "0dxsq7058w47d6ynbwjlfgnwcf5bf1q7m23dsgljd01sd8ilrq9x"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/gorethink/gorethink.v3"; + fetch = { + type = "git"; + url = "https://github.com/gorethink/gorethink"; + rev = "7f5bdfd858bb064d80559b2a32b86669c5de5d3b"; + sha256 = "1k4flhx93jbrcsi8k35dcdm7rcq3r8i8my4h8zhf5y9ayhcyph1m"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-ldap/ldap"; + rev = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"; + sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-mgo/mgo"; + rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } + { + goPackagePath = "gopkg.in/olivere/elastic.v5"; + fetch = { + type = "git"; + url = "https://github.com/olivere/elastic"; + rev = "52741dc2ce53629cbe1e673869040d886cba2cd5"; + sha256 = "11dgj31jxmp9fdnnwzzwg08p3iwrbnd63kyf6drvlw4qsgslk4lh"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-tomb/tomb"; + rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 04e85212f3cd..8e72605b834f 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "solr-${version}"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "1g6f58j2pzb73phj4hfri9mj7vmql72by7w3xrbq1pbnqgzxmhpa"; + sha256 = "1marwyn7r85k5j28vwkl9n942gp52kjh6s1hbm357w8gnfh2bd1c"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 1b4bad093c49..7405f716933b 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5252"; + version = "2.0.0.5301"; src = fetchurl { url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0rs6sw2yjnhv3v3qbnalz445cilppw91zxxkj93dbp5vdlinw3fp"; + sha256 = "16jjxs0gj5jdy0r4ynhck36b2balphqj24n2gfabrlgxsc6g20jv"; }; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b8c06d5ec2f5..0624998e5deb 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd, icu, pkgconfig }: - let - common = { version, sha256, psqlSchema }: + generic = + # dependencies + { stdenv, lib, fetchurl, makeWrapper + , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid + , pkgconfig, libxml2, tzdata + + # for postgreql.pkgs + , this, self, newScope, buildEnv + + # source specification + , version, sha256, psqlSchema + }: let atLeast = lib.versionAtLeast version; - - # Build with ICU by default on versions that support it icuEnabled = atLeast "10"; - in stdenv.mkDerivation (rec { + + in stdenv.mkDerivation rec { name = "postgresql-${version}"; inherit version; @@ -48,10 +56,10 @@ let ] ++ lib.optionals icuEnabled [ "--with-icu" ]; patches = - [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) - (if atLeast "9.6" then ./less-is-more-96.patch else ./less-is-more.patch) - (if atLeast "9.6" then ./hardcode-pgxs-path-96.patch else ./hardcode-pgxs-path.patch) - ./specify_pkglibdir_at_runtime.patch + [ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch) + (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch) + (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) + ./patches/specify_pkglibdir_at_runtime.patch ]; installTargets = [ "install-world" ]; @@ -97,50 +105,94 @@ let disallowedReferences = [ stdenv.cc ]; passthru = { - inherit readline psqlSchema; + inherit readline psqlSchema version; + + pkgs = let + scope = { postgresql = this; }; + newSelf = self // scope; + newSuper = { callPackage = newScope (scope // this.pkgs); }; + in import ./packages.nix newSelf newSuper; + + withPackages = postgresqlWithPackages { + inherit makeWrapper buildEnv; + postgresql = this; + } + this.pkgs; }; meta = with lib; { homepage = https://www.postgresql.org; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ ocharles thoughtpolice ]; + maintainers = with maintainers; [ ocharles thoughtpolice danbst ]; platforms = platforms.unix; knownVulnerabilities = optional (!atLeast "9.4") "PostgreSQL versions older than 9.4 are not maintained anymore!"; }; - }); + }; + + postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv { + name = "postgresql-and-plugins-${postgresql.version}"; + paths = f pkgs ++ [ + postgresql + postgresql.lib + postgresql.man # in case user installs this into environment + ]; + buildInputs = [ makeWrapper ]; + + # We include /bin to ensure the $out/bin directory is created, which is + # needed because we'll be removing the files from that directory in postBuild + # below. See #22653 + pathsToLink = ["/" "/bin"]; + + postBuild = '' + mkdir -p $out/bin + rm $out/bin/{pg_config,postgres,pg_ctl} + cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl} + wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib + ''; + }; -in { +in self: super: { - postgresql_9_4 = common { + postgresql_9_4 = super.callPackage generic { version = "9.4.20"; psqlSchema = "9.4"; sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; + this = self.postgresql_9_4; + inherit self; }; - postgresql_9_5 = common { + postgresql_9_5 = super.callPackage generic { version = "9.5.15"; psqlSchema = "9.5"; sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; + this = self.postgresql_9_5; + inherit self; }; - postgresql_9_6 = common { + postgresql_9_6 = super.callPackage generic { version = "9.6.11"; psqlSchema = "9.6"; sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; + this = self.postgresql_9_6; + inherit self; }; - postgresql_10 = common { + postgresql_10 = super.callPackage generic { version = "10.6"; psqlSchema = "10.0"; sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; + this = self.postgresql_10; + inherit self; }; - postgresql_11 = common { + postgresql_11 = super.callPackage generic { version = "11.1"; psqlSchema = "11.1"; sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; + this = self.postgresql_11; + inherit self; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index a6e2c590f385..a6e2c590f385 100644 --- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 959c2c382524..959c2c382524 100644 --- a/pkgs/servers/sql/postgresql/pg_cron/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index f91a8b1bf252..f91a8b1bf252 100644 --- a/pkgs/servers/sql/postgresql/pg_hll/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 14f71b1e2b3b..14f71b1e2b3b 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix diff --git a/pkgs/servers/sql/postgresql/pg_similarity/default.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 32945c9fa62b..32945c9fa62b 100644 --- a/pkgs/servers/sql/postgresql/pg_similarity/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index dae30aadabd0..dae30aadabd0 100644 --- a/pkgs/servers/sql/postgresql/topn/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index ab7ba8943a7b..ab7ba8943a7b 100644 --- a/pkgs/servers/sql/postgresql/pgjwt/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 8a185990725f..8a185990725f 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 6386049be395..6386049be395 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index dae3b2fd1af1..dae3b2fd1af1 100644 --- a/pkgs/servers/sql/postgresql/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index be7fc6f8c173..d78707fc65f9 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -10,79 +10,27 @@ , pkgconfig , file }: - - /* - - ### NixOS - usage: - ================== - - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ]; - - - ### important Postgis implementation details: - ============================================= - - Postgis provides a shared library implementing many operations. They are - exposed to the Postgres SQL interpreter by special SQL queries eg: - - CREATE FUNCTION [...] - AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict); - - where liblwgeom is the shared library. - Postgis < 1.5 used absolute paths, in NixOS $libdir is always used. - - Thus if you want to use postgresql dumps which were created by non NixOS - systems you have to adopt the library path. - - - ### TODO: - ========= - the bin commands to have gtk gui: - */ - - -let - version = "2.5.1"; - sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "postgis-${version}"; + version = "2.5.1"; + + outputs = [ "out" "doc" ]; src = fetchurl { - url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; - inherit sha256; + url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; + sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; }; - # don't pass these vars to the builder - removeAttrs = ["sql_comments" "sql_srcs"]; - - preInstall = '' - mkdir -p $out/bin - ''; - - # create aliases for all commands adding version information - postInstall = '' - sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - - for prog in $out/bin/*; do # */ - ln -s $prog $prog-${version} - done - - cp -r doc $out - ''; - buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; - - sql_comments = "postgis_comments.sql"; - - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - dontDisableStatic = true; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" ''; postConfigure = '' @@ -95,6 +43,20 @@ in stdenv.mkDerivation rec { "raster/scripts/python/Makefile"; ''; + preInstall = '' + mkdir -p $out/bin + ''; + + # create aliases for all commands adding version information + postInstall = '' + for prog in $out/bin/*; do # */ + ln -s $prog $prog-${version} + done + + mkdir -p $doc/share/doc/postgis + mv doc/* $doc/share/doc/postgis/ + ''; + meta = with stdenv.lib; { description = "Geographic Objects for PostgreSQL"; homepage = http://postgis.refractions.net; diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 3c53054ba7de..3c53054ba7de 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index b43a9c51be0c..b43a9c51be0c 100644 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix new file mode 100644 index 000000000000..a1ca71d2c8cf --- /dev/null +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -0,0 +1,37 @@ +self: super: { + + postgis = super.callPackage ./ext/postgis.nix { + gdal = self.gdal.override { + postgresql = self.postgresql; + poppler = self.poppler_0_61; + }; + }; + + pg_repack = super.callPackage ./ext/pg_repack.nix { }; + + pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; + + pgroonga = super.callPackage ./ext/pgroonga.nix { }; + + plv8 = super.callPackage ./ext/plv8.nix { + v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix { + python = self.python2; + }; + }; + + pgjwt = super.callPackage ./ext/pgjwt.nix { }; + + cstore_fdw = super.callPackage ./ext/cstore_fdw.nix { }; + + pg_hll = super.callPackage ./ext/pg_hll.nix { }; + + pg_cron = super.callPackage ./ext/pg_cron.nix { }; + + pg_topn = super.callPackage ./ext/pg_topn.nix { }; + + pgtap = super.callPackage ./ext/pgtap.nix { }; + + timescaledb = super.callPackage ./ext/timescaledb.nix { }; + + tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; +} \ No newline at end of file diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch index fadeea90ac4b..fadeea90ac4b 100644 --- a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch +++ b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch index 3e6fd5e838a2..3e6fd5e838a2 100644 --- a/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch +++ b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch index 6cd449769baa..6cd449769baa 100644 --- a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch +++ b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch index 355813ffe20e..355813ffe20e 100644 --- a/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch +++ b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch diff --git a/pkgs/servers/sql/postgresql/less-is-more-96.patch b/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch index f14af9dc2207..f14af9dc2207 100644 --- a/pkgs/servers/sql/postgresql/less-is-more-96.patch +++ b/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/patches/less-is-more.patch index d640d24bdaad..d640d24bdaad 100644 --- a/pkgs/servers/sql/postgresql/less-is-more.patch +++ b/pkgs/servers/sql/postgresql/patches/less-is-more.patch diff --git a/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch b/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch index fe95d2ee99f0..fe95d2ee99f0 100644 --- a/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch +++ b/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix new file mode 100644 index 000000000000..967eea25d3fb --- /dev/null +++ b/pkgs/servers/tegola/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "tegola-${version}"; + version = "0.8.1"; + rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1"; + + goPackagePath = "github.com/go-spatial/tegola"; + + src = fetchFromGitHub { + owner = "go-spatial"; + repo = "tegola"; + inherit rev; + sha256 = "1f70vsrj3i1d0kg76a8s741nps71hrglgyyrz2xm6a8b31w833pi"; + }; + + meta = with stdenv.lib; { + homepage = https://www.tegola.io/; + description = "Mapbox Vector Tile server"; + maintainers = with maintainers; [ ingenieroariel ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1436af024cd7..8339460276c4 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "18.06"; + version = "18.12.1"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "1c4h6qrckihm8v4vm52h31j5dxg7247vk374rwz41idfb25vx7dc"; + sha256 = "0mqzbjzcf0aqjzds6pxl1zy1ajn3f8c94dn47xf2i9qid0bsydgx"; }; nativeBuildInputs = [ fakegit ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1bk3yd10cq6vlgmh2qawl82m29yi5zcbsdlz17xyy76sg2ka622a"; + outputHash = "1ihg5jbvilfxacsw885ywgyf74r9hm8gcn17mrgbv6y7fcvcgcsr"; }; configureFlags = diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix index b8019fb33502..a9877540988b 100644 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ b/pkgs/shells/bash/bash-5.0-patches.nix @@ -1,4 +1,6 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") +(patch "002" "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47") ] diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 0b7b934646e2..80b0f3860514 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "elvish-${version}"; + pname = "elvish"; version = "0.12"; goPackagePath = "github.com/elves/elvish"; @@ -12,17 +12,22 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - repo = "elvish"; owner = "elves"; - rev = version; + repo = pname; + rev = "v${version}"; sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp"; }; meta = with stdenv.lib; { - description = "A friendly and expressive Unix shell"; + description = "A friendly and expressive command shell"; + longDescription = '' + Elvish is a friendly interactive shell and an expressive programming + language. It runs on Linux, BSDs, macOS and Windows. Despite its pre-1.0 + status, it is already suitable for most daily interactive use. + ''; homepage = https://elv.sh/; license = licenses.bsd2; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ vrthra AndersonTorres ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index bebf219d9b25..46d8375fb6bf 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre, fetchpatch }: let - version = "5.6.2"; + version = "5.7"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "05014rg6hkwiv1p56iij8wn2rghmwjxs5qsj3d3xigbwaikk55wq"; + sha256 = "0pgisyi82pg5mycx1k7vfx9hwzl6zq00r5s9v91lg4gqisvlvagh"; }; in @@ -15,18 +15,9 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5"; + sha256 = "04ynid3ggvy6i5c26bk52mq6x5vyrdwgryid9hggmnb1nf8b41vq"; }; - patches = [ - (fetchpatch { - name = "search-xdg-data-dirs.patch"; - url = https://github.com/zsh-users/zsh/commit/624219e0e4cbfdfb286e707bd2853f2d7b6a4a7d.patch; - sha256 = "0i0g7dc0px57vpklm1f4w20vyc92nv15y09r5clvib2kjkxjy2cf"; - excludes = [ "ChangeLog" ]; - }) - ]; - buildInputs = [ ncurses pcre ]; configureFlags = [ diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 33b83bdb558f..02386a135f11 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "amazon-ecr-credential-helper-${version}"; - version = "0.1.0"; + version = "0.3.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "0mpwm21fphg117ryxda7696s8bnvi4bbc8rvi4zp2m1rhl04j2yy"; + sha256 = "06pcwgahcbi13ca5rs6giwdw3w364lbvmzcs4ka82igvcffxjvnd"; }; meta = with lib; { diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4805a94e7e9e..e1964b2f1611 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "lego-${version}"; - version = "1.2.1"; + version = "2.0.1"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "xenolf"; repo = "lego"; - sha256 = "1b2cv78v54afflz3gfyidkwzq7r2h5j45rmz0ybps03pr0hs4gk3"; + sha256 = "17q5j2zxc2c0xw8pfhnls67dmwrkicjmd2jdyim3fhi5cgxl9h93"; }; goPackagePath = "github.com/xenolf/lego"; diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix new file mode 100644 index 000000000000..a718ea557469 --- /dev/null +++ b/pkgs/tools/audio/google-music-scripts/default.nix @@ -0,0 +1,32 @@ +{ lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "google-music-scripts"; + version = "3.0.0"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "12risivi11z3shrgs1kpi7x6lvk113cbp3dnczw9mmqhb4mmwviy"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + audio-metadata + click + click-default-group + google-music + google-music-utils + logzero + tomlkit + ]; + + # No tests + doCheck = false; + + meta = with lib; { + homepage = https://github.com/thebigmunch/google-music-scripts; + description = "A CLI utility for interacting with Google Music"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index b40255866940..63affdde7183 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "blueman-${version}"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; - sha256 = "15q253081ahmb8k3yaqy99pc7ppbq3pxrx35bg4q9jmn6xv2kj63"; + sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index c4856d925299..1c774751f271 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -83,7 +83,6 @@ let ceph-python-env = python2Packages.python.withPackages (ps: [ ps.sphinx ps.flask - ps.argparse ps.cython ps.setuptools ps.pip diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 75f5e9ffe11f..d923dba0bc0a 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: let - version = "v1.5"; + version = "v1.6.1"; goFuseVersion = with stdenv.lib; substring 0 7 (head (filter ( d: d.goPackagePath == "github.com/hanwen/go-fuse" ) (import ./deps.nix))).fetch.rev; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "rfjakob"; repo = "gocryptfs"; rev = version; - sha256 = "0s5smjc7n9088n8a2mv7cy3cx31ci13i1i8fhg1vslc17a15qs2d"; + sha256 = "0aqbl25g48b4jp6l09k6kic6w3p0q7d9ip2wvrcvh8lhnrbdkhzd"; }; postPatch = "rm -r tests"; diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix index cb5aec527f24..2589b41a0a5e 100644 --- a/pkgs/tools/filesystems/gocryptfs/deps.nix +++ b/pkgs/tools/filesystems/gocryptfs/deps.nix @@ -1,66 +1,129 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/hanwen/go-fuse"; + goPackagePath = "github.com/conejoninja/hid"; + fetch = { + type = "git"; + url = "https://github.com/conejoninja/hid"; + rev = "3a959b87ebefc18767a31fa567eea402eb37239e"; + sha256 = "1i1x7fhs3g9a48h2wxjczshx7gzmj9p6pd71l22ky998zgjadlim"; + }; + } + { + goPackagePath = "github.com/conejoninja/tesoro"; + fetch = { + type = "git"; + url = "https://github.com/conejoninja/tesoro"; + rev = "e0e839b6a6f14bce56d1bfac9a86311a1646a6a3"; + sha256 = "19q1ibj6l6pk2a3iwcyrj60sscvkqw450psd9zdflvb293cjsx8v"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/hanwen/go-fuse"; fetch = { type = "git"; url = "https://github.com/hanwen/go-fuse"; - rev = "291273cb8ce0f139636a6fd7414be3c7e2de6288"; - sha256 = "1djfl6mni8k4wllhwcr6qwyg1nh6wykdalvdl6gpc1rwrjj9c6xi"; + rev = "95c6370914ac7822973d1893680e878e156f8d70"; + sha256 = "1h701c1hxrw7ljh7kc0rjx18bfw2mzdbpmqqilb5wb0ngpdjpqxp"; }; } { - goPackagePath = "github.com/jacobsa/crypto"; + goPackagePath = "github.com/jacobsa/crypto"; fetch = { type = "git"; url = "https://github.com/jacobsa/crypto"; - rev = "c73681c634de898c869684602cf0c0d2ce938c4d"; + rev = "c73681c634de898c869684602cf0c0d2ce938c4d"; sha256 = "02jbiy6szshbzcmp4j3gpc577hrhikxqvm4kzxixp27k9f2cx5si"; }; } { - goPackagePath = "github.com/pkg/xattr"; + goPackagePath = "github.com/pkg/xattr"; fetch = { type = "git"; url = "https://github.com/pkg/xattr"; - rev = "d15dbc2bb0b5da267362b5e066e2c44c1fcff6c7"; - sha256 = "1vab8mpk2x4vbhx0kd0i0kn6sf7z5ivilcmdklyizzcfcwghh17g"; + rev = "f5b647e257e19d63831e7c7adb95dfb79d9ff4d9"; + sha256 = "0cqxibbfllhs6ffxq65gn08088g7g7aw752p9g3vbnj35jk2p8i9"; }; } { - goPackagePath = "github.com/rfjakob/eme"; + goPackagePath = "github.com/rfjakob/eme"; fetch = { type = "git"; url = "https://github.com/rfjakob/eme"; - rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"; + rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"; sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "github.com/trezor/trezord-go"; + fetch = { + type = "git"; + url = "https://github.com/trezor/trezord-go"; + rev = "bae9c40e5d71c459bde056d42d4b19ab318c90c2"; + sha256 = "12j7b4vjs8n68214zrh5ivpqm3fcifk27bj6rszd9x2839nk3hy8"; + }; + } + { + goPackagePath = "github.com/xaionaro-go/cryptoWallet"; + fetch = { + type = "git"; + url = "https://github.com/xaionaro-go/cryptoWallet"; + rev = "47f9f6877e4324a8bc47fc5661c32d2fe6d29586"; + sha256 = "14h2vnl2jm2wj10znizdf2f0mxsk27rsjskjw5qffy8nf5a0i3i6"; + }; + } + { + goPackagePath = "github.com/zserge/hid"; + fetch = { + type = "git"; + url = "https://github.com/zserge/hid"; + rev = "c86e7adeabafd6fcb3371ad64d6ed366b04d55db"; + sha256 = "1y2zqndq6mafgsdai5gnkw4g8dzl9vmjcxq0i8xspaj4dmck19c4"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; }; } { - goPackagePath = "golang.org/x/sync"; + goPackagePath = "golang.org/x/sync"; fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; + rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "151529c776cdc58ddbe7963ba9af779f3577b419"; - sha256 = "149yfzs4k8vxhjr8f832drndir2k5ha0ggs2dw2fd6xvxf698bcx"; + rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; + sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } -] +] \ No newline at end of file diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 3c6dd2648ef6..fef1d0699e73 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.7.1"; + version = "0.7.4"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "0d1sryq80chb9vrf9z0lfx4xb3sdkg01f9hqf3bb9c89vm6v2lwg"; + sha256 = "1g9gxlll2g4qkqbrshq3888sy1lgw6p5dvcrl5qyh6w73yimi1cq"; }; buildInputs = [ go fuse ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { patchShebangs tests/. export GOPATH=$PWD + export GOCACHE=$TMPDIR/go-cache ''; installPhase = '' diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix new file mode 100644 index 000000000000..fcb2b4ba3274 --- /dev/null +++ b/pkgs/tools/graphics/grim/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }: + +stdenv.mkDerivation rec { + name = "grim-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = "grim"; + rev = "v${version}"; + sha256 = "1mpmxkzssgzqh9z263y8vk40dayw32kah66sb8ja7yw22rm7f4zf"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + cairo + libjpeg + wayland + wayland-protocols + ]; + + meta = with stdenv.lib; { + description = "Grab images from a Wayland compositor"; + homepage = https://github.com/emersion/grim; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b4913970715a..4da8527208e6 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -22,13 +22,6 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 - - install -Dm644 target/release/build/bat-*/out/_bat \ - "$out/share/zsh/site-functions/_bat" - install -Dm644 target/release/build/bat-*/out/bat.bash \ - "$out/share/bash-completions/completions/bat.bash" - install -Dm644 target/release/build/bat-*/out/bat.fish \ - "$out/share/fish/vendor_completions.d/bat.fish" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/capture/0001-eval-fix.patch b/pkgs/tools/misc/capture/0001-eval-fix.patch new file mode 100644 index 000000000000..4b5bdc6a0bcf --- /dev/null +++ b/pkgs/tools/misc/capture/0001-eval-fix.patch @@ -0,0 +1,10 @@ +diff --git a/src/capture.sh b/src/capture.sh +index a32b018..82d1f15 100755 +--- a/src/capture.sh ++++ b/src/capture.sh +@@ -103,4 +103,4 @@ capture () { + + + # remove this line if you want to source this file instead +-eval " ${0##*/}" "$@" ++capture "$@" diff --git a/pkgs/tools/misc/capture/0002-sane-defaults.patch b/pkgs/tools/misc/capture/0002-sane-defaults.patch new file mode 100644 index 000000000000..1bd49ae41e38 --- /dev/null +++ b/pkgs/tools/misc/capture/0002-sane-defaults.patch @@ -0,0 +1,22 @@ +diff --git a/src/capture.sh b/src/capture.sh +index a32b018..42f3936 100755 +--- a/src/capture.sh ++++ b/src/capture.sh +@@ -9,7 +9,7 @@ set -e + # + + scale="-1:-1" +-fps="15" ++fps="30" + raw_video="-vf fps=$fps -c:v utvideo -f nut" + raw_video_container=".nut" + +@@ -18,7 +18,7 @@ raw_video_container=".nut" + # https://stackoverflow.com/questions/41372045/vp9-encoding-limited-to-4-threads + webm_video="-pix_fmt yuv420p -c:v libvpx-vp9 -crf 25 -b:v 0 -f webm -tile-columns 6 -frame-parallel 1 -threads 8" + +-tmpdir="/var/tmp" ++tmpdir="/tmp" + + + # capture_raw ./foo.nut diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix new file mode 100644 index 000000000000..49c238b0bd0f --- /dev/null +++ b/pkgs/tools/misc/capture/default.nix @@ -0,0 +1,31 @@ +{ stdenv, pkgs, slop, ffmpeg, fetchFromGitHub, makeWrapper}: + +stdenv.mkDerivation rec { + name = "capture-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "buhman"; + repo = "capture"; + rev = "4be986f17462b8d520559429c74da6bf3a436259"; + sha256 = "172y06vs993x5v78zwl81xma1gkvjq1ad9rvmf3a217fyxsz4nhh"; + }; + + buildInputs = [ makeWrapper ]; + + patches = [ ./0001-eval-fix.patch ./0002-sane-defaults.patch ]; + + installPhase = '' + install -Dm755 src/capture.sh $out/bin/capture + + patchShebangs $out/bin/capture + wrapProgram $out/bin/capture \ + --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg ]}' + ''; + + meta = with stdenv.lib; { + description = "A no bullshit screen capture tool"; + homepage = "https://github.com/buhman/capture"; + maintainers = [ maintainers.ar1a ]; + }; +} diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index df5a9e80f38a..0a3ae5c28e97 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.112"; + version = "1.0.114"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1p7skj8821dhwgjq3f2v1fplzv5y6xfma6bh9ai6f8ry6vz0hvha"; + sha256 = "14lw18bhxap1g15q0rhslacj1bcrl69wrqcx6azmbvd92rl4bqd8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index edb5973fbb70..2c19facd1d36 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.15"; + version = "4.16"; name = "hebcal-${version}"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "1s9iardqyzn42hs0x9p4rig2m87v87jvzcrbb9arcci7nds66y3i"; + sha256 = "081h3dan0v14camv6j3swl9y31yzfwjfkp2h8xz5qmrh0scv8azr"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix new file mode 100644 index 000000000000..6d508a48901a --- /dev/null +++ b/pkgs/tools/misc/oci-image-tool/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "oci-image-tool-${version}"; + version = "1.0.0-rc1"; + + goPackagePath = "github.com/opencontainers/image-tools"; + subPackages = [ "cmd/oci-image-tool" ]; + + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "image-tools"; + rev = "v${version}"; + sha256 = "0c4n69smqlkf0r6khy9gbg5f810qh9g8jqsl9kibb0dyswizr14r"; + }; + + meta = { + description = "A collection of tools for working with the OCI image format specification"; + homepage = https://github.com/opencontainers/image-tools; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nzhang-zh ]; + }; +} diff --git a/pkgs/tools/misc/pb_cli/0001-eval-fix.patch b/pkgs/tools/misc/pb_cli/0001-eval-fix.patch new file mode 100644 index 000000000000..7188cf372977 --- /dev/null +++ b/pkgs/tools/misc/pb_cli/0001-eval-fix.patch @@ -0,0 +1,10 @@ +diff --git a/src/pb.sh b/src/pb.sh +index be1e472..eb9e6f9 100755 +--- a/src/pb.sh ++++ b/src/pb.sh +@@ -61,4 +61,4 @@ pb () { + esac + } + +-eval " ${0##*/}" "$@" ++pb "$@" diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix new file mode 100644 index 000000000000..6fab44891c52 --- /dev/null +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -0,0 +1,40 @@ +{ screenshots ? true, video ? false, clipboard ? true +, stdenv, pkgs, jq, curl, fetchFromGitHub, makeWrapper, maim ? null, xclip ? null, capture ? null }: + +assert screenshots -> maim != null; +assert video -> capture != null; +assert clipboard -> xclip != null; + +stdenv.mkDerivation rec { + name = "pb_cli-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "ptpb"; + repo = "pb_cli"; + rev = "5242382b3d6b5c0ddaf6e4843a69746b40866e57"; + sha256 = "0543x3377apinhxnsfq82zlp5sm8g1bf6hmsvvcwra5rsshv2ybk"; + }; + + patches = [ ./0001-eval-fix.patch ]; + + buildInputs = [ makeWrapper ]; + + liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim + ++ stdenv.lib.optional video capture + ++ stdenv.lib.optional clipboard xclip; + + installPhase = '' + install -Dm755 src/pb.sh $out/bin/pb + + patchShebangs $out/bin/pb + wrapProgram $out/bin/pb \ + --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}' + ''; + + meta = with stdenv.lib; { + description = "A no bullshit ptpb client"; + homepage = "https://github.com/ptpb/pb_cli"; + maintainers = [ maintainers.ar1a ]; + }; +} diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index bb66b97039da..c49695fd9ad9 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, makeWrapper, lrzsz }: +{ stdenv, fetchFromGitHub, makeWrapper, lrzsz, IOKit }: + +assert stdenv.isDarwin -> IOKit != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "picocom-${version}"; @@ -11,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] + ++ optionals stdenv.isDarwin [ IOKit ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 @@ -26,6 +31,6 @@ stdenv.mkDerivation rec { description = "Minimal dumb-terminal emulation program"; homepage = https://github.com/npat-efault/picocom/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 640e641dd477..320edd83021f 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchFromGitHub, - gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: +{ stdenv, fetchFromGitHub +, gettext, pkgconfig, scons +, glib, json-glib, libelf, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.6.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "1j09qk3zypw4my713q9g36kq37ggqd5v9vrs3h821p6p3qmmkdn8"; + sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz"; }; - configurePhase = "scons config"; + CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; + nativeBuildInputs = [ + pkgconfig sphinx gettext scons + ]; - buildPhase = "scons"; + buildInputs = [ + glib json-glib libelf utillinux + ]; - installPhase = "scons --prefix=$out install"; + prefixKey = "--prefix="; meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index 1dca7f4a70bd..9912202f867e 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -2,20 +2,20 @@ python3.pkgs.buildPythonApplication rec { pname = "termtosvg"; - version = "0.7.0"; + version = "0.8.0"; # tests are not available when fetching from pypi src = fetchFromGitHub { owner = "nbedos"; repo = pname; rev = version; - sha256 = "17hhdrsn9ggcrwqp2c1h2la9cwhdazfrczd7nnm5mz7w6rk25lx3"; + sha256 = "0si5l8cdbzapcibr4yavhld2vhfrpk7qj4cy7m4ws7js8g9iwzd4"; }; propagatedBuildInputs = with python3.pkgs; [ lxml pyte ]; meta = with lib; { - homepage = https://github.com/nbedos/termtosvg; + homepage = https://nbedos.github.io/termtosvg/; description = "Record terminal sessions as SVG animations"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index fe31d324087c..c4cedf426507 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.4.2"; + version = "1.5.0a1"; src = fetchPypi { inherit pname version; - sha256 = "087icp1n1qdf53f1314g5biz16sigrnpqr835xqlr6vj85imm2dm"; + sha256 = "88b6ece3ff59a0882b5c5bff169cc4c1d688161fe61e5553b0a0802ff64b6da8"; }; postPatch = '' @@ -29,9 +29,8 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Manage tmux workspaces from JSON and YAML"; - homepage = http://tmuxp.readthedocs.io; + homepage = https://tmuxp.git-pull.com/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index dd3eddf73954..61f1752823d7 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "watchexec"; repo = "watchexec"; rev = version; - sha256 = "0zp5s2dy5zbar0virvy1izjpvvgwbz7rvjmcy6bph6rb5c4bhm70"; + sha256 = "15fnf3r4pvl9gyvq0fy0l7p8xjaz44z9g4dzkn1l0fdhldib6z1c"; }; - cargoSha256 = "1li84kq9myaw0zwx69y72f3lx01s7i9p8yays4rwvl1ymr614y1l"; + cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 23cbfd3428fe..dd210498fe75 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildPythonPackage -, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc , fetchpatch # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -37,7 +37,7 @@ buildPythonPackage rec { makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional rtmpSupport rtmpdump ++ lib.optional phantomjsSupport phantomjs2; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 452837ef2e4f..a123e551a90a 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation rec { - name = "autossh-1.4f"; + name = "autossh-1.4g"; src = fetchurl { url = "http://www.harding.motd.ca/autossh/${name}.tgz"; - sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1"; + sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; }; buildInputs = [ openssh ]; diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix deleted file mode 100644 index 272c38a99586..000000000000 --- a/pkgs/tools/networking/curl/7_59.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl -, http2Support ? true, nghttp2 -, idnSupport ? false, libidn ? null -, ldapSupport ? false, openldap ? null -, zlibSupport ? true, zlib ? null -, sslSupport ? zlibSupport, openssl ? null -, gnutlsSupport ? false, gnutls ? null -, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null -, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null -, c-aresSupport ? false, c-ares ? null -, brotliSupport ? false, brotli ? null -}: - -assert http2Support -> nghttp2 != null; -assert idnSupport -> libidn != null; -assert ldapSupport -> openldap != null; -assert zlibSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert !(gnutlsSupport && sslSupport); -assert gnutlsSupport -> gnutls != null; -assert scpSupport -> libssh2 != null; -assert c-aresSupport -> c-ares != null; -assert brotliSupport -> brotli != null; -assert gssSupport -> libkrb5 != null; - -stdenv.mkDerivation rec { - name = "curl-7.59.0"; - - src = fetchurl { - urls = [ - "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" - "https://curl.haxx.se/download/${name}.tar.bz2" - ]; - sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm"; - }; - - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; - separateDebugInfo = stdenv.isLinux; - - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig perl ]; - - # Zlib and OpenSSL must be propagated because `libcurl.la' contains - # "-lz -lssl", which aren't necessary direct build inputs of - # applications that use Curl. - propagatedBuildInputs = with stdenv.lib; - optional http2Support nghttp2 ++ - optional idnSupport libidn ++ - optional ldapSupport openldap ++ - optional zlibSupport zlib ++ - optional gssSupport libkrb5 ++ - optional c-aresSupport c-ares ++ - optional sslSupport openssl ++ - optional gnutlsSupport gnutls ++ - optional scpSupport libssh2 ++ - optional brotliSupport brotli; - - # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html - preConfigure = '' - sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure - rm src/tool_hugehelp.c - ''; - - configureFlags = [ - "--with-ca-fallback" - "--disable-manual" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) - ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) - ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) - ( if brotliSupport then "--with-brotli" else "--without-brotli" ) - ] - ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" - # For the 'urandom', maybe it should be a cross-system option - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--with-random=/dev/urandom" - ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [ - "--disable-shared" - "--enable-static" - ]; - - CXX = "${stdenv.cc.targetPrefix}c++"; - CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - - doCheck = false; # expensive, fails - - postInstall = '' - moveToOutput bin/curl-config "$dev" - sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la - '' + stdenv.lib.optionalString gnutlsSupport '' - ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so - ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 - ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0 - ''; - - passthru = { - inherit sslSupport openssl; - }; - - meta = with stdenv.lib; { - description = "A command line tool for transferring files with URL syntax"; - homepage = https://curl.haxx.se/; - maintainers = with maintainers; [ lovek323 ]; - license = licenses.curl; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index d3c4a2af7652..02bdb3e2a460 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchFromGitHub, pythonPackages +{ stdenv, fetchFromGitHub, python , unzip, makeWrapper }: let - inherit (pythonPackages) python; - docker_1_10 = pythonPackages.buildPythonPackage rec { - name = "docker-${version}"; - version = "1.10.6"; + python' = python.override { + packageOverrides = self: super: { + docker = self.buildPythonPackage rec { + name = "docker-${version}"; + version = "1.10.6"; - src = fetchFromGitHub { - owner = "docker"; - repo = "docker-py"; - rev = version; - sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m"; - }; + src = fetchFromGitHub { + owner = "docker"; + repo = "docker-py"; + rev = version; + sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m"; + }; + + propagatedBuildInputs = with self; [ + six + requests + websocket_client + ipaddress + backports_ssl_match_hostname + docker_pycreds + uptime + ]; - propagatedBuildInputs = with pythonPackages; [ - six - requests - websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds - uptime - ]; + # due to flake8 + doCheck = false; + }; - # due to flake8 - doCheck = false; + pymongo = super.pymongo.overridePythonAttrs (oldAttrs: rec { + version = "2.9.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70"; + }; + }); + }; }; in stdenv.mkDerivation rec { @@ -41,21 +52,21 @@ in stdenv.mkDerivation rec { patches = [ ./40103-iostat-fix.patch ]; buildInputs = [ - python unzip makeWrapper - pythonPackages.requests - pythonPackages.psycopg2 - pythonPackages.psutil - pythonPackages.ntplib - pythonPackages.simplejson - pythonPackages.pyyaml - pythonPackages.pymongo_2_9_1 - pythonPackages.python-etcd - pythonPackages.consul - docker_1_10 - ]; - propagatedBuildInputs = with pythonPackages; [ python tornado ]; + ] ++ (with python'.pkgs; [ + requests + psycopg2 + psutil + ntplib + simplejson + pyyaml + pymongo + python-etcd + consul + docker + ]); + propagatedBuildInputs = with python'.pkgs; [ python tornado ]; buildCommand = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 4dba58140459..77e61aaf3470 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,37 +1,40 @@ -{ stdenv, fetchurl, bind, libseccomp, zlib, openssl, libcap }: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook +, bind, libseccomp, zlib, openssl, libcap +}: stdenv.mkDerivation rec { name = "dnsperf-${version}"; - version = "2.1.0.0"; + version = "2.2.0"; # The same as the initial commit of the new GitHub repo (only readme changed). - src = fetchurl { - url = "ftp://ftp.nominum.com/pub/nominum/dnsperf/${version}/" - + "dnsperf-src-${version}-1.tar.gz"; - sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4"; + src = fetchFromGitHub { + owner = "DNS-OARC"; + repo = "dnsperf"; + rev = "v${version}"; + sha256 = "1acbpgk1d7hjs48j3w6xkmyf9xlxhqskjy50a16f9dvjwvvxp84b"; }; - # Almost the same as https://github.com/DNS-OARC/dnsperf/pull/12 - postPatch = '' - find . -name '*.h' -o -name '*.c' | xargs sed \ - -e 's/\<isc_boolean_t\>/bool/g' -e 's/\<ISC_TRUE\>/true/g' -e 's/\<ISC_FALSE\>/false/g' \ - -e 's/\<isc_uint/uint/g' -e 's/\<ISC_UINT/UINT/g' -e 's/\<isc_int/int/g' \ - -e 's/\<ISC_PRINT_QUADFORMAT\>/PRIu64/g' -e 's/\<ISC_TF\>//g' \ - -i -- - ''; - outputs = [ "out" "man" "doc" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bind zlib openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap.lib ]; - postInstall = '' - mkdir -p "$out/share/doc/" - cp -r ./doc "$out/share/doc/dnsperf" + # For now, keep including the old PDFs as well. + # https://github.com/DNS-OARC/dnsperf/issues/27 + postInstall = let + src-doc = fetchurl { + url = "ftp://ftp.nominum.com/pub/nominum/dnsperf/2.1.0.0/" + + "dnsperf-src-2.1.0.0-1.tar.gz"; + sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4"; + }; + in '' + tar xf '${src-doc}' + cp ./dnsperf-src-*/doc/*.pdf "$doc/share/doc/dnsperf/" ''; meta = with stdenv.lib; { - outputsToInstall = outputs; # The man pages and PDFs are likely useful to most. + outputsToInstall = outputs; # The man pages and docs are likely useful to most. description = "Tools for DNS benchmaring"; homepage = "https://github.com/DNS-OARC/dnsperf"; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 06eb196c7a7e..e94c3e4330fb 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -12,8 +12,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook - argparse chardet ]; + propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook chardet ]; startScript = ./gmvault.py; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 993dc49a61b7..7ae42cbdf572 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -9,12 +9,12 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "1.9.0"; + version = "1.9.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; - sha256 = "0zc10ghcwj7hpi90yh2gsciq6q87sqkdik52s55xw1jn2xk9wqhn"; + sha256 = "1qf8q49njx9n3b1g10zz3kcqmhji8lqcklh7723671z3l4pk2imd"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 5512db9fe760..b95c3aed8e62 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.7.1"; + version = "1.8.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "01nsgmmh72qk0aq2zdjh8qqn256mmvz1w2gl0wi7g29d82y2hdfm"; + sha256 = "1p7zfysqvivca565ifb5anla3rgqavq2npavj1vlmhipa01080lk"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -20,9 +20,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; - preConfigure = '' - substituteInPlace src/tunnel.c --replace "/usr/sbin/pppd" "${ppp}/bin/pppd" - ''; + configureFlags = [ "--with-pppd=${ppp}/bin/pppd" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 676f1d048554..15ac5bceea33 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -40,7 +40,7 @@ in buildPythonApplication rec { sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4"; }; - propagatedBuildInputs = [ argparse pytz ]; + propagatedBuildInputs = [ pytz ]; prePatch = '' siteDir=$out/${python.sitePackages} diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 5481182fbd1d..a57056569c08 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "1.0.2"; + version = "1.0.5"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "0vgar8sb2471zipxa1cw0n90mrnn5da7wqdlxhamnkrylbh0mc0d"; + sha256 = "13dv2zpnhf218hfmixsgsbvy9zgrp7b0d125hvq8sk5x57f6114q"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix new file mode 100644 index 000000000000..a4e43f149677 --- /dev/null +++ b/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchFromGitHub +, ruby +}: + +# No gems used, so mkDerivation is fine. +stdenv.mkDerivation rec { + pname = "nix-universal-prefetch"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "samueldr"; + repo = "nix-universal-prefetch"; + rev = "v${version}"; + sha256 = "1id9iaibrm2d3fa9dkcxnb3sd0j1vh502181gdd199a1cfsmzh1i"; + }; + + installPhase = '' + mkdir -pv $out/bin + cp nix-universal-prefetch $out/bin/nix-universal-prefetch + substituteInPlace "$out/bin/nix-universal-prefetch" \ + --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby" + ''; + + meta = with stdenv.lib; { + description = "Uses nixpkgs fetchers to figure out hashes"; + homepage = https://github.com/samueldr/nix-universal-prefetch; + license = licenses.mit; + maintainers = with maintainers; [ samueldr ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 995f123b81d3..d86dfa316193 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -13,153 +13,154 @@ let sh = busybox-sandbox-shell; - common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { - inherit name src; - version = lib.getVersion name; - - is20 = lib.versionAtLeast version "2.0pre"; - - VERSION_SUFFIX = lib.optionalString fromGit suffix; - - outputs = [ "out" "dev" "man" "doc" ]; - - nativeBuildInputs = - [ pkgconfig ] - ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; - - buildInputs = [ curl openssl sqlite xz bzip2 ] - ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is20 [ brotli boost editline ] - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional (withAWS && is20) - ((aws-sdk-cpp.override { - apis = ["s3" "transfer"]; - customMemoryManagement = false; - }).overrideDerivation (args: { - patches = args.patches or [] ++ [(fetchpatch { - url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; - sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; - })]; - })); - - propagatedBuildInputs = [ boehmgc ]; - - # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; - - preConfigure = - # Copy libboost_context so we don't get all of Boost in our closure. - # https://github.com/NixOS/nixpkgs/issues/45462 - if is20 then '' - mkdir -p $out/lib - cp ${boost}/lib/libboost_context* $out/lib - '' else '' - configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") + common = { name, suffix ? "", src, fromGit ? false }: + let nix = stdenv.mkDerivation rec { + inherit name src; + version = lib.getVersion name; + + is20 = lib.versionAtLeast version "2.0pre"; + + VERSION_SUFFIX = lib.optionalString fromGit suffix; + + outputs = [ "out" "dev" "man" "doc" ]; + + nativeBuildInputs = + [ pkgconfig ] + ++ lib.optionals (!is20) [ curl perl ] + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; + + buildInputs = [ curl openssl sqlite xz bzip2 ] + ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium + ++ lib.optionals is20 [ brotli boost editline ] + ++ lib.optional withLibseccomp libseccomp + ++ lib.optional (withAWS && is20) + ((aws-sdk-cpp.override { + apis = ["s3" "transfer"]; + customMemoryManagement = false; + }).overrideDerivation (args: { + patches = args.patches or [] ++ [(fetchpatch { + url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; + sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; + })]; + })); + + propagatedBuildInputs = [ boehmgc ]; + + # Seems to be required when using std::atomic with 64-bit types + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; + + preConfigure = + # Copy libboost_context so we don't get all of Boost in our closure. + # https://github.com/NixOS/nixpkgs/issues/45462 + if is20 then '' + mkdir -p $out/lib + cp ${boost}/lib/libboost_context* $out/lib + '' else '' + configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") + ''; + + configureFlags = + [ "--with-store-dir=${storeDir}" + "--localstatedir=${stateDir}" + "--sysconfdir=${confDir}" + "--disable-init-state" + "--enable-gc" + ] + ++ lib.optionals (!is20) [ + "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" + ] ++ lib.optionals (is20 && stdenv.isLinux) [ + "--with-sandbox-shell=${sh}/bin/busybox" + ] + ++ lib.optional ( + stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system + ) ''--with-system=${stdenv.hostPlatform.nix.system}'' + # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 + ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; + + makeFlags = "profiledir=$(out)/etc/profile.d"; + + installFlags = "sysconfdir=$(out)/etc"; + + doInstallCheck = true; # not cross + + # socket path becomes too long otherwise + preInstallCheck = lib.optional stdenv.isDarwin '' + export TMPDIR=$NIX_BUILD_TOP ''; - configureFlags = - [ "--with-store-dir=${storeDir}" - "--localstatedir=${stateDir}" - "--sysconfdir=${confDir}" - "--disable-init-state" - "--enable-gc" - ] - ++ lib.optionals (!is20) [ - "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" - "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" - ] ++ lib.optionals (is20 && stdenv.isLinux) [ - "--with-sandbox-shell=${sh}/bin/busybox" - ] - ++ lib.optional ( - stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system - ) ''--with-system=${stdenv.hostPlatform.nix.system}'' - # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - - makeFlags = "profiledir=$(out)/etc/profile.d"; - - installFlags = "sysconfdir=$(out)/etc"; - - doInstallCheck = true; # not cross - - # socket path becomes too long otherwise - preInstallCheck = lib.optional stdenv.isDarwin '' - export TMPDIR=$NIX_BUILD_TOP - ''; - - separateDebugInfo = stdenv.isLinux; - - enableParallelBuilding = true; - - meta = { - description = "Powerful package manager that makes package management reliable and reproducible"; - longDescription = '' - Nix is a powerful package manager for Linux and other Unix systems that - makes package management reliable and reproducible. It provides atomic - upgrades and rollbacks, side-by-side installation of multiple versions of - a package, multi-user package management and easy setup of build - environments. - ''; - homepage = https://nixos.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; - outputsToInstall = [ "out" "man" ]; + separateDebugInfo = stdenv.isLinux; + + enableParallelBuilding = true; + + meta = { + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; + homepage = https://nixos.org/; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + outputsToInstall = [ "out" "man" ]; + }; + + passthru = { + inherit fromGit; + + perl-bindings = stdenv.mkDerivation { + name = "nix-perl-${version}"; + + inherit src; + + postUnpack = "sourceRoot=$sourceRoot/perl"; + + # This is not cross-compile safe, don't have time to fix right now + # but noting for future travellers. + nativeBuildInputs = + [ perl pkgconfig curl nix libsodium ] + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive ] + ++ lib.optional is20 boost; + + configureFlags = + [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + ]; + + preConfigure = "export NIX_STATE_DIR=$TMPDIR"; + + preBuild = "unset NIX_INDENT_MAKE"; + }; + }; }; - - passthru = { inherit fromGit; }; - }; - - perl-bindings = { nix, needsBoost ? false }: stdenv.mkDerivation { - name = "nix-perl-" + nix.version; - - inherit (nix) src; - - postUnpack = "sourceRoot=$sourceRoot/perl"; - - # This is not cross-compile safe, don't have time to fix right now - # but noting for future travellers. - nativeBuildInputs = - [ perl pkgconfig curl nix libsodium ] - ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ] - ++ lib.optional needsBoost boost; - - configureFlags = - [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" - ]; - - preConfigure = "export NIX_STATE_DIR=$TMPDIR"; - - preBuild = "unset NIX_INDENT_MAKE"; - }; + in nix; in rec { nix = nixStable; - nix1 = (common rec { + nix1 = common rec { name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; - }) // { perl-bindings = nix1; }; + }; - nixStable = (common rec { + nixStable = common rec { name = "nix-2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7"; }; - }) // { perl-bindings = perl-bindings { - nix = nixStable; - needsBoost = true; - }; }; + }; - nixUnstable = (lib.lowPrio (common rec { + nixUnstable = lib.lowPrio (common rec { name = "nix-2.2${suffix}"; suffix = "pre6600_85488a93"; src = fetchFromGitHub { @@ -169,9 +170,6 @@ in rec { sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm"; }; fromGit = true; - })) // { perl-bindings = perl-bindings { - nix = nixUnstable; - needsBoost = true; - }; }; + }); } diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix new file mode 100644 index 000000000000..1d983cb8599a --- /dev/null +++ b/pkgs/tools/security/efitools/default.nix @@ -0,0 +1,39 @@ +{ stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages, +help2man, fetchgit }: +stdenv.mkDerivation rec { + name = "efitools-${version}"; + version = "1.9.2"; + + buildInputs = [ + gnu-efi + openssl + sbsigntool + ]; + + nativeBuildInputs = [ + perl + perlPackages.FileSlurp + help2man + ]; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; + rev = "v${version}"; + sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i"; + }; + + postPatch = '' + sed -i -e 's#/usr/include/efi#${gnu-efi}/include/efi/#g' Make.rules + sed -i -e 's#/usr/lib64/gnuefi#${gnu-efi}/lib/#g' Make.rules + sed -i -e 's#$(DESTDIR)/usr#$(out)#g' Make.rules + patchShebangs . + ''; + + meta = with stdenv.lib; { + description = "Tools for manipulating UEFI secure boot platforms"; + homepage = "https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"; + license = licenses.gpl2; + maintainers = [ maintainers.grahamc ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index b27b4ac24c0a..ae726544453a 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,22 +1,20 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, cf-private +{ stdenv, lib, buildGoPackage, fetchurl, cf-private , AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox }: buildGoPackage rec { name = "keybase-${version}"; - version = "2.11.0"; + version = "2.13.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; dontRenameImports = true; - src = fetchFromGitHub { - owner = "keybase"; - repo = "client"; - rev = "v${version}"; - sha256 = "1mj78cs6j0f1f86c71j4gdphas75j3rfaqygpy87dc40kc2yj0gd"; + src = fetchurl { + url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; + sha256 = "0avq87y7cs3jipl444ssz1zd5jygpks20hls0fkqxxaikkpdsy4v"; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index a8c2d5ea4837..bd8166b214dc 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -3,16 +3,16 @@ , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: let - versionSuffix = "20190104191034.69b3ee25b7"; + versionSuffix = "20190115203650.eec94506e4"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.13.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "2.13.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "5b188185dc6d594cd18876a2c955bb6481598c206f048cfd80ac2e7e8022241e"; + sha256 = "01663jknr8s4sp51mclw9llhx07ww6yh22apawxikvpwmw9yg2qr"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index beb2e75b08b5..4f48266cc1ad 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20181213"; + version = "20190108"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w"; + sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 0b4a33e43853..19581c82c78f 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvtop-${version}"; - version = "0.2.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "0gampikzmd1l0vdhvarl0hckl6kmjh2rwcllpg6rrm2p75njw7hv"; + sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; }; cmakeFlags = [ diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 63e135075b9c..1d72429323d8 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -8,7 +8,7 @@ src = fetchFromGitHub { inherit rev sha256; repo = "proot"; - owner = "cedric-vincent"; + owner = "proot-me"; }; buildInputs = [ talloc ]; @@ -35,7 +35,7 @@ description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim makefu ]; + maintainers = with maintainers; [ ianwookim makefu veprbl ]; }; }) (if stdenv.isAarch64 then rec { @@ -49,8 +49,8 @@ }) ]; } else { - version = "5.1.0.20171015"; - sha256 = "0jam87msh5jx8vpb19n6xwxw1xlig5amdcqif7gn2rc8nhswpxif"; - rev = "0bf2ee17daafeeadfed079cec97fe1ac781e696a"; + version = "5.1.0.20181214"; + sha256 = "07g1gfyjq7rypjdwxw495sk8k1y2i3y3nsm1rh9kgx3z47z28aah"; + rev = "11972c0dab34e088c55c16a94d26c399ca7a26d8"; patches = []; }) diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index bbac78f4864b..3e7bb301a6b9 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchFromGitHub }: let - version = "3.9"; + version = "3.12"; pname = "ps_mem"; in pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; @@ -9,8 +9,8 @@ in pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pixelb"; repo = "${pname}"; - rev = "f0891def54f1edb78a70006603d2b025236b830f"; - sha256 = "1vy0z5nhia61hpqndf7kkjm12mgi0kh33jx5g1glggy45ymcisif"; + rev = "v${version}"; + sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 75e380a6b661..69fce7a109cc 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.2.4"; @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { patches = ./fix-configure-path.patch; configureScript = "./configure.sh"; + configureFlags = [ + "--enable-all-features" + "--pkg-config" + "--shared" + "--with-fenced-code" + ]; + meta = with stdenv.lib; { description = "Implementation of Markdown markup language in C"; homepage = http://www.pell.portland.or.us/~orc/Code/discount/; diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix new file mode 100644 index 000000000000..62fdc0c7c84b --- /dev/null +++ b/pkgs/tools/text/transifex-client/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonApplication, fetchPypi +, python-slugify, requests, urllib3 }: + +buildPythonApplication rec { + pname = "transifex-client"; + version = "0.13.5"; + + propagatedBuildInputs = [ + urllib3 requests python-slugify + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "00igk35nyzqp1slj7lbhiv4lc42k87ix43ipx2zcrsjf6xxv6l7v"; + }; + + prePatch = '' + substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3<2.0" + ''; + + # Requires external resources + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.transifex.com/; + license = licenses.gpl2; + description = "Transifex translation service client"; + maintainers = [ maintainers.etu ]; + }; +} diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 1ff804f0d4a4..55bcf449a2d1 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "1ca3js4arkg28gg2iszxxyrq7kgsrz482d1szv5dfd471h3vr5m3"; + sha256 = "16wp3plxbdzb3jvshdwvyjnskvk34bz4s6fc8vsz5hffkmxm7vdq"; }; postPatch = '' diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index cad6b9866171..446cfff37ff6 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; - homepage = https://www.gitbook.com/book/indigo-dc/udocker; + homepage = https://indigo-dc.gitbooks.io/udocker; license = licenses.asl20; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 186260c0f688..18be4e6e4592 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -240,6 +240,21 @@ mapAliases ({ postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead"; + # postgresql plugins + pgjwt = postgresqlPackages.pgjwt; + pg_repack = postgresqlPackages.pg_repack; + pgroonga = postgresqlPackages.pgroonga; + pg_similarity = postgresqlPackages.pg_similarity; + pgtap = postgresqlPackages.pgtap; + plv8 = postgresqlPackages.plv8; + timescaledb = postgresqlPackages.timescaledb; + tsearch_extras = postgresqlPackages.tsearch_extras; + cstore_fdw = postgresqlPackages.cstore_fdw; + pg_hll = postgresqlPackages.pg_hll; + pg_cron = postgresqlPackages.pg_cron; + pg_topn = postgresqlPackages.pg_topn; + postgis = postgresqlPackages.postgis; + # end procps-ng = procps; # added 2018-06-08 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 @@ -271,6 +286,7 @@ mapAliases ({ saneBackends = sane-backends; # added 2016-01-02 saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 + sapic = throw "deprecated 2019-1-19: sapic is bundled with 'tamarin-prover' now"; scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 shared_mime_info = shared-mime-info; # added 2018-02-25 @@ -341,6 +357,7 @@ mapAliases ({ xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 youtubeDL = youtube-dl; # added 2014-10-26 + zdfmediathk = mediathekview; # added 2019-01-19 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d922e39320c..b1296f977920 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -208,6 +208,8 @@ in fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; + prefer-remote-fetch = import ../build-support/prefer-remote-fetch; + global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; graph-easy = callPackage ../tools/graphics/graph-easy { }; @@ -318,7 +320,7 @@ in ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${group}%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; + url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${lib.replaceStrings ["."] ["%2E"] group}%2F"}${lib.replaceStrings ["."] ["%2E"] owner}%2F${lib.replaceStrings ["."] ["%2E"] repo}/repository/archive.tar.gz?sha=${rev}"; meta.homepage = "https://${domain}/${lib.optionalString (group != null) "${group}/"}${owner}/${repo}/"; } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }; @@ -419,7 +421,7 @@ in findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = makeSetupHook { - deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ]; + deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -1491,6 +1493,8 @@ in pythonPackages = python3Packages; }; + grim = callPackage ../tools/graphics/grim { }; + gringo = callPackage ../tools/misc/gringo { }; grobi = callPackage ../tools/X11/grobi { }; @@ -2171,10 +2175,6 @@ in brotliSupport = true; }; - curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec { - fetchurl = fetchurlBoot; - }; - curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; }; @@ -3048,6 +3048,8 @@ in google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; + google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -3154,6 +3156,8 @@ in gx = callPackage ../tools/package-management/gx { }; gx-go = callPackage ../tools/package-management/gx/go { }; + efitools = callPackage ../tools/security/efitools { }; + sbsigntool = callPackage ../tools/security/sbsigntool { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; @@ -3215,17 +3219,36 @@ in pgf_graphics = callPackage ../tools/graphics/pgf { }; - pgjwt = callPackage ../servers/sql/postgresql/pgjwt {}; - cstore_fdw = callPackage ../servers/sql/postgresql/cstore_fdw {}; + # postgresql extensions + + cstore_fdw = callPackage ../servers/sql/postgresql/ext/cstore_fdw.nix {}; + + pg_cron = callPackage ../servers/sql/postgresql/ext/pg_cron.nix {}; + + pg_hll = callPackage ../servers/sql/postgresql/ext/pg_hll.nix {}; + + pgjwt = callPackage ../servers/sql/postgresql/ext/pgjwt.nix {}; + + pg_repack = callPackage ../servers/sql/postgresql/ext/pg_repack.nix {}; + + pgroonga = callPackage ../servers/sql/postgresql/ext/pgroonga.nix {}; + + plv8 = callPackage ../servers/sql/postgresql/ext/plv8.nix { + v8 = callPackage ../development/libraries/v8/plv8_6_x.nix { + inherit (python2Packages) python; + }; + }; + + pg_similarity = callPackage ../servers/sql/postgresql/ext/pg_similarity.nix {}; - pg_hll = callPackage ../servers/sql/postgresql/pg_hll {}; + pgtap = callPackage ../servers/sql/postgresql/ext/pgtap.nix {}; - pg_cron = callPackage ../servers/sql/postgresql/pg_cron {}; + pg_topn = callPackage ../servers/sql/postgresql/ext/pg_topn.nix {}; - pgtap = callPackage ../servers/sql/postgresql/pgtap {}; + timescaledb = callPackage ../servers/sql/postgresql/ext/timescaledb.nix {}; - pg_topn = callPackage ../servers/sql/postgresql/topn {}; + tsearch_extras = callPackage ../servers/sql/postgresql/ext/tsearch_extras.nix { }; pigz = callPackage ../tools/compression/pigz { }; @@ -4565,6 +4588,8 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; + oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; + ocproxy = callPackage ../tools/networking/ocproxy { }; ocserv = callPackage ../tools/networking/ocserv { }; @@ -4945,6 +4970,9 @@ in podiff = callPackage ../tools/text/podiff { }; + podman = callPackage ../applications/virtualization/podman { }; + conmon = callPackage ../applications/virtualization/podman/conmon.nix { }; + pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { }; @@ -5421,9 +5449,7 @@ in sieve-connect = callPackage ../applications/networking/sieve-connect {}; - sigal = callPackage ../applications/misc/sigal { - inherit (pythonPackages) buildPythonApplication fetchPypi; - }; + sigal = callPackage ../applications/misc/sigal { }; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; @@ -5718,7 +5744,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt56.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -5870,6 +5896,8 @@ in tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { }; + transifex-client = python3.pkgs.callPackage ../tools/text/transifex-client { }; + translate-shell = callPackage ../applications/misc/translate-shell { }; transporter = callPackage ../applications/networking/transporter { }; @@ -5992,6 +6020,8 @@ in vampire = callPackage ../applications/science/logic/vampire {}; + vdmfec = callPackage ../applications/backup/vdmfec {}; + vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; volatility = callPackage ../tools/security/volatility { }; @@ -6146,6 +6176,8 @@ in rcm = callPackage ../tools/misc/rcm {}; + tegola = callPackage ../servers/tegola {}; + tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc { @@ -7066,7 +7098,7 @@ in tamarin-prover = (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { # NOTE: do not use the haskell packages 'graphviz' and 'maude' - inherit maude which sapic; + inherit maude which; graphviz = graphviz-nox; }); @@ -7832,6 +7864,7 @@ in luajit luajit_2_0 luajit_2_1; luarocks = luaPackages.luarocks; + luarocks-nix = luaPackages.luarocks-nix; toluapp = callPackage ../development/tools/toluapp { lua = lua5_1; # doesn't work with any other :( @@ -8603,7 +8636,7 @@ in doclifter = callPackage ../development/tools/misc/doclifter { }; - docutils = pythonPackages.docutils; + docutils = with python3Packages; toPythonApplication docutils; doctl = callPackage ../development/tools/doctl { }; @@ -9068,7 +9101,7 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; sconsPackages = callPackage ../development/tools/build-managers/scons { }; - scons = sconsPackages.scons_3_0_3; + scons = sconsPackages.scons_latest; mill = callPackage ../development/tools/build-managers/mill { }; @@ -9754,7 +9787,7 @@ in vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; - inherit (darwin) CF; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; @@ -9859,6 +9892,8 @@ in gcr = callPackage ../development/libraries/gcr { }; + gdl = callPackage ../development/libraries/gdl { }; + gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome2) gtkdoc; }; @@ -11984,18 +12019,6 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - pg_repack = callPackage ../servers/sql/postgresql/pg_repack {}; - - pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; - - pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; - - plv8 = callPackage ../servers/sql/postgresql/plv8 { - v8 = callPackage ../development/libraries/v8/plv8_6_x.nix { - inherit (python2Packages) python; - }; - }; - phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -12067,8 +12090,6 @@ in buildPythonApplication click future six; }; - postgis = callPackage ../development/libraries/postgis { }; - protobuf = protobuf3_6; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; @@ -13928,16 +13949,17 @@ in timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; - postgresql = postgresql_9_6; - - inherit (callPackages ../servers/sql/postgresql { }) + inherit (import ../servers/sql/postgresql pkgs super) postgresql_9_4 postgresql_9_5 postgresql_9_6 postgresql_10 - postgresql_11; + postgresql_11 + ; + postgresql = postgresql_9_6.override { this = postgresql; }; + postgresqlPackages = recurseIntoAttrs postgresql.pkgs; - postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; inherit (callPackage ../servers/monitoring/prometheus { buildGoPackage = buildGo110Package; @@ -13977,7 +13999,7 @@ in prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; - psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; + psqlodbc = callPackage ../development/libraries/psqlodbc { }; pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; @@ -14256,6 +14278,7 @@ in armTrustedFirmwareAllwinner armTrustedFirmwareQemu armTrustedFirmwareRK3328 + armTrustedFirmwareRK3399 ; microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; @@ -14318,7 +14341,7 @@ in cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ - lua = lua5_1; # conky can use 5.2, but toluapp can not + lua = lua5_3_compat; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; pulseSupport = config.pulseaudio or false; } // config.conky or {}); @@ -14848,6 +14871,7 @@ in # Hardened linux hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { + features.ia32Emulation = false; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; inherit (kernel) version; @@ -15303,7 +15327,35 @@ in # Non-upstream U-Boots: ubootNanonote = callPackage ../misc/uboot/nanonote.nix { }; - ubootRock64 = callPackage ../misc/uboot/rock64.nix { }; + inherit (let + dtc = buildPackages.dtc.overrideAttrs (old: rec { + version = "1.4.5"; + src = fetchgit { + url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; + rev = "refs/tags/v${version}"; + sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3"; + }; + }); + # Newer dtc versions are incompatible with U-Boot 2017.09 + inherit (callPackage ../misc/uboot { + inherit dtc; + buildPackages = buildPackages // { + python2 = buildPackages.python2.override (old: { + packageOverrides = pySelf: pySuper: { + libfdt = pySelf.toPythonModule dtc; + }; + }); + }; + }) buildUBoot; + in { + ubootRock64 = callPackage ../misc/uboot/rock64.nix { + inherit buildUBoot; + }; + + ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix { + inherit buildUBoot; + }; + }) ubootRock64 ubootRockPro64; uclibc = callPackage ../os-specific/linux/uclibc { }; @@ -15379,6 +15431,8 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + agave = callPackage ../data/fonts/agave { }; + aileron = callPackage ../data/fonts/aileron { }; andagii = callPackage ../data/fonts/andagii { }; @@ -15387,6 +15441,9 @@ in android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; + ankacoder = callPackage ../data/fonts/ankacoder { }; + ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { }; + anonymousPro = callPackage ../data/fonts/anonymous-pro { }; ant-theme = callPackage ../data/themes/ant-theme { }; @@ -15397,6 +15454,8 @@ in aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + b612 = callPackage ../data/fonts/b612 { }; + babelstone-han = callPackage ../data/fonts/babelstone-han { }; baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { }; @@ -15423,6 +15482,8 @@ in charis-sil = callPackage ../data/fonts/charis-sil { }; + cherry = callPackage ../data/fonts/cherry { }; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-neue = callPackage ../data/fonts/comic-neue { }; @@ -15569,6 +15630,8 @@ in hanazono = callPackage ../data/fonts/hanazono { }; + hermit = callPackage ../data/fonts/hermit { }; + hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { }; ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { }; @@ -15645,6 +15708,8 @@ in # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } ); + luculent = callPackage ../data/fonts/luculent { }; + maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -15701,6 +15766,8 @@ in nafees = callPackage ../data/fonts/nafees { }; + nordic = callPackage ../data/themes/nordic { }; + nordic-polar = callPackage ../data/themes/nordic-polar { }; inherit (callPackages ../data/fonts/noto-fonts {}) @@ -16968,6 +17035,8 @@ in fetchmail = callPackage ../applications/misc/fetchmail { }; + fff = callPackage ../applications/misc/fff { }; + fig2dev = callPackage ../applications/graphics/fig2dev { }; FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; @@ -17918,11 +17987,9 @@ in kubeval = callPackage ../applications/networking/cluster/kubeval { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; - kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: { - name = "kubectl-${oldAttrs.version}"; - }); + kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; @@ -18136,7 +18203,9 @@ in mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { }; + # mediathekview needs JavaFX, which currently only is available inside OracleJRE + # we might be able to get rid of it, as soon as we have an OpenJRE with OpenJFX included + mediathekview = callPackage ../applications/video/mediathekview { jre = oraclejre; }; meteo = callPackage ../applications/networking/weather/meteo { }; @@ -18666,7 +18735,9 @@ in vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; - openmpt123 = callPackage ../applications/audio/openmpt123 {}; + openmpt123 = callPackage ../applications/audio/openmpt123 { + usePulseAudio = config.pulseaudio or false; + }; opusfile = callPackage ../applications/audio/opusfile { }; @@ -18704,6 +18775,10 @@ in packet = callPackage ../development/tools/packet { }; + pb_cli = callPackage ../tools/misc/pb_cli {}; + + capture = callPackage ../tools/misc/capture {}; + pbrt = callPackage ../applications/graphics/pbrt { }; pcsxr = callPackage ../misc/emulators/pcsxr { @@ -18752,7 +18827,9 @@ in picard = callPackage ../applications/audio/picard { }; - picocom = callPackage ../tools/misc/picocom { }; + picocom = callPackage ../tools/misc/picocom { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if config.pidgin.openssl or true then openssl else null; @@ -19095,6 +19172,8 @@ in rkt = callPackage ../applications/virtualization/rkt { }; + rkdeveloptool = callPackage ../misc/rkdeveloptool { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; @@ -19486,6 +19565,7 @@ in syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; synergy = callPackage ../applications/misc/synergy { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; }; @@ -19603,8 +19683,6 @@ in fftw = fftwSinglePrec; }; - timescaledb = callPackage ../servers/sql/postgresql/timescaledb {}; - timewarrior = callPackage ../applications/misc/timewarrior { }; timidity = callPackage ../tools/misc/timidity { }; @@ -19680,6 +19758,8 @@ in trayer = callPackage ../applications/window-managers/trayer { }; + tdrop = callPackage ../applications/misc/tdrop { }; + tree = callPackage ../tools/system/tree {}; treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; @@ -19688,8 +19768,6 @@ in trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; - tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; - tudu = callPackage ../applications/office/tudu { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; @@ -21319,8 +21397,6 @@ in gnome-themes-extra = gnome3.gnome-themes-extra; - nordic = callPackage ../misc/themes/nordic { }; - numix-gtk-theme = callPackage ../misc/themes/numix { }; numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { }; @@ -21383,6 +21459,8 @@ in jmol = callPackage ../applications/science/chemistry/jmol { }; + marvin = callPackage ../applications/science/chemistry/marvin { }; + molden = callPackage ../applications/science/chemistry/molden { }; octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; @@ -21839,10 +21917,6 @@ in proverif = callPackage ../applications/science/logic/proverif { }; - sapic = callPackage ../applications/science/logic/sapic { - inherit (ocaml-ng.ocamlPackages_4_05) ocaml; - }; - satallax = callPackage ../applications/science/logic/satallax { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; @@ -21884,6 +21958,7 @@ in }; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; + z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; tlaplus = callPackage ../applications/science/logic/tlaplus {}; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { @@ -22452,7 +22527,6 @@ in inherit (callPackages ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - curl = curl_7_59; boehmgc = boehmgc.override { enableLargeConfig = true; }; }) nix @@ -22622,6 +22696,8 @@ in nix-top = callPackage ../tools/package-management/nix-top { }; + nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { }; + nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + (lib.optionalString (! lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) @@ -22726,6 +22802,8 @@ in putty = callPackage ../applications/networking/remote/putty { }; + qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; + redprl = callPackage ../applications/science/logic/redprl { }; retroarchBare = callPackage ../misc/emulators/retroarch { @@ -23088,8 +23166,6 @@ in zap = callPackage ../tools/networking/zap { }; - zdfmediathk = callPackage ../applications/video/zdfmediathk { }; - zopfli = callPackage ../tools/compression/zopfli { }; myEnvFun = callPackage ../misc/my-env { diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 4c7361d3517e..591c9db9d122 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -88,7 +88,7 @@ in rec { version = "8.8.2"; }; coq_8_9 = callPackage ../applications/science/logic/coq { - version = "8.9+beta1"; + version = "8.9.0"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ec2ced52eb4c..628a3f6aa45c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -43,6 +43,8 @@ let inherit lua; }; + luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; + basexx = buildLuaPackage rec { version = "0.4.0"; name = "basexx-${version}"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3cfa8f6e6d66..da301df65cb0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -297,11 +297,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.13.1"; + version = "2.14.0"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "0yy9q140jd63h9qz5jvplh7ls3j7y1hf25dkxk0h4mx9cbxdzkq4"; + sha256 = "0ap5bhm1h2ldyzlch7bz5n3jj2bpm4wd6bzw51g414pk9vksswc1"; }; phases = [ "installPhase" ]; @@ -411,11 +411,11 @@ let phpstan = pkgs.stdenv.mkDerivation rec { name = "phpstan-${version}"; - version = "0.11"; + version = "0.11.1"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "09p3cg5ii862p2l44fcv7hh400nsmxvwn1jjr929y21p01wsjhkp"; + sha256 = "0iivfp9945gv6pqhp01720rlwzfd260hbfq31a3mmimly721mnsa"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 657e1cb43308..05618cc5fb70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -143,8 +143,6 @@ in { acoustics = callPackage ../development/python-modules/acoustics { }; py3to2 = callPackage ../development/python-modules/3to2 { }; - # Left for backwards compatibility - "3to2" = self.py3to2; absl-py = callPackage ../development/python-modules/absl-py { }; @@ -176,6 +174,8 @@ in { asana = callPackage ../development/python-modules/asana { }; + asciimatics = callPackage ../development/python-modules/asciimatics { }; + ase = callPackage ../development/python-modules/ase { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -238,6 +238,16 @@ in { azure-storage = callPackage ../development/python-modules/azure-storage { }; + azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; + + azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; + + azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; + + azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; + + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; backports_csv = callPackage ../development/python-modules/backports_csv {}; @@ -262,6 +272,8 @@ in { boltons = callPackage ../development/python-modules/boltons { }; + braintree = callPackage ../development/python-modules/braintree { }; + breathe = callPackage ../development/python-modules/breathe { }; brotli = callPackage ../development/python-modules/brotli { }; @@ -366,6 +378,8 @@ in { fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; }; + fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + genanki = callPackage ../development/python-modules/genanki { }; gidgethub = callPackage ../development/python-modules/gidgethub { }; @@ -378,6 +392,8 @@ in { goocalendar = callPackage ../development/python-modules/goocalendar { }; + grandalf = callPackage ../development/python-modules/grandalf { }; + gsd = callPackage ../development/python-modules/gsd { }; gssapi = callPackage ../development/python-modules/gssapi { }; @@ -424,10 +440,14 @@ in { libmr = callPackage ../development/python-modules/libmr { }; + limitlessled = callPackage ../development/python-modules/limitlessled { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; logster = callPackage ../development/python-modules/logster { }; + logzero = callPackage ../development/python-modules/logzero { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; manhole = callPackage ../development/python-modules/manhole { }; @@ -450,6 +470,8 @@ in { mwoauth = callPackage ../development/python-modules/mwoauth { }; + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nbval = callPackage ../development/python-modules/nbval { }; nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; @@ -510,6 +532,8 @@ in { poetry = callPackage ../development/python-modules/poetry { }; + pprintpp = callPackage ../development/python-modules/pprintpp { }; + progress = callPackage ../development/python-modules/progress { }; pymysql = callPackage ../development/python-modules/pymysql { }; @@ -564,8 +588,6 @@ in { pygame = callPackage ../development/python-modules/pygame { }; - pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; - pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; pygdbmi = callPackage ../development/python-modules/pygdbmi { }; @@ -770,6 +792,8 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; + tenacity = callPackage ../development/python-modules/tenacity { }; + tokenserver = callPackage ../development/python-modules/tokenserver {}; toml = callPackage ../development/python-modules/toml { }; @@ -822,8 +846,12 @@ in { aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster {}; @@ -921,9 +949,6 @@ in { atomicwrites = callPackage ../development/python-modules/atomicwrites { }; - # argparse is part of stdlib in 2.7 and 3.2+ - argparse = null; - astroid = if isPy3k then callPackage ../development/python-modules/astroid { } else callPackage ../development/python-modules/astroid/1.6.nix { }; @@ -933,6 +958,8 @@ in { atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; + audioread = callPackage ../development/python-modules/audioread { }; audiotools = callPackage ../development/python-modules/audiotools { }; @@ -996,6 +1023,8 @@ in { bibtexparser = callPackage ../development/python-modules/bibtexparser { }; + bidict = callPackage ../development/python-modules/bidict { }; + binwalk = callPackage ../development/python-modules/binwalk { }; binwalk-full = appendToName "full" (self.binwalk.override { @@ -1004,6 +1033,8 @@ in { bitmath = callPackage ../development/python-modules/bitmath { }; + bitstruct = callPackage ../development/python-modules/bitstruct { }; + caldavclientlibrary-asynk = callPackage ../development/python-modules/caldavclientlibrary-asynk { }; biopython = callPackage ../development/python-modules/biopython { }; @@ -1246,6 +1277,8 @@ in { click-completion = callPackage ../development/python-modules/click-completion {}; + click-default-group = callPackage ../development/python-modules/click-default-group { }; + click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; click-log = callPackage ../development/python-modules/click-log {}; @@ -1274,14 +1307,6 @@ in { CommonMark = callPackage ../development/python-modules/commonmark { }; - CommonMark_54 = self.CommonMark.overridePythonAttrs (oldAttrs: rec { - version = "0.5.4"; - src = oldAttrs.src.override { - inherit version; - sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5"; - }; - }); - coilmq = callPackage ../development/python-modules/coilmq { }; colander = callPackage ../development/python-modules/colander { }; @@ -1432,10 +1457,10 @@ in { pytest = self.pytest_39; - inherit (callPackage ../development/python-modules/pytest { + pytest_39 = callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; - }) pytest_39 pytest_37; + }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; @@ -1551,6 +1576,10 @@ in { libais = callPackage ../development/python-modules/libais { }; + libfdt = disabledIf isPy3k (toPythonModule (pkgs.dtc.override { + python2 = python; + })); + libtmux = callPackage ../development/python-modules/libtmux { }; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; @@ -1730,16 +1759,6 @@ in { fudge = callPackage ../development/python-modules/fudge { }; - fudge_9 = self.fudge.overridePythonAttrs (old: rec { - version = "0.9.6"; - - src = fetchPypi { - pname = "fudge"; - inherit version; - sha256 = "34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0"; - }; - }); - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; fastcache = callPackage ../development/python-modules/fastcache { }; @@ -1785,6 +1804,12 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-music = callPackage ../development/python-modules/google-music { }; + + google-music-proto = callPackage ../development/python-modules/google-music-proto { }; + + google-music-utils = callPackage ../development/python-modules/google-music-utils { }; + gpapi = callPackage ../development/python-modules/gpapi { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; @@ -1959,9 +1984,6 @@ in { pamela = callPackage ../development/python-modules/pamela { }; - # These used to be here but were moved to all-packages, but I'll leave them around for a while. - pants = pkgs.pants; - paperspace = callPackage ../development/python-modules/paperspace { }; paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; @@ -2218,6 +2240,8 @@ in { django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; django_environ = callPackage ../development/python-modules/django_environ { }; @@ -2240,6 +2264,8 @@ in { django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; + django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; + django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; django-sites = callPackage ../development/python-modules/django-sites { }; @@ -2277,6 +2303,8 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; + djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; + django-raster = callPackage ../development/python-modules/django-raster { }; django_redis = callPackage ../development/python-modules/django_redis { }; @@ -2497,15 +2525,6 @@ in { fusepy = callPackage ../development/python-modules/fusepy { }; future = callPackage ../development/python-modules/future { }; - future15 = self.future.overridePythonAttrs (old: rec { - name = "future-${version}"; - version = "0.15.2"; - src = fetchPypi { - pname = "future"; - version = "0.15.2"; - sha256 = "15wvcfzssc68xqnqi1dq4fhd0848hwi9jn42hxyvlqna40zijfrx"; - }; - }); futures = callPackage ../development/python-modules/futures { }; @@ -2794,6 +2813,10 @@ in { inherit (self) systemd pytest; }; + jq = callPackage ../development/python-modules/jq { + inherit (pkgs) jq; + }; + jsondate = callPackage ../development/python-modules/jsondate { }; jsondiff = callPackage ../development/python-modules/jsondiff { }; @@ -3291,8 +3314,7 @@ in { rfc3986 = callPackage ../development/python-modules/rfc3986 { }; - cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; - cachetools = callPackage ../development/python-modules/cachetools {}; + cachetools = callPackage ../development/python-modules/cachetools {}; cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; cmd2_9 = callPackage ../development/python-modules/cmd2 {}; @@ -3344,8 +3366,6 @@ in { pandas = callPackage ../development/python-modules/pandas { }; - pandas_0_17_1 = callPackage ../development/python-modules/pandas/0.17.1.nix { }; - xlrd = callPackage ../development/python-modules/xlrd { }; bottleneck = callPackage ../development/python-modules/bottleneck { }; @@ -3769,8 +3789,6 @@ in { pymongo = callPackage ../development/python-modules/pymongo {}; - pymongo_2_9_1 = callPackage ../development/python-modules/pymongo/2_9_1.nix { }; - pyperclip = callPackage ../development/python-modules/pyperclip { }; pysqlite = callPackage ../development/python-modules/pysqlite { }; @@ -3820,9 +3838,6 @@ in { reportlab = callPackage ../development/python-modules/reportlab { }; - requests2 = throw "requests2 has been deprecated. Use requests instead."; - - # use requests, not requests_2 requests = callPackage ../development/python-modules/requests { }; requests_download = callPackage ../development/python-modules/requests_download { }; @@ -4656,9 +4671,6 @@ in { power = callPackage ../development/python-modules/power { }; - # added 2018-05-23, can be removed once 18.09 is branched off - udiskie = throw "pythonPackages.udiskie has been replaced by udiskie"; - pythonefl = callPackage ../development/python-modules/python-efl { }; tlsh = callPackage ../development/python-modules/tlsh { }; @@ -5161,6 +5173,8 @@ in { inherit python; })).python; + zm-py = callPackage ../development/python-modules/zm-py { }; + rfc7464 = callPackage ../development/python-modules/rfc7464 { }; foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; @@ -5181,6 +5195,8 @@ in { nanoleaf = callPackage ../development/python-modules/nanoleaf { }; + nanotime = callPackage ../development/python-modules/nanotime { }; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata {}; importlib-resources = callPackage ../development/python-modules/importlib-resources {}; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index bc166382a608..7d4986068332 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -55,6 +55,10 @@ let linux = pkgs.utillinux; darwin = pkgs.darwin.text_cmds; }; + column = { + linux = pkgs.utillinux; + darwin = pkgs.netbsd.column; + }; eject = { linux = pkgs.utillinux; }; @@ -182,7 +186,7 @@ let compat = with bins; lib.mapAttrs makeCompat { procps = [ ps sysctl top watch ]; utillinux = [ fsck fdisk getopt hexdump mount - script umount whereis write col ]; + script umount whereis write col column ]; nettools = [ arp hostname ifconfig netstat route ]; }; in bins // compat |