diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index 7c6955af812b..bedda76a3066 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -9,11 +9,12 @@ date: 2017-03-05 To install the rust compiler and cargo put ``` -rust +rustc +cargo ``` into the `environment.systemPackages` or bring them into -scope with `nix-shell -p rust`. +scope with `nix-shell -p rustc cargo`. For daily builds (beta and nightly) use either rustup from nixpkgs or use the [Rust nightlies diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index b9da712b86f0..7b25a39e83b8 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -262,8 +262,18 @@ startAll; waitForWindow(qr/Terminal/). + + copyFileFromHost + Copies a file from host to machine, e.g., + copyFileFromHost("myfile", "/etc/my/important/file"). + The first argument is the file on the host. The file needs to be + accessible while building the nix derivation. The second argument is + the location of the file on the machine. + + + - \ No newline at end of file + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 82e065968207..3b4f41171adc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -226,6 +226,7 @@ ./services/hardware/bluetooth.nix ./services/hardware/brltty.nix ./services/hardware/freefall.nix + ./services/hardware/fwupd.nix ./services/hardware/illum.nix ./services/hardware/interception-tools.nix ./services/hardware/irqbalance.nix diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 9070722c770b..5d13b90daace 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -8,8 +8,11 @@ let swayWrapped = pkgs.writeScriptBin "sway" '' #! ${pkgs.stdenv.shell} + if [ "$1" != "" ]; then + sway-setcap "$@" + exit + fi ${cfg.extraSessionCommands} - PATH="${sway}/bin:$PATH" exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap ''; swayJoined = pkgs.symlinkJoin { diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix new file mode 100644 index 000000000000..14113fe01bb4 --- /dev/null +++ b/nixos/modules/services/hardware/fwupd.nix @@ -0,0 +1,90 @@ +# fwupd daemon. + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fwupd; + originalEtc = + let + isRegular = v: v == "regular"; + listFiles = d: builtins.attrNames (filterAttrs (const isRegular) (builtins.readDir d)); + copiedDirs = [ "fwupd/remotes.d" "pki/fwupd" "pki/fwupd-metadata" ]; + originalFiles = concatMap (d: map (f: "${d}/${f}") (listFiles "${pkgs.fwupd}/etc/${d}")) copiedDirs; + mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; + in listToAttrs (map mkEtcFile originalFiles); + extraTrustedKeys = + let + mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; + mkEtcFile = p: nameValuePair (mkName p) { source = p; }; + in listToAttrs (map mkEtcFile cfg.extraTrustedKeys); +in { + + ###### interface + options = { + services.fwupd = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable fwupd, a DBus service that allows + applications to update firmware. + ''; + }; + + blacklistDevices = mkOption { + type = types.listOf types.string; + default = []; + example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ]; + description = '' + Allow blacklisting specific devices by their GUID + ''; + }; + + blacklistPlugins = mkOption { + type = types.listOf types.string; + default = []; + example = [ "udev" ]; + description = '' + Allow blacklisting specific plugins + ''; + }; + + extraTrustedKeys = mkOption { + type = types.listOf types.path; + default = []; + example = literalExample "[ /etc/nixos/fwupd/myfirmware.pem ]"; + description = '' + Installing a public key allows firmware signed with a matching private key to be recognized as trusted, which may require less authentication to install than for untrusted files. By default trusted firmware can be upgraded (but not downgraded) without the user or administrator password. Only very few keys are installed by default. + ''; + }; + }; + }; + + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.fwupd ]; + + environment.etc = { + "fwupd/daemon.conf" = { + source = pkgs.writeText "daemon.conf" '' + [fwupd] + BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices} + BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins} + ''; + }; + } // originalEtc // extraTrustedKeys; + + services.dbus.packages = [ pkgs.fwupd ]; + + services.udev.packages = [ pkgs.fwupd ]; + + systemd.packages = [ pkgs.fwupd ]; + + systemd.tmpfiles.rules = [ + "d /var/lib/fwupd 0755 root root -" + ]; + }; +} diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 9bd88ca1707b..bce48c8f65e5 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -125,6 +125,9 @@ let ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN + # Allows this host to act as a DHCP4 client without first having to use APIPA + iptables -t raw -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN + # Allows this host to act as a DHCPv4 server iptables -t raw -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 6c7fd6c575bf..90ac5b933f32 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -510,10 +510,10 @@ in { . " mklabel msdos" . " mkpart primary ext2 1M 100MB" # /boot . " mkpart extended 100M -1s" - . " mkpart logical 102M 1602M" # md0 (root), first device - . " mkpart logical 1603M 3103M" # md0 (root), second device - . " mkpart logical 3104M 3360M" # md1 (swap), first device - . " mkpart logical 3361M 3617M", # md1 (swap), second device + . " mkpart logical 102M 2102M" # md0 (root), first device + . " mkpart logical 2103M 4103M" # md0 (root), second device + . " mkpart logical 4104M 4360M" # md1 (swap), first device + . " mkpart logical 4361M 4617M", # md1 (swap), second device "udevadm settle", "ls -l /dev/vda* >&2", "cat /proc/partitions >&2", diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 04e68b1f1282..ca28dfb76b80 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.7.2"; + version = "1.7.3"; 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 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd"; + sha256 = "1w6rbq2qpjyf2v9mr18yiv2af1h2sgyvgrdk4bd8ixgl3qcd5b11"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index aa912f04efb5..c1aad8e570c3 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = https://z.cash/; maintainers = with maintainers; [ rht ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 746da7534e68..fabb0982d465 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -77,15 +77,15 @@ let }; }); - buildGogland = { name, version, src, license, description, wmClass, update-channel }: + buildGoland = { name, version, src, license, description, wmClass, update-channel }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; - product = "Gogland"; + product = "Goland"; meta = with stdenv.lib; { homepage = https://www.jetbrains.com/go/; inherit description license; longDescription = '' - Gogland is the codename for a new commercial IDE by JetBrains + Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language @@ -96,9 +96,9 @@ let }) (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv - chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv ''; }); @@ -239,28 +239,28 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.2.2"; /* updated by script */ + version = "2017.2.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1l8y65fw9g5ckzwpcgigm2qwy8fhpw2hil576rphsnx6qvnh4swn"; /* updated by script */ + sha256 = "0yp5h8ps5hfi07gsz14pp61skibfx48klg8qmc4f6q6xzcfdqxsf"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "datagrip_2017_2"; }; - gogland = buildGogland rec { - name = "gogland-${version}"; - version = "173.2696.28"; /* updated by script */ + goland = buildGoland rec { + name = "goland-${version}"; + version = "173.3727.79"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */ + sha256 = "0bmd7r3h76pg0s9m3i5qv7zfkcj3gannj0c12cw087b831ga7ccz"; /* updated by script */ }; - wmClass = "jetbrains-gogland"; - update-channel = "gogland_1.0_EAP"; + wmClass = "jetbrains-goland"; + update-channel = "goland_1.0_EAP"; }; idea-community = buildIdea rec { diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 52223dafeb7f..fd973d4fbdee 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.12.4"; + version = "2.12.6"; name = "${pname}-${version}"; altname="Texstudio"; src = fetchurl { url = "mirror://sourceforge/texstudio/${name}.tar.gz"; - sha256 = "03917faqyy0a1k6b86blc2fcards5a1819ydgkc4jlhwiaym4iyw"; + sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd"; }; nativeBuildInputs = [ qmake4Hook pkgconfig ]; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 66ff8b5a91c8..c87563293bab 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.18.0"; + version = "1.18.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0xwfnw15792lxr5npc71yyw5yyaqi3nifqgv6vpi8ibl6c8zs97d"; - "x86_64-linux" = "0qzj2qrzbdk27mggh0f9fs3s99bffvnrnbsparbzdag5jjmry2py"; - "x86_64-darwin" = "1g5rf6g9q9hh4gzg6nb37pyq9dpjj0wapivv5dsvmn0j3cp69cv4"; + "i686-linux" = "13gs0spqkbxw4i3a0b060v5bi68zfkp3i8vqk41i0fkbshnc7c7i"; + "x86_64-linux" = "0h7nfyrn4ybm9p1czjb48p3cd3970hpyn6pj8l4ir1hqygcq6dwi"; + "x86_64-darwin" = "093k8s2msi0xz11wy2yf1rppwkx6kv5psgii4w44l59ji8qgpamk"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e6e3585a4d13..1fce0695bfd4 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -91,8 +91,15 @@ in { }; terraform_0_10 = pluggable (generic { - version = "0.10.7"; - sha256 = "0gjvrra255m973nzi7rpqp5dn5npnd79cnv8vjcs7wmkdj1hli0l"; + version = "0.10.8"; + sha256 = "11hhij0hq99xhwlg5dx5nv7y074x79wkr8hr3wc6ln0kwdk5scdf"; + patches = [ ./provider-path.patch ]; + passthru = { inherit plugins; }; + }); + + terraform_0_11 = pluggable (generic { + version = "0.11.0"; + sha256 = "0qsydg6bn7k6d68pd1y4j5iys9i66c690yq21axcpnjfibxgqyff"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index d29bd9648609..675e3f768ebf 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.0.0"; - sha256 = "1x3ldlx2iryxwfaws8ng9n0k06p7n8xqc6sjyxw73jdasxbh8wgi"; + version = "1.3.1"; + sha256 = "0vsvvw1qdjb69jilhjl5g8h7dn82n0n23k2v67dqywhinilafcmv"; }; azure = { @@ -46,8 +46,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "0.2.2"; - sha256 = "1jdkj1zylrlcd2qkfkl81i0ybdpmvbvvsk0f4ahafiqp550srf2d"; + version = "0.3.3"; + sha256 = "0qq10gjwka0268ylzx5r7qhj0xpjh8fxrjr1fwbiq8sp6i1jb7sa"; }; bitbucket = { @@ -84,6 +84,13 @@ version = "0.1.0"; sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq"; }; + cloudscale = + { + owner = "terraform-providers"; + repo = "terraform-provider-cloudscale"; + version = "1.0.0"; + sha256 = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz"; + }; cloudstack = { owner = "terraform-providers"; @@ -95,8 +102,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cobbler"; - version = "0.1.0"; - sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz"; + version = "1.0.0"; + sha256 = "0v7j9r2ic3ks2hy80mx5xay05m6r52vclsbbbf9vb0srnrvz21gy"; }; consul = { @@ -109,8 +116,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "0.1.1"; - sha256 = "0nyqybi3fl9qlhpx2n0vjz7kn3bqhf4wy93zhq3j3853zxpcjpzc"; + version = "1.0.0"; + sha256 = "1kabjhq7xl2mhh0gvg87a9zh8y2k0h5ghcmb86xzvx25j3jdqfg6"; }; digitalocean = { @@ -144,15 +151,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "0.1.0"; - sha256 = "1nacxkyy12w4rj1bdf5ayqmmm47nwh362pcksr227rkwmsjlmg1m"; + version = "0.1.1"; + sha256 = "02lhbl34dq7lsby3g32969i4g9l3z6xw1v00shljd3amgyz2l2r2"; }; dyn = { owner = "terraform-providers"; repo = "terraform-provider-dyn"; - version = "1.0.0"; - sha256 = "0ph3516syca8f1zxmz66mh6y5kd8sc74kl0n8zixcgd6rvq0dysr"; + version = "1.1.0"; + sha256 = "0sx4h3drb230m69lsmafyfd2cfvwnb9gld8s6ky54115kd3nckml"; }; external = { @@ -179,29 +186,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - version = "0.1.0"; - sha256 = "1xjhpaq2agdshrl5jbq9ak2nxdy86iay5bw16zww2qc5ah21sdg2"; + version = "1.0.0"; + sha256 = "1kxmzdzdb6fc64i2bzch6020zfk0ygms9gh5mm1bypsyqmj4qc6r"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.0.1"; - sha256 = "0l0bpcfjnzlgf3g60iyfr3axw0244w99cf04z7y3bcszk5njipri"; + version = "1.2.0"; + sha256 = "1q3ypacsjc8779v1k81z0vs3kx6i340fa4mz26gscf85rx8bghim"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "0.1.0"; - sha256 = "1m2anc5cyn2p3yh4zn0y6wvzb0s2fz3sfdqm9psvx53266c2c81q"; + version = "1.0.0"; + sha256 = "0fsdin1rd7hah6pp3x568db2mmk66q0fhiplsri7vyj03n3z55v2"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "0.1.0"; - sha256 = "1f72lm95bnkhaf2accypdn7xsxcgkqri5fq5mriya4n34c61z3l6"; + version = "0.1.1"; + sha256 = "0i5pdb05qkd6h9zyr88ppsiii6g6zjc5096xblizvmiww7mp81gn"; }; http = { @@ -235,8 +242,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.0.0"; - sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6"; + version = "1.0.1"; + sha256 = "0s8h8nxsl07bhvynmgps07giqr2xmxizk1rcx4xivfc3q5mkvnhb"; }; librato = { @@ -259,6 +266,13 @@ version = "0.1.0"; sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; }; + logicmonitor = + { + owner = "terraform-providers"; + repo = "terraform-provider-logicmonitor"; + version = "1.0.0"; + sha256 = "106y74w9nhqs65h26ipyjg636zcrnpn5s8r49sg4kh4ynvnrkv8v"; + }; mailgun = { owner = "terraform-providers"; @@ -270,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-mysql"; - version = "0.1.0"; - sha256 = "0vjr97xf15va9qypjb9318h1nxr0sd6ydcy7ijnqb8538v3581mv"; + version = "1.0.0"; + sha256 = "1vkr1gg9adrkzlbdy0w0wn1ap5zla1k54kxfmd5jndw4hzgysi82"; }; newrelic = { @@ -319,8 +333,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "0.2.2"; - sha256 = "1027pqv1cvyvakn4kgivd720g9na38nam5bb5fjyd4d04xpq9v90"; + version = "1.0.0"; + sha256 = "0ddy62psapajbgnf7f998cnwiyak3lnk43vj0rl230dhnma9crpm"; }; opsgenie = { @@ -340,8 +354,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.0.0"; - sha256 = "0ibz9k1yfqkfsmqmv1pl2jwzbld0l6f7zd8y80iw0v5wswclswya"; + version = "1.1.0"; + sha256 = "0848y78jri1kzd70xcgv0p62yww46d0kr9zpqwh32m866xx5isfi"; }; pagerduty = { @@ -368,8 +382,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "0.1.2"; - sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp"; + version = "1.0.0"; + sha256 = "15j66mm7mkwblwncb5s0xbcz7jz99mzswhppzxchwkbk3325syyx"; }; rabbitmq = { @@ -382,8 +396,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.0.0"; - sha256 = "1fs8p0l8f79b1s2g0p5zlq1has9i7w3bmv76vrm79076v7w2v0d6"; + version = "1.1.1"; + sha256 = "1gs62yd31kywg2yhnikli1khai1n0lwy8pb3g7k5ad8ibffjskmz"; }; random = { @@ -403,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "0.1.1"; - sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6"; + version = "1.0.0"; + sha256 = "0zp9hhvlcn6cpnblwrr03icbagzk745b0lrm5bs23crbnddal905"; }; softlayer = { @@ -438,22 +452,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-terraform"; - version = "1.0.0"; - sha256 = "0icyyi4h48yh5235p5svm4p0jzbqqm1f3846dqy37czhjfcrn3gh"; + version = "1.0.2"; + sha256 = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v"; }; tls = { owner = "terraform-providers"; repo = "terraform-provider-tls"; - version = "1.0.0"; - sha256 = "063ai5zipmkwq0nr5c25gqsr970r8aba12ynxg9x8cnay0zn9s95"; + version = "1.0.1"; + sha256 = "0mzm1pkqgcslz3j4an1vpx92hnqa53ly0kp3zix8kp2kfnn17qky"; }; triton = { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.2.1"; - sha256 = "0ds2anr65xx9kdjv6x68lcxgl3js6l0m2cbx3kwx5465m01m3gxz"; + version = "0.3.0"; + sha256 = "0x8cws41mpxcwd4hf380gizhdnnfs2df5pwcc417sbp2706cai1h"; }; ultradns = { @@ -466,8 +480,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "0.1.0"; - sha256 = "1rr4gaqfr6panjjdb5xx9vbq7701zjps0l75zi526kij1pph98p1"; + version = "1.0.0"; + sha256 = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw"; }; vcd = { @@ -480,7 +494,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "0.4.1"; - sha256 = "0afxvjx9zb9ym0cs8j15s6nfp20rmmifjdc098wcfjmgnw6p7f01"; + version = "0.4.2"; + sha256 = "0k9mndxfiq5drcz2qhqasc7cqra0mfdwwwblb1m6lyg7flg7dli0"; }; } diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 5f868fc98584..5b70d7479269 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -16,9 +16,10 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; - meta = { + meta = with stdenv.lib; { description = "a safe and secure chat client"; homepage = https://coy.im/; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 7ac8091e1c11..1df72dbe5fcf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.4.0"; + version = "52.5.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ar/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ar/thunderbird-52.5.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "28a0114c665250f419d77f1f3898af6533e1b8b82b546ecd3ca9baf801751fd189239093eaecdabab9a9318fd47020b647086a31676158a21656ff7c477dbbf8"; + sha512 = "e848c7a44222be7bc637dc2d0356028e67c4093f48e4eb9c66e0c02731f41b2e1f2d09cd7765ee984137fcef4d498aac8cfee39b31c0fe5187347107b2cd12a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ast/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ast/thunderbird-52.5.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f7b9d53202597ef666ca87eb1f8cbb439af386eb78460558e8bef33502a7eac591d43751beb52319d046d780fb38a78e685fa8cb3baaa6abfef439bed6ab3d1a"; + sha512 = "a9f8888ab021e696c8460d75ba1f843f8b31555f3f6f95e9af7f9c6d910ea1c3d68bab3d5adc6c0f70e6d8d9227db4176a7db762d28c1ff19addc95e0a756826"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/be/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/be/thunderbird-52.5.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "a9a39cf4477e469774f2ce7b7012948911009ff2ab26948a177f3efa9e8ccbcb7d7f3d3ab609742fe1d177253dcdeacb78f7b4a9874f3156f6f54203d0ed42ef"; + sha512 = "4d903b23dcaf17d41c6b9f3d7a3ec936ecc01f19b93ecba88a5fe826f715b606064a6e2737611697c072e887f3776cf10ddba7e26a66dc4b91c3658129171580"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bg/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bg/thunderbird-52.5.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "38fc89a687344467f98cb2e31967aa53f3c502a8f288b5d65e6aa91a578b250c17750ea998d32d58511920a0a5a1224e77e2691a381b7526585e341712d82cbd"; + sha512 = "6d34b3c3e907a16125f26f5f6365b5c3f2127ccf725753e94495b5dafedf3c506e71017d2b4699b755f8940ad0ea4241d6cfc00e958d4642c928c68a7e278fdb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bn-BD/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bn-BD/thunderbird-52.5.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "437d943339c4955b5264f95bdd4aaa2a91d448a393e6561bbb41c078a960100962c1d51bad73172c5f5cd691f713ab34c218ff5c3e3cde3641d8a6ad604f6d75"; + sha512 = "74106efb92c5ba792a3f10dc0ea19d2fc38012f1f761c0e9b9753f8b067e2771a9c4691df55197a9b5e23024f73688bbc26d24357f0eef95b8b305bccad5d9f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/br/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/br/thunderbird-52.5.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5c43e3cc4366792b7c7a44ae36fe2bd9e6b459f540868dcee767193826648b03a4e4a447f83f5787036e48c96e75639a305304e050a91f0925d9ee4db97e5b75"; + sha512 = "2477afe645f7c0e0005a4817a42d24075dfabfce2724446bcd4fce50b72b7408895261544537be0e3dbdf8323e1af07215ca277c9e69261d575cdf4fc1f242ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ca/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ca/thunderbird-52.5.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c2243ee5f160f786ebced364432b4a3b489699a3f024a8da327cfaa3c5e2d0d58884870311416fcb019723d5bfec8294440c701c6c453c15346f5f765c4449c0"; + sha512 = "810c5295bcde18217b77e2f147a70a5e94798b92c40d659c47f3f113624f049b788ba9fdcdc22608cc57719e8236372636e6ca46ce7fde309b70fc05e3036f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cs/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cs/thunderbird-52.5.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "332faf549d1d988defdce1531fb4cc81e5f1565423f3e24ebfe16581275224539ed50857dec04c8aa66cc55372a76b676816831d08842bbafd227ca3058f9b5b"; + sha512 = "f8e033ed566d6b076213e33c489fcfcab520a0e1c3ce5c89c78c7443b360e55136e90b518428527a682854a24cb9b303a6c3475a59950d9546c1becd5db2a46a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cy/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cy/thunderbird-52.5.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "bfe220ed1e1d8d156f0c1cf7ea11b0778bc0b23f7335b90c65bf581c9e2cd22db9a7f5d48d7a6a95f1d21693714a216d2a24249f36aed7ce097f205d4d05d6f3"; + sha512 = "27ade0c53cee3fe125420eb7fdeb5b013771d34af735bacd59af6681836d81acddda3b3b9cefe3f8a05b70703c040d6692732c427db13e5dd971848c078ae7ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/da/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/da/thunderbird-52.5.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "dcff4359821cb6b24ba129671a1716394afd642a5c4b887a1905baf82cf5d2a94512a547780cd42b1478f443f59db5a3363a52d719824af050dd69af54f97a02"; + sha512 = "11de17a749643d35bcee49ebb1aa62caeb6806fd0025125363f228593979e873fbf8a927bc451c2e4a5332f431937c00601ff380d74e48bed60cfea5399b891b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/de/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/de/thunderbird-52.5.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f5071c052814eab801f3d2c98751c05486b211f23b511b27a1ad5810634b763ada3bd890288e4934c16a28742ef023ef089de9d84a188f6e19d07f471b289583"; + sha512 = "3d2408f523d55471f0bcdcb3a05e66381d390f56987b448a40118b1f0e3fb66cba8ed64cb3178694873f5ee0c7f5a74303ffa288eddf7192a4f519d537ecb65d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/dsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/dsb/thunderbird-52.5.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "522d365f32b28620a7936cf5a8fb230db6fee8c1ae055a27e6649cff8559811684168eacf019ec16d6268e405607a576d46e1d5ba4759c1e3fd10736d7560370"; + sha512 = "d1f560111bd8d8eac360ed39b0ac741ca10c480ec528cad48e9bf6544d17e12fe2f41d4abe4caa3549b448fd1fb55416ed84fa864dd60fe0cabd91766e754992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/el/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/el/thunderbird-52.5.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ecf3dcadb1a82310494063cc317ee248b91c30594ba89a9c58a71349a423cf9e66c5bd06be4d1488ee6cd5027187bae1364144037b9ac3cd4bc8af7cd4396810"; + sha512 = "22c3270759d095c4672694c0885d3960d87cb9f53eedcf7c030f8a38f204d4809914b3fe1cd144f32555508eded73999907c64df2d9ae9494c69ce879180278f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-GB/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-GB/thunderbird-52.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8ddde6cd0270cffc26cdb4c4513213405b71ea4315d69a3b1bef602bbd58eca30bc09d0ddd41996cd77881e2d678dd13a93d07fa833210780dba146a931db383"; + sha512 = "3e778e8f60101d2371ce7eb369c3f80c26fdc8164f5fcc78b8f65f2986288388e06d1413387b493ae479bd95b3af7fdd76f88365aa5803c4e9e3bb23e4f3aa59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-US/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-US/thunderbird-52.5.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f"; + sha512 = "d4eb0d90d621b28cc706bca0f6884361b7fd53cb02dd9ecccfc3f6027634353cc8f4c911824ebe6bf1d7bbfb06318258daad32fd47687f2f3b930c90da4b8830"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-AR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-AR/thunderbird-52.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "931644cbf5e7b4f032f607a52a78f553a7a2ee8fc77fb7d0e73e6d276a6a1ba4a724cc91921c5ef5ac5ad21a3536ffbff264b80eb8d8a658133a24ca0b869456"; + sha512 = "0088b0380aa533e4c2818e0b384f5edafeaa3c84256e81eefd0dff95f27adc32c8a22b3368576d13aa1276674f519333b5c3f4a825fcc38da1abd0751c48f996"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-ES/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-ES/thunderbird-52.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c2673d9f6b347493e3fc807cec86f55300a6e894c9c1edd7f7bec63cb073fdda2e9cf7794269f02f744280788bbcb8e42ee6249c317aabc57f91cbaa3635492f"; + sha512 = "251cf4cba82dbc10bc38039348894843b8f5c76875be72ce5ea1cb26cf26939055350e61a86e8ed9f63964bb95e99aac5442389c87588829e45e9ef41709ac7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/et/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/et/thunderbird-52.5.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "dd634f76848fb990b4fb1bd28e2cceafca651280ece9ead3aad6b9746d0eaeef76b5ad925163a68367d84f66949e799e2649cf358ad0949ee4f2538c71b8914b"; + sha512 = "609bfd8fd7f8dc17b52173de9916133e0cd52e41e66a488ee2bd1aea5078cb9e08084c10d0b20be36204bfc3f785574500e2bbf9a81f307394b169068ef3ff07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/eu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/eu/thunderbird-52.5.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1c9f04cc1b32ffb21bfacb186f327aa945f36f12ae316a9cff8b2a4f8584ff8847ac5be1c8bd898ea1a71fbf3294a2f54b270eb6f0b63abb3da3178c6a125600"; + sha512 = "ebbc42c9d491f0f0e9ac5528d58c5d8604a913d77fb3d4548cb0127e356817c729c1ce87fd7874ae6f688268ab64b8b898611780b5c6b11707b455f529ab5f65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fi/thunderbird-52.5.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "03880d8334ede087a419443e9fb56bcf6727c652f435a366b4b49fb6116a62225686297ba82f298378e03267dc1aa50e90d75b81ea277a7afeb93331c45c3459"; + sha512 = "807b4fe85c2b751e815dd4ac19b0e80199f391f7a8fe7e7f5c1f7f75e896620ddc7b758aae076bd44f9cd7774b2020640f858e139db57b508919d78caa77d913"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fr/thunderbird-52.5.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6f9909df3329a32d6d0c2203b484fdaa8b54a17849283bffcb04298601a284a6fe30eac20ec6b3a97ad2e8e3d4e0360c6145e87baa2af11049ae0d94fe9dcd44"; + sha512 = "d2d6e92815ed9176a2743578c32ac82150d4097eee6bf31356a9bc1cc1ba649c86008d301654e291bf0bf5ae2d81c13d941c4203aaa9dd3c4110d36a34f28140"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fy-NL/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fy-NL/thunderbird-52.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b20f130ad4a9b0f8448707945773cc76198e04854a0114a06379fd33c3d5abd9abb1f14e4f145df9c1c46e5d1e09522af640ded99f4f20543fd444e365d81fb9"; + sha512 = "bb5e34f15d63abecc4b68a74cf818def59caa2de47c9ab71458ca79839fd29f3fc2476b5e38a95d5d5252acb03595f0e065bcba5eaba6ff2eba29be66607f417"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ga-IE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ga-IE/thunderbird-52.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3fd6839351470d65f14165e3633c80950270ede2c4c9e658c001424126ffbf29c7bde86a720ca33e50cbe9a5306f0339c5cd491371e3ad03a6ee575c75889d63"; + sha512 = "e6f84323e42ad5a0df546307ba0a87be57d1ead7b7a807ffed4cb977b5b4c19c91ce8058794da07fb1ce678e4f8e59838454deb9a19232a5cd7d60c6cbbce74c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gd/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gd/thunderbird-52.5.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a7aae188c866586606f9adb82d5110bc2b89a6bd757191e798b9b2dc799916ae56cbc82932f4b8da76e88a3c1f5ffc828c58aee0cd8f83ede19bde2be2164b79"; + sha512 = "1e28be9ff5c3ccefc320e020dbe574f9d5f8319eaa79e441ab7f1283557eca01501a2e0f4aca6af6e58157b4c1686422d70a258010657803ceb272b900ad3e3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gl/thunderbird-52.5.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3cdab0c553f1d09cdb4dfd1160371eec3d1f878329dcf2f81a177f17647f8dd9b73566a56427d2a593f70f6aecfec951e3dfc2a389c838a4069e5f4db68c10eb"; + sha512 = "db2d76733fb97558d05b3ccb963ad82ab6886d1db32923bb73e4a62bbd80353fb7d7cbe4e1a82fc9095d582e467fe9a045d82be0aeb319fddcdc88c530733381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/he/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/he/thunderbird-52.5.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b71593a5c7cf8fe3960c701f5bce270366f5717b7ccd2a5f20dcdf402d1435b79db06662629deb4bd28e24b251fd2fa1a71a9e932f132e2df7a25ab5a8849de3"; + sha512 = "1b4640496d3a1acc7b8a146c8642f25dbc5dcccb7a164fb49a0ddad41e5a43d571936111154838b149bcee091205f0212926618ba5f233aaee051d5def345889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hr/thunderbird-52.5.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d55deeebb9605565ae3c062c8617d7e351f2f514c13f00507d75a5da4ef8e8d845247147d2aa111d4e78c57ceb01404ed3ac2bb69883bddab7b59ce0ff5eff35"; + sha512 = "5d4e361e7597b4dd0a896e38e31cf737dc1d51e87c09490a298147e4f0f395989567de2edff69f862fccc860dd0c18b24d2f91356736294c71429d22f47eab4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hsb/thunderbird-52.5.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c177a0e3c6074eef1abf086fa34e95b09f39a1529ce640927b7be6ee8b7ee8c740ba4e2afbadefe3fa83314cb7c3223499b1a5f08e3b4e381b60bee1ffbdac7c"; + sha512 = "40b51097b472a36078a7de4ed35446baf9a3a5806a92f13d49cb0024ca154e511195e6b470959b6084ba689c4475224acb81010f417618686a4e99efc624754d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hu/thunderbird-52.5.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1442a03fa4367d1f33337d0e88a193de8a6992ab8aa91e28e4a46b8f1860a3cc346d15c00d745b5074b8dec1beca5dba182b5fe2e87827e7ea83b82aba28b721"; + sha512 = "01a11e4e59c527e43d13c5c12dd95665bea7aad105d9ee9988e94671e394b7a55c2e85154e1bfb200d9290373de32d7c33ad1364e6cf2c189d8c9d8b52fb813a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hy-AM/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hy-AM/thunderbird-52.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c01325976516765a14a196ff04eb3296a2dfd81670cbf4d693682e78795b14b54f4d2801566f0ccd52c52f0b7100b6040f4e3540c4f3cb8c8b92038e059df45d"; + sha512 = "bc3c78d1d3da660c66b64930d295f3e79467684d178c831ae4f2eceb9d9c7753e5f1b60453fca674346da5e6eaf3c835df7340f0cdeb0e9040be546aa69d0cfc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/id/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/id/thunderbird-52.5.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "db56686b1d8713da9584e03633bcb2b14706c0b44d24484d6625de638eddcbdad1b1afacecf7dba52db6d18b2bbaaa15ea5f4d492366c24c5e2e212050f16c12"; + sha512 = "d377473cce2365f60aa5a65680daa2569716f3c331d20427f3d9002a72b42c0356e112f943db228a026f0d8cd5319168a9f718f3144b4c0a93ea3209c9003680"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/is/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/is/thunderbird-52.5.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5423202ebccaddd114393e5a2038b2efbe93fd528dc3d7b659987ab5aa2a4ad82921b3b835249285135be67216eed03de6d58b72800d9c7bf87ec812a37f21ab"; + sha512 = "bf41f55ef16c9ec322d732174a1076e5ab6a5db12f861891bb0ad1becf2b630b7504155505789e9ff7778b6c708642da55630aa20c0c18ccf11734572f62bab4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/it/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/it/thunderbird-52.5.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "b64e31155c73f13cd84bb4488e63df5c95473957c792f63f8cf25308d2b860b084aa6beb519a7666fde83d3db25e28ffb1064ddd0abca73ff631924cfa83d7f6"; + sha512 = "eef60e791ffabfae57c4e9f4094a39c8cb5c61ad4a8296aa111c6ff4e14f05bd86d4f9e682859ba6ae4e8d0c10001403d21bf8fa54e7c5688ca9e0ff06b4d2fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ja/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ja/thunderbird-52.5.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8852c526663f69b038ded6bb1382e02de700eab741cb04ccb8d3e329ee4534477a6ea402134a76fe82a020bad279c66e70bc06b0ed8d0fbaea9aaeaafa051b44"; + sha512 = "43dfc61aebfd6b80651900b1bd066e3c731e06854bb375d2eba206733d4bffb42f9b0116fbea0853f2aa440a6873cbe9e188ed528cff25c8634d7afb59e9d3c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/kab/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/kab/thunderbird-52.5.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "b08dc52afb713142e11805c5b99f73a11bd3c16756dc5bbb6a0c3de13cc801f27438887d8733cf4b97d70d4741abcb0d8782b9e6f6ffc359f38318f1702fcb7f"; + sha512 = "e75c653e6dcaa6a3116aba962afc6196c29e9194235b726e3ba0b4fe050129512f6d67358a2ce9e2b6879f6f52c6ada583af10b70cddde7ee0b8fa72edacc40d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ko/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ko/thunderbird-52.5.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "0de39397e4401ad939dbce0c02e35505c593398bc2078ad19d680a797a8cfa3f0950a810c8650634e3d40ea3b5265f9e193b77408f1588b51575d87446a336c9"; + sha512 = "52e29e6b2996a59dc4ffeee6f7a35f7a491e1d44af370ab1537d0a45c8d9ab8b1bf972a24f1f2efbcb6fa1d8e9b7b15c7b0c00d5aaf24546fe7860c7a6f97afb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/lt/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/lt/thunderbird-52.5.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "13842d9f210dd192e2072c138d8d0778e85d028dde92b08e616dff6ba62f84b6aa36363a259dca69bb006850de2fb8c42fd93874a4befa970d817aad34d47b57"; + sha512 = "d935c882dd6a9a3ad5a6c5609047a6e3c2c4146b198e8c28657ad166d7b6ad826e6db0e4c88944214521f0cda0907281b50a6088432b574d1ee13e5c504c939a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nb-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nb-NO/thunderbird-52.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ec9c96abe94ac17139e9fa83ac2d7ca8ddc6889e7286a4d31e61625db6daea3969fcbaa0796ae0bea41e3a433ed3e170a73c4be1a177bedcbfcf705e306e28e9"; + sha512 = "bd607e451f2601483aa4d59cf6225318a3bf1b2066d0f6b76c64025de0b20a8c8d8211f95b953440505248905d5b4dac569cdc610fe4d9d658a6ecc124966b82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nl/thunderbird-52.5.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "52e117078f1871bfc7b549a47617d277c763267f7033136c9715223d8f876184c0b5012b193a5f497e1fdba78b902a3c38651e0115829b0f5ca7f0cbb1c439d3"; + sha512 = "4767403a33047512f301617dfdc779f92e001114a06f31244e5b9a648ed4a7a96c6fa16194a803682417d151f2f9d61da241065f15cdd2e5953eb5ef41220093"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nn-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nn-NO/thunderbird-52.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "24258bbf5e3643544ba5db26fab9678f7e2a44b390ee993be4a304d148b5a57674158afd308d6ef93a86c8e525b37e1aee55ed07be6953301f164a2da00688d4"; + sha512 = "f2fd66bc8a520f90fb65e5f737ea25e44f5e3270429cfcf878e4b128f1facfc3bd29282586aa6ba73478de04cb796322436d14580d86fb5861072b6722e2ef87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pa-IN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pa-IN/thunderbird-52.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "e9d8b4e6019d4cf1ce562e6cc9b9aeac0e93d8b9ac9283c7e8f260b4d611fe2bd0bf6d71c9f82c9d2cbfba5770659d21cfb03fc2deb36b80be0a424178a65936"; + sha512 = "8e4c38febf02e61b874f931b0cf03221781ed9543f9b7a392ca9122f101622c20135f0fd94e5ee7696d0741a9910e1d1031fad3c825941d54da1f56a2533b61f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pl/thunderbird-52.5.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "81ced2424282fe6dc7ca6f5e043f6c42ae87cddef900b73fddfe6cd8c488a90e3099824b57d0971816a60c3f43ce66e1799195ae21369958b2e8085018017267"; + sha512 = "3e6fda867feb132f37913a8b2bda2ff2736f4d804e274f01c306d387b3c48fe30aa04b6f85eb4a7fb444036bdd4b3fcd4f68cbb53244d85b5064aa36c3588cde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-BR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-BR/thunderbird-52.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4120b94c13a9fcf1aa31a2abc3fdde27ef8c0354550ae8511b61641745cdd5eaec16e1ddd1d22193ca6680f070b71c188d94cdc75a40fa1596fa88ed59545b28"; + sha512 = "662e0616d12fcb7dcfcb98a4e07228509ae7ad731c93d2c90a7bb7ebc3bd0f9636563a70977db14733c832220258eede361526b01132dd02a4e44b16acc6a5e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-PT/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-PT/thunderbird-52.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a89dd739da5262713c99aa9aa28544e48710e80b83770810b240681ff0546c3b3faa37b48ae56c018a6d1d625f0411df557ced12eddfb3a1198eea474418eb68"; + sha512 = "8037be03b26263f3a1e69c4971cb70db50f95356c97e3252f76f080f5a7961c1b2ac5aea09d2e142994c5fc91c91ab8db738e5a104795e8506a06c997977930a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/rm/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/rm/thunderbird-52.5.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "3665bad7a0d1f2d725d0a44ad55918228c2d9cef49112fb19d2c3d885d1ec62af89c15aa0ce96ddebdabf97c8a5e10fdd58d892c085e5b9d17bab6658e7bf444"; + sha512 = "93a76b870c15b61a1135e405f76897a86674e1fad2dfa9b3a71cab83f99c9369b7363a395e813536492a25133548f227f5254795cd20de78f127c969fa3ff5aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ro/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ro/thunderbird-52.5.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "07afa28b22705e0e84e17026d04111cb9a5283838fcb94225e2c05da1fa0692770b17052c52d8cfcdb7bd3372fdbba9cd9ed9bc16f6f59f2e3ab6f4308543d91"; + sha512 = "4a535aac1f6666d20c7aee65ee974bd545cd4aba56fd0ea2655d89a532b60bcbb174b8046792365041b431d3d3099e0c273c5ce83f1e1f3599a476028b482f37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ru/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ru/thunderbird-52.5.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "189c40a8d950496d62f980180502ad342621caf3a2ddffb0fe4f813c9c2d4a25aa375d8ad70c8b7e8ff85f09607bc2ced3366524346a70eed731bd8d9409e5d2"; + sha512 = "ec56cb45428ce24497ad398716f99f49d6a5787a042855dd5839e5185d43763ea87b89090bf15c571841aa0526f5b4b0fec8958bd673a39ccf33ad5f2937b33a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/si/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/si/thunderbird-52.5.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0b6ee1e5ca86472a5cc67cdc242a6b62aeea50609661e369c8dd3dfac5a774f50eaf0a68973b1fe5d6d9bdf6a385c52a90b8711c80facbf9fb301981a7aae395"; + sha512 = "e1b19b27571cc833de579d1460d27629042529480546cf3de11a39608b8d599ffd19451ae3df96390009e95b87521f17e5843bc77251c923823d3b0529167f17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sk/thunderbird-52.5.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "9c1f164a2da43aeb51e8b64115618590ba0e9284f3eca8b16d3792b33e269a0acc253314ab7943cbaee94ffc2ae321247b4982798d9d48608e85a935afcb6faf"; + sha512 = "d20d0649426fbcc812b536d368ec5785b32def01b91d67776d5776a7fb45d9c723e1c455d20eedc7825370b03e484634ea42fb55dab5b3c860167cbeb8596c7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sl/thunderbird-52.5.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "5d4698be05af9f9181af63eb3ca6718feb1c74c81f0a6fbc82217791c911dc5f14ab433d32f6484ced2cd75d5db4b76aff3bbe420d619afcddfcbcaef25873e7"; + sha512 = "c37ecb24cc9bfe2d31459590d0882fd9cf196e822a18105b61150db4049bd52c31bad2a05ebfb710bf1d1d879a22b3e6fdca08ec81663e1c1735a4a2d157b4b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sq/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sq/thunderbird-52.5.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "32d62e6dfe28c67cc7b0e2cd27c96fd7c7e1079790eb73a8731af44e8a62f8fd1ea2e7298dc772e3014fc8255f022f38bbd5478430629140d0dca9ba0daa401e"; + sha512 = "0ed120ba3b39f884784269a6098242b8e1298bb4287749b901c2702d06c6824f762942bfe05a0dc1966c19e883239b09312139ee7eeb2cb22995d47aa2d124cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sr/thunderbird-52.5.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6aca04c1b4378489239cef6b5032ef6dfd6d39d84308c335d03e97ea7c48acf021f6cffe35d652e117f71e6ae3f31f54e5ca73a44b4dc51dedcb3f5faf7d016f"; + sha512 = "5e83710d06507a40705ae5177e4749c31aed4e932efc0c51f8da6a4b30d598328601f8a53b9fc0dc35cadcc130bb637771454d9cf55e8dec2b934287213e17f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sv-SE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sv-SE/thunderbird-52.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "099e22013b8d6791857c378c0f94373ca42d35bbc442cf273c9de2360ab8e64d712eccaedd5a13915ee19a195b6c9f04748ba738e7bbf9b8153edc4c66070d31"; + sha512 = "4cbb20b1d818f0238cb0d5235ea82a1984b8dd632467ca91e3f3f4e8ba58de904603d1135c8a7ea359188f1b01a6ffe8d654a2d0a73b4af1f3862011d697f755"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ta-LK/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ta-LK/thunderbird-52.5.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "d3c95f37ffbbc5ef78b7c050a4e091bd9f36fa9529ed7c38e25f5495694c1b792d0bfcf53d15b74b52239acb21bd0d235ceb07c7f68f99e1b31e59e6f6282aaf"; + sha512 = "3c2397e9b9e8abbbef10af15cd35ba086336daa5c317ba60d4489786b3ae4fee89457f2b34c0b42ea550000e8536ca3fee94032848b11dbb2c4cb6fe489efe6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/tr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/tr/thunderbird-52.5.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2f79b9d45d747424a65271033a75a86ff503694d88a30238452fbf817ba153c4638395d3e59f5f6cc662ab3361d2304d5a4c925957d9d6e6d7bddf34947acdf7"; + sha512 = "9360797bca24f5477120d93665f9b4aa1614463558b6646e2813b31fac5b5bf84d5e88a752696c28fb51613c288482e3d88197ded2310b66515582b11f81aeb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/uk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/uk/thunderbird-52.5.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e0d891b4cc082e32d3f6af318f9224e996a8ed3c7e1385bb86a5e2f963239999712c444fed00d779320f6b06efb38f3eb97023e353f91eeb7831b44a870c6394"; + sha512 = "ee521d20fd5e7cc3f803f74ef5a9ecc4c1df8b149668489b28cc212ad2d5c765bda838904ad726b92b5e0e2eb35c2ba6fd4f48ac7c700e41e896e0e976fe2028"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/vi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/vi/thunderbird-52.5.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5a9e13e126c7bc8ef435b8edde1896b9773ce1dfc39fe3fe1bb31e54fe4f592acdb3db360fe0890eb35b1896aeed0954bbd051fde6116b07cb513b1390ee56e7"; + sha512 = "3d7b7cd1f83e80290f460829b49b6893a73871456cd10ab22da482381ece0ac14fac3e5c0e2fdf1e61d463b7c211c33ec8d98120fc0bc17d2052bbbcd4e16af8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-CN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-CN/thunderbird-52.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b0374f022c2a259076d52bc0dc142098975f9f1d3a886192332fd1c1b2a5c9dabc0d3fc1a7fc0f28f6f17979931b9c78a9682be1226ff751446c5427a5219a51"; + sha512 = "c0f9902bacbb659f5f012f30b6190d4e3e53baa7e4473cf231da0b7c509beb98e49f0e4fd1ca3ed9917c54279609ce5fba1c51b80b12aeafedb82a83218856d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-TW/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-TW/thunderbird-52.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "7e289afc737339be5a3db5869125d891da65fb75a62b7670c3880943ae11bda33122f81cab46bfa95223c45662684b8fb66ec11cfc5f375e024f4d57be098684"; + sha512 = "64dbbbe05b3ade46901686fa4733cc7c25570d1f02b378a2b2855b75905e687db9f97db852bb53e2baaa1010a0ff365bbd90060eb7cec7db745faf014c5e5564"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ar/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ar/thunderbird-52.5.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "872ceb5933a562d352cb3bfc6e9cc95a7485625e5256380cae367d38a560f75bd7964fed1becfa5359db3befbe4aa249f114df307cf14e2db75dd047d87e5c53"; + sha512 = "1e6449d23bb937d07fd28049ef4e36b64c1f36edf3f4def640dfa6412d354ec6acd5b1642e0b266f18334f3ab7806a9cbb016946c0a36ec4222cfcae39339bcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ast/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ast/thunderbird-52.5.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "9955dde6ae54c096dbc5e5a28729963a72997fda97505657ccec6e0b5f95f35508815fe663f266932c79ef91463ef6c5da79ace4c19149b17dde9655dbe8017f"; + sha512 = "38f0fddb28d8a894798e9811599e706e60ff80131b22568e3dc70ff7f43388acd6de5ee4485587c59fdba8f790b393f4f16cef6bcdd86b928f3fa1bfff7297e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/be/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/be/thunderbird-52.5.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "94106fb12bf932f3a8217f3252b4f76394f13cb19c602d1b4a67e4477c3a0c781c3481ac973e40af7b306fdb32c88d4c70f8302b14e693c7270e2afab0dc2539"; + sha512 = "0966c3fdbf73a51d2c7776918abba4b77392dfe2308aee36970cffcbbc3e1de537625c0b5881a85eea74817b33055278d976af719773579885b3294746a3ae50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bg/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bg/thunderbird-52.5.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "194a420d07f952f7d088cb15fd14dce30e352dac13e543321e94fc60b7780678ea1ba51d450aac2d7566a8f23a583cba70e3aed373602ac896e0be13d234f8f2"; + sha512 = "a0a792063a3eaad2d15f4b726c9ed170f59f99b1ba9c966fdcd6471865dcf2f25284ab5e4e28641a66fa8ddcb019f8b8f521d69f5ed5e8d1ebc2729abd9be8b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bn-BD/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bn-BD/thunderbird-52.5.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "08a439a7fe40121f318131b035e7a5a1b44a56a6f3434b2854136103b0e11fd720540352ed04bde23f33c7ef75cb57eabbe86425c8f2e440f92c9260ddf1a902"; + sha512 = "ea583cbba8a0080a5529fb91988a0ee1c7aada1447b616e1ae43b6eff86dde87768cb4fe90fdede8454ad5240d266bc5e6ba9f1e5e05f2ad82cd3ef68ba374d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/br/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/br/thunderbird-52.5.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "68984b8fb564e24f3e331504a0c8a2e88cc1021319b2a47beeffd145eb42a19bd555aca495ac60612efb191830c273c473e0c3cd5844f109e78a4908834926b1"; + sha512 = "18060c8473e82554ff793ba495ba6760c7d7d8c2ccf8fdafbb41589c57474baa0a88808d154a29f6359c657bec40d9d164e53066d44bead78d4661b229522783"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ca/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ca/thunderbird-52.5.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2202c43a63bb283d9eef16c27e0d6125d43284b9c1acdb8cbbdc71f3a9d6f6d527c4a03363dced911321f28399a86ef25defd294befddb8fae41912e17c2fdef"; + sha512 = "f63dc5e923d8e60470fa4e4bc5adb8ef629a82dcca84a87a6e742e9d34a8709cd0946a85bf5822b19b5ff5c1c34b6e290439f3e3418e4ab86844a0ff54c2632a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cs/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cs/thunderbird-52.5.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d01c6ba52794d3850656c1538e46b64eb69a7c1e3a17347ab5cfda9fb1e91976a4bfc7096f7d12bdf2f15625387aec7066b0a25879d979687c955058b92ce6c7"; + sha512 = "72e1a77e10105a757c51542bb236d10c417f96f58c3875b63112c71848ce023c8754971bcd34dc5d2a48719070939d3733df9dbe4d2218e7bae7e89049d067cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cy/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cy/thunderbird-52.5.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3d056c91e1599e91249774cb21d8fbc887b7bab38546aca1815ca9c49fbf4d641bab2427f03ea993a72dc29793feb1cb0cb26217a4f6827e9e0d9d3cb5e3ca0c"; + sha512 = "4901eb53235ac29cdf685dbee78db301abc1f088ea9df585e388814c8f48d81aa0daf816f927b0c7d6df7985d8dd1e64c0c1cc26026f3ad9625251a72b666692"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/da/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/da/thunderbird-52.5.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c940d26284c8ab0a45bc6a55b67b467df7ac160c8774f0e2e2deb9082ea9500142a1d3c8851031a7e7a1763fdf5348c14de57d7168c3f1bb23fed3cf31a1b09e"; + sha512 = "0f061a7ad1e3b113d7b954487d661b4ca57a0ae861770c44081257a069e324388ba506b27ef0123a240cd949edb4ae60f500712c0addeed146cb922c76bbdc32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/de/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/de/thunderbird-52.5.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b1b63590885f30797ae9825f2286deca69a82a73e7c407be87fa92280b904c0605e7047a402bf6ce1e13936933a27efaa2b35d534b23f745a2ab4a9538d31b47"; + sha512 = "12ecdd09f77035ece4161c97cf4ae8bffab6a7eb46c7b9a2f7323dbcbdcf4f3d1bfcf5fab4d40b2887fbf64b541c0d5bac54f1b8f73ce7e31bfa201e955077c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/dsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/dsb/thunderbird-52.5.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "fc81fbfcc6533d34fde2e08351dea6d7e2a561a3620a6d0d225dc1081f59d9927ceb0abfca7c2d21b1cc727c0319646a2f386c022524178e90aa6bba344371c3"; + sha512 = "54fe7ff647565d5b82843d879ce3f791b2962bb034ec2ec2d5ea85cea3019ddae49f9f45384751d1a2d0f879aff4203a61687a4432ebdb948fd30569b6ddd7be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/el/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/el/thunderbird-52.5.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "baf8d0a52fbb12afdccd003209614ce8d5b4062336744ee783a6c3e7eb5a542c4da233fb680f320226f3681b440ab1d0717616a3664051d231b6638729903b00"; + sha512 = "d667a2d4f3782c30b308cfa6dd13ad321f6b7108d95f05c68dabe085228de28439f8e851920205404e48849829e65a07601ddcc553f3c73b08e233175805f046"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-GB/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-GB/thunderbird-52.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0f5fac2fd3da05cbdece404fe3d170ef49574b5abff07a17120d189338140fadbc0971c7be05656544819df2b1987fd86c0f9fdfcd312e540035e70877212342"; + sha512 = "ed7d40db832e9abf89d0d1e497f1b276dec7836e494b616eee8db1557cddd33f6f700bc9f17db0324f7a3b191ea425a7701b7e2b10630c21ab07f3c709039312"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-US/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-US/thunderbird-52.5.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf"; + sha512 = "9ffe74492c2fe29523a34b02ab869f9660aa1c33b16e45a026c4404e714b9cb6a5d2b24e73c7ac2f52e22f21e6e88e9a7686edbeb2c0876594054b17222d9ad5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-AR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-AR/thunderbird-52.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "42525a75e154fdf263f276330a998f127de697519a79b447d4860403c40ca2a6caec0a225a978461ae776e56218313a3fa31441817cbb13db34cd47afb9a5eb8"; + sha512 = "9f154f4fcb465925d445cbaecad4495d12d6381f0afd502973c4869890dfcd77366fa90bba835016729343947e064772163529528bfa76d52fc87bba5e9af1d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-ES/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-ES/thunderbird-52.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "86b47481b760206b49f87d15a917754d875203d83613c0c8b83e181f95986e6252ff26cd6dd6f7c6545f9d4da4801f6f236fa82dcce0d0172f19228b4eb5fe33"; + sha512 = "4dc72ba78d8de913ab2b3a76920e0f4e3bb75cd880c3a8a55af72cc38334906e5786b24feb0db7d1e12db845f995c28e3342b5bb1bd4600c70de6b9fba012194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/et/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/et/thunderbird-52.5.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "4bbfa1fde3a6270b49989747b4b27c284abb89819c46119cc3f2f90f0cad1648e49a2e1e01a35ef193eed4cf504a3e027138ea30a225c3d75347aa062d56afeb"; + sha512 = "64279f558880cd6f6653e9387b479f08dcff440a23dc9a7bda664f09ca641cea05a268bea7cb7ee6495910fc67f1294f78bb163d09d70df06f335486d46d7ee9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/eu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/eu/thunderbird-52.5.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "292fd0f2db956e5bc86a84d5edf51e3e36141610c99f75b1dd8af0f086fa8bc4a4e5a4e1c3d085587b6bf2d6e3435bc70ee66d379809886a391d67e2c243d762"; + sha512 = "90185fb2a72b648af46b83470b2c57ab8784baad2c75c32920a5e6e1d5e03b5fd3a5ffad04cd52ea73a942c4ccc9b02d71ef7ca4887d3d089ba8f13745087b79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fi/thunderbird-52.5.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b8df95d4ca36efdc4370821068590b1d7e3fb9f348afeb18a0a02c977027312457aaa59c38ee02908e944f166d485576522ea0cb087b28fa857963107e43ced7"; + sha512 = "3d8fbda9afd0bb82db6baba04d06682c5083a8a05cb941552c5ae2abfa0fd7e9ea9e020423877f3141922485a69c1af5d48235dda29fb4b583c1f4435a747f59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fr/thunderbird-52.5.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7880654b4133e50ee248b6e287d52ba867361b900fbbdd149c6f06c9d5df1d0b57ce6d9d9bed3e1ab68e90b0ddf874d0b2427553b24ea39f267f576c63357bca"; + sha512 = "669723deede608bb8239ee5a04dcccfccf3680e32da494d28fe5380714b012a322caca38eb3b6ccb3c136a3a9742f917a5614f1183ee08b80d760fa5cb19493a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fy-NL/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fy-NL/thunderbird-52.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "4784b06aeb705141d84103bf46635e6ba6a7f7795b40e654f63c783a63ee19d54843c211eac90c4246c5131ecc8808940e560f2fd2a2543522cef13bf3828938"; + sha512 = "c35371dc26545e5f1b30a1c866538380e8d6cd21456e1415260cfdcde3c37f6f301f1a5ebfcba4d6a5612ed3809f7a27e5a5470fd5f5b7146b923ab15a5046a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ga-IE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ga-IE/thunderbird-52.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "91b4145d82a4748ef2cfe6d4d46c9e92c3a54a55f72ab1c28135363471d68ee028064ec0c0bb334fb731c6577305177a06d85b2a9d820d9e2a44fb01ac961beb"; + sha512 = "1f5eaa4928e7b56ad27937b6a49f90fc5739149dfa8119563eb6153cd1d850243ce3a15e42d6e5a7a7c306401c97424b5ebbb6bbc7d20102aab09723c91925a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gd/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gd/thunderbird-52.5.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4e979ce305a014de612c0f3797b9f8c8d89445f05972a24d8c13cd01160aa2c15007b0e505f9a0cb354f8cf65e286ba52eae8a6bbdcf4c7cf4e89809e0ce530a"; + sha512 = "61c1f4d9769981149a5961c096d9826e737ed356582b90d09efc437c38f93d9897ee84489f33e3fdc20787dd9d437ed58a5592bc5f586748d3e5897ddda38b20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gl/thunderbird-52.5.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b3081eee4473c097b37b9070cdcdd8eb48e1cf69ee63fd76f1eee0d5ed84009b69d0b31fb38c36f7d5137b78d0ab32087a8e668f1ad01e6ef96984ecd973af11"; + sha512 = "cd23d74ddd303be4d86e4c63d5d2186ce3d0237caa62b0a48987b63c63322898f591e4b2c7a5fa5d219c49cb28070fde5cd933050dc0c0e6b9aefdd5f03e5b1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/he/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/he/thunderbird-52.5.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2781cc8fcac549ea394629ba1d7c43c683ea25b4d3c5807f7a4da50541e47ba18ed4d4080e7f3c785be8e71e0a8e2ae0cb9a24e348f830b71b7398efd06863e5"; + sha512 = "58d98ff08576c3cd3d5a8637b8ba8dbab1b7e61942f4dd772ca48e3fb447a2dbcefe2cb9ed8cd3e86ffd0d9f8ba33366dbe01d744a825bf513861ea870d69ecc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hr/thunderbird-52.5.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "d42587bb96454e3ee24b964dee1de0f51283b2c3316dd25e798a8809d2289306bf6eba6078f664f87720e7038b14f009640fdb4d3acf211195dc881e6e207c6c"; + sha512 = "770a4a095993a9a84266b15e461645c4446ba6370092f1d0984d2ebcf836d24538276f63f9513dcaa537a4f016bb699169dafb14a68450f1e13050679800c5b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hsb/thunderbird-52.5.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "49e3ee2559c124db79e2dbb2fe74291a377ccf1fbd75b450c8d4913000a055cea855fad03369e7420391faf114e160e35b02d432de847e673e352b731986bb84"; + sha512 = "35f0a061f152d871636723b4690d3a3ff7172abb5adf0644b02e44fd23583e9a9d8ea68890a5313d74d190a6d293798b5ae8969a38b1166cd942a3d17b0246f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hu/thunderbird-52.5.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "fad46a1ea3e8a1df49e4ba836c68b1744577fdfec319d9dc0b2bd8756d4dc859cb5af7484791b83f2260bd40d1ae64f19539f8f4b3977252a1f559b7df9fef35"; + sha512 = "a4e9dd6ad2295cde7d7e5bfa8efee3c68123ae11d7535f0c076e29b18b952320ef39e4c92e8ad4aa66f63d8490b5737ee849e425378db04df8c794bb64f5393e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hy-AM/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hy-AM/thunderbird-52.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6a34e03e5e272c847f674bd8c48cee66fb659cbf88251debe505c54011b029cea7b7e8a9722c61b3e603d66aaa4313a5971fdbf2035fd06d305cf229cd8b2afa"; + sha512 = "8006eedb925424458cc9e084b367d4b8f16f78a6245159c61f13b75455404adf13eba353b4141cc555d82d4d6060deae9f97633884ba6d3b18d88af8bf93c4c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/id/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/id/thunderbird-52.5.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1cce3d3653b474219f00f4555990406b661a14c4198f3d246624def4e5a3ad3ea393a74f6c80e0f17b5799784e212778ccb8b56bda31c5e48a55193bef09c417"; + sha512 = "df166f9e33adadd2e38290d1ea92a035c9cd0d910c1b246906ed38181c8db12bba29e69b4a909594a79b8b3eccc23131f34236afb40d6746793cdbda3a195bcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/is/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/is/thunderbird-52.5.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f3604e918502d16ba92e65e9def425efbb829a261d2c433ce83ec89d6ebfebbfcddd1b01508f953ec3c26166c6d01112486cdab6d1a0fe1e6a582f0566900b89"; + sha512 = "1a05df69389d95d9920e133e085a0d3a05eb917b1b28c24fe9d8cdce316e19319fe08aa7a3fec304153fa0f59a0b8a630f9c44fa1d9c0310de03fc102172dbc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/it/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/it/thunderbird-52.5.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "458bc19bd6b08f6834e310f7ec4591ad4e84067ae2373864ca9019c20551abbcbc067467fffada229000dda01369da3c28967df522182d8eda1a147d136b6315"; + sha512 = "c446fa3e15e9eb72aff880f928f5c8a0b2b0c96632c243db4f5c377bd2dab56ccfb569a8500e9778ac5a4459ca634dc6d2ec1ec0f05aaa2980d3f45109fa2ffa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ja/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ja/thunderbird-52.5.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "05faf43b8b0f616bf552988a577891e816fe36b208b7d6292c9896a6946386815e117278feef33063b4f2eb7b5ec89aebc59e1d4432021969bf3b95e750defa3"; + sha512 = "c7699f90c49fc4bca1580c749ccc446a95cb9f1a5a48cfee3b2a566ba13e073a4e405ba7b17ebff704f719639e323332f533db19f7c82007300322330f2b3983"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/kab/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/kab/thunderbird-52.5.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "594669d5518b0be87095527b3013799812c9f45254434523903ad19edb2ebd4bc32409df6f646b1d1e953098e126673427400238a056e0a8c44b672009a12a2c"; + sha512 = "5c098954ce0e642c76c3597d419bcd5f286d62af96ccf2726bd00cefe12036708217cc6829c39cd669a21ed0cdfd8a6d511b8a55e8dafefa8c3940040e99d9a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ko/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ko/thunderbird-52.5.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "db3e6c9efbeeed833384256814a713a5bf3d2a220a74c88fd28f91ec0dd6c7600d77e18ce66c9dc9f1929f5da7452c5904f012fa8f5e4fa04084892e17b2647f"; + sha512 = "0a435742a13454634ef563b704d1618ce492a997814466ece1066e244160494e2092588b5cbbe5d1a7076b89c895b5f1a3288a377b547d454eb411960e3faeb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/lt/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/lt/thunderbird-52.5.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "2b8e8b74bbba2a72dc88a8dba457189cad1c902c0bf2cbc54bf989c6444c8b164238f1d9e21c2c8e470df5198d8586cd613b40292b737c04f4c2d834d298dc13"; + sha512 = "0ffbe8a40179cdce48423c70ce871ebbce066932cf9ab21560ba3107d2794198a7c8f5d5d3fefa58627beac4faa2ed398a09c429a47b261153f3045fe5779883"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nb-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nb-NO/thunderbird-52.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "bf99756bb7bc5fa699cae5ef3da5a3614e57483b2892e2f6f769699ef3478e22847ddeaf63fc0c521cd1fbcccbdf9bc5054430a5cdbb50e26e371818cae404fb"; + sha512 = "d44ece21a5ce26df33d7ea04f56cf2a21dc67bb053212a71a2a30dbabb7894bc9cd5b8a07f86906c882fda29603d2c8ff16d675c8e8bef8ec362be8c824624a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nl/thunderbird-52.5.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "80170d51276bb77de4af8d45d5869069c7d9c6db7ad6d5786fd4c2c5cfb0a20ceb1cdce7b5dbf99a79dca329efa5d9a53d4ed738cbe7f77bdcb65a8b6e2e7511"; + sha512 = "8c2489dd4d860fc657893986f268746512cef54943b19f7c129013e5a6a8db8f4a8fb0ef22b1cfdc41306bbd63d1c81131989af7161d310cabe2427e21ab4702"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nn-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nn-NO/thunderbird-52.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f223dd33108a750563a498e92b53cd3e68e3d50fdb1a08e295a9c3e893c20908ea56c9c5312874469b2f96d1046f754df55bc38d1595d5b811b7ed659e267d98"; + sha512 = "57270f4645bc1d82f3602a49aad11bb6261a2be39200b3284ee65082df363b5870b1cacbaeb3802a83f6ef1554a4d6a2c6e6b2720aa2b9d29b7a86208d676f6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pa-IN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pa-IN/thunderbird-52.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a418fea2521ff6971d68d975823bd0917580450a7ff38975455b891c8e3cbcfdf51c40502fa072ebc1f43ce93a3b07ce93db369edfbd511beee5dfc5041a0a84"; + sha512 = "7a7464cbf08e418c56c979abba5ef7120f1202073ab630ef4ce070aa1b55520597dda0b0f31e7afc50e14c8c4fe0f33759a2278035d5db5f21edacb6d521672c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pl/thunderbird-52.5.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "05adc7298c91853b373756944d360589caeef6a999f6c5ea9babe3b12ff9409909040b69b641b69b78bd17bddda59f9828e294f5cd5f7d7061cc3f51eb3c48b3"; + sha512 = "ae0b8da805a3b055bbb64a3c0f1d3562f44fae08751026b8300c130f4a2629a1a17857d2be2468c9e2ddb2a082155d35a26b7b1f0c99369b2031a90b34aa2443"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-BR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-BR/thunderbird-52.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "4a2503e3a1daf5b9cb26acf25720c4d0fdc7a170bd454a185e4cf2cd9c9429dcbdee4c13e59e11a2a275d88513b1ae31dffae8bdf70c3196249e432360fbe705"; + sha512 = "f61d66c71c2144aba0781f82370318fcff0637d4bb28cda3703f099718691f13bbbc51eaa4252ef1fbd1dbe821032597e41adb80b1abec89a2bc50df043f5099"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-PT/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-PT/thunderbird-52.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "cb02054a64a74c2e1f936594f001dd721e3016cc68cf705c0413a732153bbe45aaa14736d38b22358bda5f3d059f7306087c27faf040d91bd7f92066403e65c1"; + sha512 = "ad0d63ab9389e3c4cf6985835dc4277d3ac5cf79e09457331f87629c8f9a58e95ce7b68c2eec8973ab445cc8f8c50c0b01b78ebd0ada042f4fa6a2d2bc838241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/rm/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/rm/thunderbird-52.5.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "8e745e5d1e5a4d3f432bf8c5f90906a22c8d2fe4c6d77ec032cb7eccae1f2f9e7cf0620dd3ef378414d6f34cc25346ff44b7fbee05016f34c49a0c8c5959184c"; + sha512 = "5e5f96598101695ad0d16a7f3aea38c42d875b3d7b7e2eb529786f16cc008ca8b20bfcb24d2b975cdd2e114d00c1d17f8901f19fa84263f64506d9d75568e6be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ro/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ro/thunderbird-52.5.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "20d9b9666704c87f73f4c8cbe8d09cf79349e811f4c4da93f2754886cc89fabf7c2388430f9f072a3918b38984742adab48ada320dd75761a7443f3be1198a8e"; + sha512 = "82a0324bc4724460d5aafa194a78d611c1d11cc347446d5c2203e9fb40a45f6c7ffb0e17aa87b603af8b3ae5847fa91cac529ae878a6981c9c754ea91b8b6b52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ru/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ru/thunderbird-52.5.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ff7c64ed9a4403e24b7f0f9fb06bc4b96153fbe7d30b94ea7e145d33dc24bb1b2807db8d6e3398dc84e13f68d9c5c4fbaacc3027cd46ee58fecaa8b7b17b27a7"; + sha512 = "508d949263abd425ff805f417cfa60736d391e1dc99b53dca2243c4c93487ad2889ac6a9bd8beed59b4e09bc82ba31b9c5cbc9fe084ee3b5fde74baaa2720a7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/si/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/si/thunderbird-52.5.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b2358e6df5f5cda477c530dddd9d27e35a8919aa346b66521336fb0cddd2821bb7dd867f4ad005c135ce040a1eb64ad9f1feef81a268a299ca2170312f7c89ef"; + sha512 = "e9869c86acbba32bab6b536f2542b498e9de0a306558b3115ffaf143f83c5a5010ead37573ed7ce9565c42b6306d98b4f92da866ba62f5c4042dd537f66e377e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sk/thunderbird-52.5.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fc3eae35914d2a2ec6d44bf6348f71872f7ccb09d25ed974843b8010526f219437e6530c4d86825d027f1593da0943e0b9a5557bf41d4095e4e9d37108a94c3a"; + sha512 = "1297d9a8ed5d062790766ee5cb66a1c3b67526326440b5d3f27b712440c0e3525ab2231774e02436bfad4b8ccf1006e5a16d2fce4be26bf2c757427228f7fed7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sl/thunderbird-52.5.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "532b87d22bd05194470801cccf242ffbae57685e69a836c8179e2fc562bdf2aba196f214b7a66006ef90d7fb1781d66e1ea62c2cf95820402deb9a73122ad143"; + sha512 = "734d57ba493e160547953debc20b1d5565c31b0e6e5b486344f5da65aa4cbc77fa7790f49f4ad6322a633232fbcca2f21bdeae7f4abb2aa8cf13e5741519d706"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sq/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sq/thunderbird-52.5.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b621973b1f76f2d789afa854917e20b7b48e3381344da29e07b8c5bfd469162c47d51e9552ab2428895c45dab9662d8fdc2704e65c96faa4afbddc4649a77dec"; + sha512 = "e7a21ce516318f46d467f987dd244174ed2533bdeeeba41c2fff3a838ebb78047febabe6f3e86ab57bcc12f0b1418fb7ac195ca044a7c84eda404e152690b554"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sr/thunderbird-52.5.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "d26812c232168c30c6a76dad5f3f7e20fe88cd75fc63f863bca255fa353928b8d3988c56abbb649266e52b8d31d70182c59ded496607aae17d7d2d0409ecc53a"; + sha512 = "132fbcd2a7890ac413dbc3b1651a02227b741a8a31e2406780f36415fd47ed75503968a93414ec31384f28ecf1e14753f0e1bb2988468d973dfac9ab45787519"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sv-SE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sv-SE/thunderbird-52.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "294e141cabec4edab0695e7c8e29149543e4cf4d451cfe9ba038a6997a822e02f223045ac3a8ac25b99a1e847740fac4d9d5c0b5ce0c5d69d331d823bf8e4899"; + sha512 = "6e07841987bba5fcd69f790fc8a292ad7a3d71bcd802d16081145f243a71d49c8c57c5b6ad60ebfe1a550d62b1c9713843a83066893a397889f925e8b88904ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ta-LK/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ta-LK/thunderbird-52.5.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "9c9b79cf21e64461b8a78dd0f7816346ada2cce0ef4bce4da291497c9fd1aa414c199d57265390e5b885828b1efa38f9883882870b84a5b3a64ffffb47da79e1"; + sha512 = "978b1ba5f77271906ea67b37637b31a9c1da0f97453ea4e140adff8558ee2b01fe32f3018a48b141198cd0ad9f9d927ce213100be3f3310b020bfb3ff8b1d69c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/tr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/tr/thunderbird-52.5.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "61a671ae2804b06143e636c9e8ae0badb460bf9cbb3555213bf43aa2d56b2a9f13ca3a13362f2a9b7ecafb4b03451093ea2f817a104cc7d4555e11b1ffb18103"; + sha512 = "2531185c167e66b77c6b7f968927a64a9e8de56580fd82c7b2408bfac71523738610b740650644eeee4c485dbf532a8da92367bdc574733d0df0d749613bd6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/uk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/uk/thunderbird-52.5.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "629ede67d8bbfd6b1233d2030234fed7f99915045131caa11edce99b6e9c314b7cfd6ef457d26a0e628b525bb78c05426e8c078364ade5e606dfaba90200feee"; + sha512 = "3f9eed73e2e85528deef2f2ffcbc166d2a836d363693f6ece98adeabe872a6aaa77facd16efd918fac9eefebed68ff35c59750d7116545a6540c9e1aede45c51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/vi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/vi/thunderbird-52.5.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "728644651b7eff73be44bceccf8038bca79e020fbaad87d74fb1ff4856554766e6494e1e16a0d93187615f5f8cb663fc3233855d66e8cf0996fe597c9645273c"; + sha512 = "fa776aca6c434491925e6fcd1802f047fcdcc2ae817805ffae0c873e17f1ad233836954544d85ac378ab28fb607c9cbc5b1808a12bbfa1d9337c8e47de4eddd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-CN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-CN/thunderbird-52.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ef5a81e04ed973fd2ed576d1654f1ada7d9cefb6943bf604bee53053fedc4b2127c780ac2ff3c9b568813699f29f744950e899bc71733cd8d385368e1d0c07c2"; + sha512 = "ddc20a6b05b48d6bcbc59c585b4a2365cee6d526ddef29e3dd04d38c8632c5c7ddda9eab24f2850dd2614bb7acc6e982ae4673c2b51c679eb5afd48047bf6fca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-TW/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-TW/thunderbird-52.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ddf5a00621d6916c6033f81589c9376a8aaba3bf12810a2fd41358af323d9f6354384a5b938f299855d27a1272d36e99ca3f45a8ab8299aa7afc118d942ae624"; + sha512 = "aa527aeaa6b10d785e3fa3a8052c5dfa70f9aae2601119aed7dfd60e8af30f03cc1b4d93f749c36be4e54bbce6071fe66fb1937fa392b8391ca695e55ffe68ab"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2e1f8ed50701..c98ba2d06ad5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.4.0"; + version = "52.5.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78"; + sha512 = "b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0952fd1af080..3e502cde08b2 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -19,10 +19,10 @@ let python = python2; buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! - extpack = "005ba9211862643e2516d549e98b80942918047f1f6c55fcfe08c490dd1947bc"; - extpackRev = "118431"; - main = "0m6y98pvkngprw5iaswvkbbfxmzvfl8yvgi984p1866zwap77z16"; - version = "5.2.0"; + extpack = "9328548ca8cbc526232c0631cb5a17618c771b07665b362c1e3d89a2425bf799"; + extpackRev = "119230"; + main = "05y03fcp013gc500q34bj6hvx1banib41v8l3hcxknzfgwq0rarm"; + version = "5.2.2"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 87b89a98e780..0aa0423fc13a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,12 +19,14 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1r6dybr3pfclffk7gppf7n8gwj3ziw7pmfvbwwkdw00q9ah7h5l4"; + sha256 = "1f0vm20qdjxqsbciwgybxqqpn609gj5dy68an8lpi1wlk93s05w3"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; + patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ]; + patches = [ ./fix_kerndir.patch ./fix_kernincl.patch diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch index e7feed853b12..0be949f63c92 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch @@ -1,7 +1,7 @@ -diff --git a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header +diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header +--- a/vboxsf/Makefile.include.header ++++ b/vboxsf/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) @@ -11,10 +11,10 @@ index 8df1eb4d25..5a3e5604e7 100644 $(error Error: unable to find the headers of the Linux kernel to build against. \ Specify KERN_VER= and run Make again) -diff --git a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header +diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header +--- a/vboxguest/Makefile.include.header ++++ b/vboxguest/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) @@ -24,10 +24,10 @@ index 8df1eb4d25..5a3e5604e7 100644 $(error Error: unable to find the headers of the Linux kernel to build against. \ Specify KERN_VER= and run Make again) -diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +--- a/vboxvideo/Makefile.include.header ++++ b/vboxvideo/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch index 251394e5d13e..e59e2e98c1b3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch @@ -1,7 +1,7 @@ -diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +--- a/vboxvideo/Makefile.include.header ++++ b/vboxvideo/Makefile.include.header @@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) Specify KERN_VER= and run Make again) endif diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 13aeae803124..e1544787b726 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchzip }: +{ stdenv, google-fonts }: -let - version = "1.010"; -in fetchzip { +stdenv.mkDerivation rec { name = "inconsolata-${version}"; - url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; + inherit (google-fonts) src version; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf"; - - sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7"; + installPhase = '' + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf + ''; meta = with stdenv.lib; { homepage = http://www.levien.com/type/myfonts/inconsolata.html; description = "A monospace font for both screen and print"; - maintainers = with maintainers; [ raskin rycee ]; + maintainers = with maintainers; [ mikoim raskin rycee ]; license = licenses.ofl; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix new file mode 100644 index 000000000000..add2c44cd480 --- /dev/null +++ b/pkgs/data/fonts/ricty/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, google-fonts, migu, fontforge, which }: + +stdenv.mkDerivation rec { + name = "ricty-${version}"; + version = "4.1.0"; + + src = fetchurl { + url = "http://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh"; + sha256 = "1cv0xh81fi6zdjb62zqjw46kbc89jvwbyllw1x1xbnpz2il6aavf"; + }; + + unpackPhase = '' + install -m 0770 $src ricty_generator.sh + ''; + + patchPhase = '' + sed -i 's/fonts_directories=".*"/fonts_directories="$inconsolata $migu"/' ricty_generator.sh + ''; + + buildInputs = [ google-fonts migu fontforge which ]; + + buildPhase = '' + inconsolata=${google-fonts} migu=${migu} ./ricty_generator.sh auto + ''; + + installPhase = '' + install -m644 --target $out/share/fonts/truetype/ricty -D Ricty-*.ttf + ''; + + meta = with stdenv.lib; { + description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; + homepage = http://www.rs.tus.ac.jp/yyusa/ricty.html; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = [ maintainers.mikoim ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index ff5670935bd9..6de97f3dea26 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst , libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager -, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config }: +, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ]; + postPatch = '' + substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab + ''; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 68e8bcffe65d..0b98c7948df7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -41,7 +41,7 @@ self: super: { # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; }); hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 1dee726dcf36..51276ce8c89d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -60,6 +60,6 @@ self: super: { apply-refact = super.apply-refact_0_3_0_1; # This builds needs the latest Cabal version. - cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; }); } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 27ec7bfb5c50..2f09aaf39f76 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -271,6 +271,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ADPfusionForest" = callPackage + ({ mkDerivation, ADPfusion, base, containers, criterion, DPutils + , fgl, ForestStructures, GrammarProducts, PrimitiveArray + , QuickCheck, strict, tasty, tasty-quickcheck, tasty-th, text + , unordered-containers, vector, vector-algorithms, vector-instances + , vector-th-unbox + }: + mkDerivation { + pname = "ADPfusionForest"; + version = "0.0.0.1"; + sha256 = "1ikv9y1hs478s5ns8g42cnsga3kw8qxpn1yc3vi5ix95i6q6wi4v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion base containers DPutils fgl ForestStructures + GrammarProducts PrimitiveArray strict text unordered-containers + vector vector-algorithms vector-instances vector-th-unbox + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ base criterion ForestStructures ]; + homepage = "https://github.com/choener/ADPfusionForest"; + description = "Dynamic programming on tree and forest structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ADPfusionSet" = callPackage ({ mkDerivation, ADPfusion, base, bits, containers, DPutils, mmorph , mtl, OrderedBits, primitive, PrimitiveArray, QuickCheck @@ -1186,8 +1213,8 @@ self: { }: mkDerivation { pname = "BNFC-meta"; - version = "0.4.0.3"; - sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2"; + version = "0.5"; + sha256 = "1hwm7mnmmrnw42n19xhs1qkl35lvl69sa8imjmibhsv9zq0fddd1"; libraryHaskellDepends = [ alex-meta array base happy-meta haskell-src-meta syb template-haskell @@ -1612,21 +1639,23 @@ self: { }) {}; "BiobaseTypes" = callPackage - ({ mkDerivation, aeson, base, bimaps, binary, cereal, cereal-text - , cereal-vector, data-default, deepseq, hashable, intern, primitive - , PrimitiveArray, QuickCheck, string-conversions, tasty - , tasty-quickcheck, tasty-th, text, text-binary, vector - , vector-binary-instances, vector-th-unbox + ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal + , cereal-text, cereal-vector, containers, data-default, deepseq + , hashable, intern, lens, mtl, primitive, PrimitiveArray + , QuickCheck, string-conversions, tasty, tasty-quickcheck, tasty-th + , text, text-binary, utf8-string, vector, vector-binary-instances + , vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.2.1"; - sha256 = "11wcwnhz9n7vs8xmsr3jdwa219797kcbaw5dw2qip9jih41gijwj"; + version = "0.1.3.0"; + sha256 = "15yzg4llvz7pq5f0chfwrkaqspwrqxan4xvczrk4mvwa07z3abbp"; libraryHaskellDepends = [ - aeson base bimaps binary cereal cereal-text cereal-vector - data-default deepseq hashable intern primitive PrimitiveArray - QuickCheck string-conversions text text-binary vector - vector-binary-instances vector-th-unbox + aeson base bimaps binary bytestring cereal cereal-text + cereal-vector containers data-default deepseq hashable intern lens + mtl primitive PrimitiveArray QuickCheck string-conversions text + text-binary utf8-string vector vector-binary-instances + vector-th-unbox ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th @@ -1654,31 +1683,33 @@ self: { }) {}; "BiobaseXNA" = callPackage - ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring - , cereal, cereal-vector, cmdargs, containers, csv, deepseq - , file-embed, hashable, lens, primitive, PrimitiveArray, QuickCheck - , split, tasty, tasty-quickcheck, tasty-th, text, tuple, vector + ({ mkDerivation, aeson, attoparsec, base, bimaps, binary + , BiobaseTypes, bytes, bytestring, cereal, cereal-vector, cmdargs + , containers, csv, deepseq, file-embed, ForestStructures, hashable + , lens, mtl, primitive, PrimitiveArray, QuickCheck, split, tasty + , tasty-quickcheck, tasty-th, text, tuple, vector , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.3.1"; - sha256 = "0jlcdd0slq7d5wr44h3h6lnfcp310h36cabd4r7l32xhcxns9k6h"; + version = "0.10.0.0"; + sha256 = "0ah8qzr3wv4x1khh970isbrdn2fabsa7f9v92wif7ls798hw5abz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bimaps binary bytes bytestring cereal cereal-vector - containers csv deepseq file-embed hashable lens primitive - PrimitiveArray QuickCheck split text tuple vector - vector-binary-instances vector-th-unbox + aeson attoparsec base bimaps binary BiobaseTypes bytes bytestring + cereal cereal-vector containers csv deepseq file-embed + ForestStructures hashable lens mtl primitive PrimitiveArray + QuickCheck split text tuple vector vector-binary-instances + vector-th-unbox ]; executableHaskellDepends = [ base cmdargs ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector ]; homepage = "https://github.com/choener/BiobaseXNA"; - description = "Efficient RNA/DNA representations"; + description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -2460,17 +2491,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_0_0_2" = callPackage + "Cabal_2_0_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, pretty, process, QuickCheck, tagged , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix }: mkDerivation { pname = "Cabal"; - version = "2.0.0.2"; - sha256 = "0chhl2113jbahd5gychx9rdqj1aw22h7dyj6z44871hzqxngx6bc"; - revision = "1"; - editedCabalFile = "1k4alrrz7yza66kaya69m0rkcz45mw48afrcv1x54q31cka9xyx1"; + version = "2.0.1.0"; + sha256 = "15jc66l38z3vi1rf3ak4i4hc9vckm5x59qfhqqlbf46nlnc10ii9"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -5631,6 +5660,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Forestry" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionForest, base, BiobaseNewick + , BiobaseTypes, containers, criterion, ForestStructures + , FormalGrammars, lens, log-domain, PrimitiveArray + , PrimitiveArray-Pretty, QuickCheck, tasty, tasty-quickcheck + , tasty-th, text, vector + }: + mkDerivation { + pname = "Forestry"; + version = "0.0.0.1"; + sha256 = "0l56ajrdxkpk59ahrdzr5qk4vxp8j3i0w6n6vpp1cl414rwg51qz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion ADPfusionForest base BiobaseNewick BiobaseTypes + containers ForestStructures FormalGrammars lens log-domain + PrimitiveArray PrimitiveArray-Pretty text vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/choener/Forestry"; + description = "Comparison of trees and forests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ForkableT" = callPackage ({ mkDerivation, base, monad-control, mtl, resourcet }: mkDerivation { @@ -10650,6 +10706,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "JuPyTer-notebook" = callPackage + ({ mkDerivation, aeson, base, bytestring, json-autotype, text }: + mkDerivation { + pname = "JuPyTer-notebook"; + version = "0.1.0.0"; + sha256 = "1bmnwi0z68fzlzjf2599xs6rzi89p1jpv1gmnsi05cfsh1bysda7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base json-autotype ]; + executableHaskellDepends = [ + aeson base bytestring json-autotype text + ]; + homepage = "http://github.com/mgajda/ipynb"; + description = "JuPyTer notebook parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "JuicyPixels" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib @@ -11047,8 +11120,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "LParse"; - version = "0.1.3.1"; - sha256 = "0gyc1cqbz97cps8awvkl3yfmlvaf7fkvxgs48rq95j1b2xbf417p"; + version = "0.2.1.0"; + sha256 = "0sck36lfmfgb16nhfwm13mnsqa9d7m1fx1xl6x5wln9w6q3rhrls"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/MarcusVoelker/LParse#readme"; @@ -18331,17 +18404,18 @@ self: { }) {}; "ViennaRNA-bindings" = callPackage - ({ mkDerivation, array, base, c2hs, QuickCheck, tasty, tasty-hunit - , tasty-silver, tasty-th + ({ mkDerivation, array, base, bytestring, c2hs, QuickCheck, tasty + , tasty-hunit, tasty-silver, tasty-th }: mkDerivation { pname = "ViennaRNA-bindings"; - version = "0.233.1.2"; - sha256 = "1iq4f15znpmfs5i6i3cvrzkn220apxj4rp720yyh0xbji211wg3d"; - libraryHaskellDepends = [ array base ]; + version = "0.233.2.0"; + sha256 = "1hzw4x493vqwmcdjj7ahn8cj7r2zw5mjs8gpl1alnsp1lp0j517y"; + libraryHaskellDepends = [ array base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - array base QuickCheck tasty tasty-hunit tasty-silver tasty-th + array base bytestring QuickCheck tasty tasty-hunit tasty-silver + tasty-th ]; testToolDepends = [ c2hs ]; homepage = "https://github.com/choener/ViennaRNA-bindings"; @@ -18349,6 +18423,30 @@ self: { license = "unknown"; }) {}; + "ViennaRNA-extras" = callPackage + ({ mkDerivation, array, attoparsec, base, BiobaseTypes, BiobaseXNA + , bytestring, deepseq, lens, QuickCheck, streaming + , streaming-bytestring, strict, strict-base-types, tasty + , tasty-quickcheck, tasty-th, vector, ViennaRNA-bindings + }: + mkDerivation { + pname = "ViennaRNA-extras"; + version = "0.0.0.1"; + sha256 = "06az042v9ja888nq59bdcsj6i7zk4dmbjsb9qcbdzqv6xw1lm8ac"; + libraryHaskellDepends = [ + array attoparsec base BiobaseTypes BiobaseXNA bytestring deepseq + lens QuickCheck streaming streaming-bytestring strict + strict-base-types ViennaRNA-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring QuickCheck tasty tasty-quickcheck + tasty-th vector + ]; + homepage = "https://github.com/choener/ViennaRNA-extras"; + description = "ViennaRNA v2 extensions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ViennaRNAParser" = callPackage ({ mkDerivation, base, hspec, parsec, ParsecTools, process , transformers @@ -22875,6 +22973,8 @@ self: { pname = "alex-meta"; version = "0.3.0.9"; sha256 = "0882p9j272dhq94kgmg6pnxzi3qfwa01fk7npsz748rgx6ggycyr"; + revision = "1"; + editedCabalFile = "0p6j9ilvn5gjx0n7v1war0z8rlmcz1qnvpc8lcik8l7baydz6qjl"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -27477,8 +27577,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.2.1.5"; - sha256 = "1r0h93nivl0pvl6mppz18jpi3csar37ii867a2yfg7g4a5lra3hf"; + version = "0.3.0.0"; + sha256 = "05yz8pgj1g8m2y35psvkkpf0xr9dr0qz0andqv452w0ak7vy54bk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30791,7 +30891,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "atom-conduit_0_5_0_0" = callPackage + "atom-conduit_0_5_0_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators , data-default, hlint, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty @@ -30800,8 +30900,8 @@ self: { }: mkDerivation { pname = "atom-conduit"; - version = "0.5.0.0"; - sha256 = "06a7g93zhsp8smy5m4c45hjhb3yz3l89a60vb09s31l0idgf4j42"; + version = "0.5.0.1"; + sha256 = "1k9ix1br0vfajjqnprlnhzidvkx9a1pmkyiv2rb3nxb7fp3wb24c"; libraryHaskellDepends = [ base blaze-builder conduit conduit-combinators lens-simple mono-traversable parsers safe-exceptions text time timerep @@ -40801,8 +40901,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.36"; - sha256 = "0kwn0drd57wkpz2xl4n8104zc8zjf32gab6sks9vg03zhy4hjvwq"; + version = "4.36.1"; + sha256 = "1nvf3virir795bq4a00b8mzhhsbkdfzasw31bwb4rh1s6gqm058r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41574,26 +41674,26 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal , cabal-doctest, containers, deepseq, directory , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl - , language-nix, lens, monad-par, monad-par-extras, mtl + , hpack, language-nix, lens, monad-par, monad-par-extras, mtl , optparse-applicative, pretty, process, split, text, time , transformers, utf8-string, yaml }: mkDerivation { pname = "cabal2nix"; - version = "2.6"; - sha256 = "0zy0pf8s2flykpm7419zz393dx92lxpf04gi9d827m5dwrlr0j3z"; + version = "2.7"; + sha256 = "1ypzldvifqm4nv9bwzvm5pfsxxn4mp19z50fpkxk84fhb5pb6nbd"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs filepath hackage-db hopenssl + directory distribution-nixpkgs filepath hackage-db hopenssl hpack language-nix lens optparse-applicative pretty process split text time transformers yaml ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs filepath hackage-db hopenssl + directory distribution-nixpkgs filepath hackage-db hopenssl hpack language-nix lens monad-par monad-par-extras mtl optparse-applicative pretty process split text time transformers utf8-string yaml @@ -41601,8 +41701,8 @@ self: { testHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq directory distribution-nixpkgs doctest filepath hackage-db hopenssl - language-nix lens optparse-applicative pretty process split text - time transformers yaml + hpack language-nix lens optparse-applicative pretty process split + text time transformers yaml ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; @@ -47719,8 +47819,8 @@ self: { ({ mkDerivation, array, base, bytestring, file-embed, text }: mkDerivation { pname = "cndict"; - version = "0.8.5"; - sha256 = "1gh3165z95drfa87zrgnqvhyr6g6dc732dywz3nwh4k2wb4467nl"; + version = "0.9.0"; + sha256 = "0v0drr7zxh2ndq91vhpsi4ykna993fnkfmxana7g1q4c2vn8b5sc"; libraryHaskellDepends = [ array base bytestring file-embed text ]; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; @@ -49282,8 +49382,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "compose-ltr"; - version = "0.2.3"; - sha256 = "1br7jyp5c0riq9wdd638n1yvwp0s7s8nazqzj9g6kninyf3vnvgp"; + version = "0.2.4"; + sha256 = "1vgllk949s9sc2nhwbpjqx52m06563qcq8yd49kyaf2lq05n23hm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "More intuitive, left-to-right function composition"; @@ -50542,6 +50642,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conduit-parse_0_1_2_2" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint + , mtl, parsers, resourcet, safe, safe-exceptions, tasty + , tasty-hunit, text, transformers + }: + mkDerivation { + pname = "conduit-parse"; + version = "0.1.2.2"; + sha256 = "19ywaknrdcg88ximmx6fa08bq9xvp76ybly09gyp21xjnfdznsr9"; + libraryHaskellDepends = [ + base conduit conduit-combinators dlist mtl parsers safe + safe-exceptions text transformers + ]; + testHaskellDepends = [ + base conduit hlint mtl parsers resourcet safe-exceptions tasty + tasty-hunit + ]; + homepage = "https://github.com/k0ral/conduit-parse"; + description = "Parsing framework based on conduit"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-resumablesink" = callPackage ({ mkDerivation, base, bytestring, conduit, hspec, resourcet , transformers, void @@ -53718,7 +53841,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "cron_0_6_0" = callPackage + "cron_0_6_1" = callPackage ({ mkDerivation, attoparsec, base, criterion, data-default-class , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time @@ -53726,8 +53849,8 @@ self: { }: mkDerivation { pname = "cron"; - version = "0.6.0"; - sha256 = "0s40b0dlkrwhx3sqbca0a883wd54xbkgqfz4w0ncmsb06x3sdx04"; + version = "0.6.1"; + sha256 = "0l9jigxr271gyf8a69igag5rckvcngv6h93jkf02d43jvqxza6lc"; libraryHaskellDepends = [ attoparsec base data-default-class mtl mtl-compat old-locale semigroups text time @@ -53960,6 +54083,8 @@ self: { pname = "crypto-enigma"; version = "0.0.2.9"; sha256 = "18nc5gqsy4dsm22van6iz96lqq45f7jqik4fljczgp6n1knyig9z"; + revision = "1"; + editedCabalFile = "1hbcnj3w5z7cmlrmfih7mv27n75bpcpbiq66wsfgrrvaiycrb58n"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -64853,6 +64978,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dual" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dual"; + version = "0.1.0.0"; + sha256 = "02abbnynjxhr2dvqqph3mnzc24v9wc655qkhh70flc168dk0k6hr"; + libraryHaskellDepends = [ base ]; + description = "Dual category"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dual-tree" = callPackage ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck , semigroups, testing-feat @@ -64879,8 +65015,8 @@ self: { }: mkDerivation { pname = "dublincore-xml-conduit"; - version = "0.1.0.1"; - sha256 = "1irrn82jk0l026l98pajvbbhsgxh6lybjxggyipxijibg7fbkx08"; + version = "0.1.0.2"; + sha256 = "17jzyj49j88xwsz54higi81a6v8kvb8i338n5416z1ni475qsynl"; libraryHaskellDepends = [ base conduit conduit-combinators safe-exceptions text time timerep uri-bytestring xml-conduit xml-types @@ -65422,17 +65558,18 @@ self: { , exceptions, generics-sop, hashable, hspec, lens, monad-loops , monad-supply, safe-exceptions, scientific, semigroups, tagged , template-haskell, text, transformers, unordered-containers - , vector + , uuid-types, vector }: mkDerivation { pname = "dynamodb-simple"; - version = "0.4.0.0"; - sha256 = "0yfa2vy82ksbv2mha10yzrzppa24m8a847w2s6arm4nh34dkd832"; + version = "0.5.0.0"; + sha256 = "12jkl425nzgds8zszhk41ns4mg3rn9mjfmd853b88x6dn9wk95g7"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop hashable lens monad-loops monad-supply scientific semigroups tagged - template-haskell text transformers unordered-containers vector + template-haskell text transformers unordered-containers uuid-types + vector ]; testHaskellDepends = [ amazonka amazonka-dynamodb base conduit containers hashable hspec @@ -66278,8 +66415,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.3"; - sha256 = "10lv2g62sj6skrg9j40994kcrann379byzqhyzsq16lhlbpia19s"; + version = "3.7.4"; + sha256 = "055m2099slgz01pzz23v6l2v6f9b149qkfxyf8pcviv59mjq2xsc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66327,8 +66464,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.7.1"; - sha256 = "1s95xa3iyai0y67v4v6fxrx9gkxgcaqrwzla598lg49lp83c6lqc"; + version = "3.7.4"; + sha256 = "0932x2hmh982vfq0zgn6dj58bicq1p0lh93h4aq1hc75lzjk9ydl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66444,22 +66581,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "either_4_5" = callPackage - ({ mkDerivation, base, bifunctors, exceptions, free, mmorph - , monad-control, MonadRandom, mtl, profunctors, semigroupoids - , semigroups, transformers, transformers-base + "either_5" = callPackage + ({ mkDerivation, base, bifunctors, hedgehog, mtl, profunctors + , semigroupoids, semigroups }: mkDerivation { pname = "either"; - version = "4.5"; - sha256 = "1mzj86pbplgs3h7a49j3rk22s5cbw06wmd992gdm6harm15hzyzc"; + version = "5"; + sha256 = "087lrgvyns9jfgi95rr2lliivxf7fsd4d0hzqzk80kx385vf5kkm"; libraryHaskellDepends = [ - base bifunctors exceptions free mmorph monad-control MonadRandom - mtl profunctors semigroupoids semigroups transformers - transformers-base + base bifunctors mtl profunctors semigroupoids semigroups ]; + testHaskellDepends = [ base hedgehog ]; homepage = "http://github.com/ekmett/either/"; - description = "An either monad transformer"; + description = "Combinators for working with sums"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -70688,15 +70823,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_0_1_0" = callPackage + "extensible-effects_2_1_0_0" = callPackage ({ mkDerivation, base, directory, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 , test-framework-th, transformers, transformers-base, type-aligned }: mkDerivation { pname = "extensible-effects"; - version = "2.0.1.0"; - sha256 = "1rnwc9jaw231j784ck9a7mzaw333bsj6c1bvqxkmnwz9r87vzpi2"; + version = "2.1.0.0"; + sha256 = "069v7ql359msnnsbapy1dwgsw3g6f0w8rrc0ihix1jm7p2ivjyrc"; libraryHaskellDepends = [ base transformers transformers-base type-aligned ]; @@ -73108,6 +73243,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fin" = callPackage + ({ mkDerivation, base, deepseq, hashable, inspection-testing + , tagged + }: + mkDerivation { + pname = "fin"; + version = "0"; + sha256 = "0nzjqw6q01rc6faqp30771v8mxz6cndzskkvfaj55ygp34faycih"; + revision = "1"; + editedCabalFile = "0lin85p7gwdj96liwq5g2fpfmk3d23239zn99ghz12i6l8xwigxh"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ base inspection-testing tagged ]; + homepage = "https://github.com/phadej/vec"; + description = "Nat and Fin"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -73279,6 +73431,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "finite-typelits_0_1_3_0" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "finite-typelits"; + version = "0.1.3.0"; + sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv"; + libraryHaskellDepends = [ base deepseq ]; + homepage = "https://github.com/mniip/finite-typelits"; + description = "A type inhabited by finitely many values, indexed by type-level naturals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "firefly" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring , case-insensitive, containers, cookie, http-types, mtl, regex-pcre @@ -74584,26 +74749,25 @@ self: { "fluid-idl" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors - , exceptions, fluid, hspec, lifted-async, monad-control - , monad-logger, mtl, random, safe-exceptions, scientific, text - , text-conversions, tuple, unordered-containers, vector + , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl + , random, safe-exceptions, scientific, text, text-conversions + , unordered-containers, vector }: mkDerivation { pname = "fluid-idl"; - version = "0.0.4"; - sha256 = "1kdiq6mw01dr85ii7vg7bsw8m260y6njjf5afx3p718hsxwiw4yr"; + version = "0.0.5"; + sha256 = "1yv4qslqa335r6bwjpll45lz8y6pj3m8cvjzlc2xadg05m2yy89w"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random safe-exceptions scientific text text-conversions unordered-containers vector ]; testHaskellDepends = [ - aeson base containers fluid hspec scientific text tuple vector + aeson base containers hspec scientific text vector ]; description = "Fluid | The Programmatic IDL"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {fluid = null;}; + }) {}; "fluid-idl-http-client" = callPackage ({ mkDerivation, aeson, base, bytestring, fluid-idl, http-client @@ -78859,19 +79023,22 @@ self: { "genesis" = callPackage ({ mkDerivation, base, directory, envparse, file-embed, filepath - , hspec, monad-control, monad-logger, monad-persist, persistent - , persistent-postgresql, persistent-sqlite, persistent-template - , resource-pool, template-haskell, text, text-conversions + , hspec, monad-control, monad-io-adapter, monad-logger + , monad-persist, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, resource-pool + , template-haskell, text, text-conversions, transformers + , transformers-base }: mkDerivation { pname = "genesis"; - version = "0.0.1.0"; - sha256 = "15l23rf4ifqxziz3fa8ra2p7jch6ph651139cvpqszqbzm9wp4sc"; + version = "0.1.0.0"; + sha256 = "1bz47rf5qkkm809440y3ki1bahyg6sxdlxrfkc4mjy49fcbgh4si"; libraryHaskellDepends = [ base directory envparse file-embed filepath monad-control - monad-logger monad-persist persistent persistent-postgresql - persistent-template resource-pool template-haskell text - text-conversions + monad-io-adapter monad-logger monad-persist persistent + persistent-postgresql persistent-template resource-pool + template-haskell text text-conversions transformers + transformers-base ]; testHaskellDepends = [ base hspec monad-control monad-logger monad-persist @@ -78886,16 +79053,17 @@ self: { "genesis-test" = callPackage ({ mkDerivation, base, envparse, genesis, hspec, hspec-expectations , lifted-base, monad-control, monad-logger, monad-persist - , persistent-postgresql, persistent-template, text + , persistent-postgresql, persistent-template, text, transformers , transformers-base }: mkDerivation { pname = "genesis-test"; - version = "0.0.1.0"; - sha256 = "12s0vg0013465cpxxhyz0xw9sbhh8knkl988dq8jaxvl81d0jzj2"; + version = "0.1.0.0"; + sha256 = "0d93wq9b5wm5cgw9kfvf8smm7d3adv8y4a8kxc6m17lvgjmjjph4"; libraryHaskellDepends = [ base genesis hspec hspec-expectations lifted-base monad-control - monad-logger monad-persist persistent-postgresql transformers-base + monad-logger monad-persist persistent-postgresql transformers + transformers-base ]; testHaskellDepends = [ base envparse genesis hspec monad-logger monad-persist @@ -79791,6 +79959,8 @@ self: { pname = "ghc-compact"; version = "0.1.0.0"; sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h"; + revision = "1"; + editedCabalFile = "1fwcfk515lv3pjzxz87bddk3kdbkaxswxrr37spdlkvyyfrbxyak"; libraryHaskellDepends = [ base bytestring ghc-prim ]; description = "In memory storage of deeply evaluated data structure"; license = stdenv.lib.licenses.bsd3; @@ -87611,6 +87781,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groups_0_4_1_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "groups"; + version = "0.4.1.0"; + sha256 = "0ggkygkyxw5ga4cza82bjvdraavl294k0h6b62d2px7z3nvqhifx"; + libraryHaskellDepends = [ base ]; + description = "Haskell 98 groups"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "growler" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, either, http-types, lens, monad-control, mtl @@ -87751,8 +87933,8 @@ self: { }: mkDerivation { pname = "gssapi"; - version = "0.2.0.0"; - sha256 = "1kvyy05m3wcvcp76ap4i499j5mmm7dlz49i0m0a5vanpn2jfpkwy"; + version = "0.2.0.1"; + sha256 = "0bpwjggsdkckwfgmp89rvkzxjlagiliawrzf9pzvxrka7wk1ip14"; libraryHaskellDepends = [ base bytestring resourcet transformers ]; librarySystemDepends = [ gssapi_krb5 krb5 ]; homepage = "https://github.com/ondrap/gssapi"; @@ -87767,8 +87949,8 @@ self: { }: mkDerivation { pname = "gssapi-wai"; - version = "0.1.2.1"; - sha256 = "0n9295ql2zrsipnf91af24lcc35f8l6d6313cz8xiyx4dhf1arln"; + version = "0.1.2.2"; + sha256 = "1fkgsdc4nkxwkhnz3b8rz6zx8jq6325mgniy5h5s3cr7k0kwnv0s"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive gssapi http-types vault wai wai-extra @@ -92356,6 +92538,8 @@ self: { pname = "happy-meta"; version = "0.2.0.9"; sha256 = "1w3bmwnsg9714kyqxzfrbw0az4i2dqprn2hms3kbdq5984yhi9bg"; + revision = "1"; + editedCabalFile = "1mq8gdq11bqgii498as0078pf8s1mnawh4rvys6hjnd77iaf9nfk"; libraryHaskellDepends = [ array base containers haskell-src-meta mtl template-haskell ]; @@ -94009,6 +94193,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-lsp_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec + , sorted-list, stm, text, time, transformers, unordered-containers + , vector, yi-rope + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.2.0.0"; + sha256 = "1hvqimg580hbanlhim2kxni3wk6rfwsd93agkfjhy216lb8bd9h8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hslogger lens mtl parsec sorted-list stm text time + unordered-containers yi-rope + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hslogger lens mtl parsec stm text time transformers + unordered-containers vector yi-rope + ]; + testHaskellDepends = [ + aeson base containers directory hashable hspec lens sorted-list + text yi-rope + ]; + homepage = "https://github.com/alanz/haskell-lsp"; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -94566,14 +94782,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-ast_0_9_0_0" = callPackage + "haskell-tools-ast_1_0_0_0" = callPackage ({ mkDerivation, base, ghc, mtl, references, template-haskell , uniplate }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.9.0.0"; - sha256 = "1hhlp7bvn1q18jsfmi6pig26aggq6961p7lq7p140lk2jlvv9i1i"; + version = "1.0.0.0"; + sha256 = "174xh6a0p43kb0cia3z1n18kqhpsnbf51299l0rbn2makvn68zk4"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -94655,15 +94871,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-backend-ghc_0_9_0_0" = callPackage + "haskell-tools-backend-ghc_1_0_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th , haskell-tools-ast, mtl, references, safe, split, template-haskell , transformers, uniplate }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.9.0.0"; - sha256 = "17v38npf016pm80wiynimdqw83v3y8f1hdjjl7lbkwyj7rgkpx6n"; + version = "1.0.0.0"; + sha256 = "09jhc2i7ypfcgpdmjfg7bacf9a0nlxrvbz99zh86kgbrjh1xjr8f"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -94674,6 +94890,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-builtin-refactorings" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, haskell-tools-rewrite, mtl, old-time + , polyparse, references, split, tasty, tasty-hunit + , template-haskell, time, transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-builtin-refactorings"; + version = "1.0.0.0"; + sha256 = "0mhigqzivx1r04gi9v4jb7cvzirly8bbm3nckib170yws884gcba"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split template-haskell + transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl old-time polyparse references split tasty + tasty-hunit template-haskell time transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, haskell-tools-ast @@ -94704,7 +94951,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-cli_0_9_0_0" = callPackage + "haskell-tools-cli_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-daemon @@ -94713,8 +94960,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.9.0.0"; - sha256 = "04ycy6hqnzqj9gc4vqf95flc3yh3swx201n2daggkmxayasiivqj"; + version = "1.0.0.0"; + sha256 = "1y0jlgp3b8bxgrs406c32drdphblnn5c7rsqj2n9gvmhmdj01iwc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94723,8 +94970,8 @@ self: { haskell-tools-refactor mtl references split strict ]; executableHaskellDepends = [ - base directory filepath Glob haskell-tools-builtin-refactorings mtl - optparse-applicative process split + base directory filepath Glob haskell-tools-builtin-refactorings + haskell-tools-daemon mtl optparse-applicative process split ]; testHaskellDepends = [ base bytestring directory filepath @@ -94732,14 +94979,14 @@ self: { ]; benchmarkHaskellDepends = [ aeson base bytestring criterion directory filepath - haskell-tools-builtin-refactorings knob split time + haskell-tools-builtin-refactorings haskell-tools-daemon knob split + time ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {haskell-tools-builtin-refactorings = null;}; + }) {}; "haskell-tools-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff @@ -94768,6 +95015,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-daemon_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative + , pretty, process, references, split, strict, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "1.0.0.0"; + sha256 = "0pgpir9p693wym1krw2pyk17aq0dv10xbypw44ik6syzmy8j1zla"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq Diff directory + filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor mtl network + optparse-applicative pretty process references split strict + template-haskell + ]; + executableHaskellDepends = [ + base directory filepath haskell-tools-builtin-refactorings + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc Glob + haskell-tools-builtin-refactorings HUnit network process tasty + tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -94790,7 +95072,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-debug_0_9_0_0" = callPackage + "haskell-tools-debug_1_0_0_0" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings , haskell-tools-prettyprint, haskell-tools-refactor, references @@ -94798,8 +95080,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "0.9.0.0"; - sha256 = "0lbb8ip5y511v41i9xw9yi4nk2f0xmxv8ddcr0faxvy503miv613"; + version = "1.0.0.0"; + sha256 = "0jbiid1plb2y2sfpi5m46kl6waap8xhk8bqk5q9km2w7np0fv5dc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94813,8 +95095,7 @@ self: { description = "Debugging Tools for Haskell-tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {haskell-tools-builtin-refactorings = null;}; + }) {}; "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory @@ -94846,7 +95127,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-demo_0_9_0_0" = callPackage + "haskell-tools-demo_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -94856,8 +95137,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.9.0.0"; - sha256 = "1mb2ica5x5x66z68px9sfy0gndla1qmydlb9vcwvvc2wv8jmn8mr"; + version = "1.0.0.0"; + sha256 = "0kyf83wg514yl795k63wlklrdlz3fnnxl9qjkcwv5fxkxxixxf07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94876,8 +95157,38 @@ self: { description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {haskell-tools-builtin-refactorings = null;}; + }) {}; + + "haskell-tools-experimental-refactorings" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, haskell-tools-rewrite, mtl, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-experimental-refactorings"; + version = "1.0.0.0"; + sha256 = "1k3grr8jca4samw0hqm1yrq8yjg4nw0z4gwx366anjpvwb1chr9a"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split template-haskell + transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split tasty tasty-hunit + template-haskell time transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; "haskell-tools-prettyprint" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl @@ -94896,14 +95207,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-prettyprint_0_9_0_0" = callPackage + "haskell-tools-prettyprint_1_0_0_0" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.9.0.0"; - sha256 = "15ym19dhn4lvv2szyp4bj7347bmbj43p76hj5fi1v2z20irjvmfi"; + version = "1.0.0.0"; + sha256 = "1f27xziimiz81sjns8hia6xsk94zm3yjpcdvihaqr0g0dq1mkfwl"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -94944,7 +95255,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-refactor_0_9_0_0" = callPackage + "haskell-tools-refactor_1_0_0_0" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references @@ -94952,8 +95263,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.9.0.0"; - sha256 = "0n9j8rlv613b0l5g3lihqp6rfkxxdm21f1m4fqygbi7fb3d6n7ss"; + version = "1.0.0.0"; + sha256 = "0s3mdwpsla79ppcsl7n3r1yjbi0db0w6yk2zf143p5ngbhj08rs4"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -94988,15 +95299,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-rewrite_0_9_0_0" = callPackage + "haskell-tools-rewrite_1_0_0_0" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references , tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.9.0.0"; - sha256 = "1vdbnb7808v2wycrg7nz0zx6rb8mjb1d50i57g6irfwk3s46k31s"; + version = "1.0.0.0"; + sha256 = "0zm7bdlfda29md86s0bz40y3ml1pb6x8fvp4br8gxj7r3j1l8852"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -97617,29 +97928,28 @@ self: { }) {}; "hcg-minus" = callPackage - ({ mkDerivation, base, colour }: + ({ mkDerivation, base, colour, random }: mkDerivation { pname = "hcg-minus"; - version = "0.15"; - sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r"; + version = "0.16"; + sha256 = "0578yi5zc61chmp936s5wczdd8j3593br24zx57sqr5a50c0mwmc"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base colour ]; + libraryHaskellDepends = [ base colour random ]; homepage = "http://rd.slavepianos.org/t/hcg-minus"; description = "haskell cg (minus)"; license = stdenv.lib.licenses.bsd3; }) {}; "hcg-minus-cairo" = callPackage - ({ mkDerivation, base, cairo, colour, filepath, hcg-minus - , utf8-string + ({ mkDerivation, base, cairo, colour, filepath, hcg-minus, process }: mkDerivation { pname = "hcg-minus-cairo"; - version = "0.15"; - sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9"; + version = "0.16"; + sha256 = "0q51m7rac2dij9y34pp74xpz8qsskjb2if7i5dynpk9jnpqkj26h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo colour filepath hcg-minus utf8-string + base cairo colour filepath hcg-minus process ]; homepage = "http://rd.slavepianos.org/t/hcg-minus-cairo"; description = "haskell cg (minus) (cairo rendering)"; @@ -102411,13 +102721,15 @@ self: { }) {}; "hly" = callPackage - ({ mkDerivation, base, directory, filepath, hmt, process }: + ({ mkDerivation, base, directory, filepath, hmt, process, split }: mkDerivation { pname = "hly"; - version = "0.15"; - sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8"; + version = "0.16"; + sha256 = "0ccd5w4vzwki6p9dc69hx65ac1mkbjh5dx96gp2cb8qj3w3cas2m"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base directory filepath hmt process ]; + libraryHaskellDepends = [ + base directory filepath hmt process split + ]; homepage = "http://rd.slavepianos.org/t/hly"; description = "Haskell LilyPond"; license = "GPL"; @@ -102935,20 +103247,20 @@ self: { }) {inherit (pkgs) mpfr;}; "hmt" = callPackage - ({ mkDerivation, array, base, bytestring, colour, containers - , data-ordlist, directory, filepath, lazy-csv, logict - , multiset-comb, parsec, permutation, primes, safe, split - , utf8-string + ({ mkDerivation, aeson, array, base, bytestring, colour, containers + , data-ordlist, directory, fgl, filepath, lazy-csv, logict + , modular-arithmetic, multiset-comb, parsec, permutation, primes + , random, safe, split, text }: mkDerivation { pname = "hmt"; - version = "0.15"; - sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9"; + version = "0.16"; + sha256 = "1s6fjyphq57wh15vryj6y493ikaqa3g14x6hj9lg2h6wf6g8042h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring colour containers data-ordlist directory - filepath lazy-csv logict multiset-comb parsec permutation primes - safe split utf8-string + aeson array base bytestring colour containers data-ordlist + directory fgl filepath lazy-csv logict modular-arithmetic + multiset-comb parsec permutation primes random safe split text ]; homepage = "http://rd.slavepianos.org/t/hmt"; description = "Haskell Music Theory"; @@ -104426,18 +104738,38 @@ self: { license = "GPL"; }) {}; + "hosc_0_16" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring + , data-binary-ieee754, network, time, transformers + }: + mkDerivation { + pname = "hosc"; + version = "0.16"; + sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-builder bytestring data-binary-ieee754 network + time transformers + ]; + homepage = "http://rd.slavepianos.org/t/hosc"; + description = "Haskell Open Sound Control"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hosc-json" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , hosc, json, text, unordered-containers, utf8-string, vector + , hosc, json, text, transformers, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "hosc-json"; - version = "0.15"; - sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi"; + version = "0.16"; + sha256 = "059wpgvr2vbkdq2gmy8mrwqkqv1zrh2qz499v6i242q0z9m4gr3m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring hosc json text - unordered-containers utf8-string vector + transformers unordered-containers utf8-string vector ]; homepage = "http://rd.slavepianos.org/t/hosc-json"; description = "Haskell Open Sound Control JSON Serialisation"; @@ -105317,19 +105649,14 @@ self: { }) {}; "hps" = callPackage - ({ mkDerivation, base, directory, filepath, hcg-minus, random }: + ({ mkDerivation, base, filepath, hcg-minus, process }: mkDerivation { pname = "hps"; - version = "0.15"; - sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh"; - isLibrary = true; - isExecutable = true; + version = "0.16"; + sha256 = "0y819776sk97hdwf67x67289gdqmxn2g39l7ri0n8z8vdap5rq96"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base hcg-minus ]; - executableHaskellDepends = [ - base directory filepath hcg-minus random - ]; - homepage = "http://rd.slavepianos.org/?t=hps"; + libraryHaskellDepends = [ base filepath hcg-minus process ]; + homepage = "http://rd.slavepianos.org/t/hps"; description = "Haskell Postscript"; license = "GPL"; }) {}; @@ -105836,6 +106163,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fltk; fltk_images = null;}; + "hs-functors" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "hs-functors"; + version = "0.1.0.0"; + sha256 = "0hm7cmmamn9sgdcy38i1lvxkjmlzab7k2x97mpzf881rs7wdp9s3"; + libraryHaskellDepends = [ base transformers ]; + description = "Functors from products of Haskell and its dual to Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-gchart" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -106549,19 +106887,19 @@ self: { }) {}; "hsc3" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , data-ordlist, directory, filepath, hashable, hosc, network - , process, random, safe, split, transformers + ({ mkDerivation, array, base, binary, bytestring, containers + , data-default, data-ordlist, directory, filepath, hashable, hosc + , network, process, random, safe, split, transformers, vector }: mkDerivation { pname = "hsc3"; - version = "0.15.1"; - sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha"; + version = "0.16"; + sha256 = "0m6pas8dx48mx91159s7p7fljnivs13cg34gys906nhq11dmjdqn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary bytestring containers data-default data-ordlist + array base binary bytestring containers data-default data-ordlist directory filepath hashable hosc network process random safe split - transformers + transformers vector ]; homepage = "http://rd.slavepianos.org/t/hsc3"; description = "Haskell SuperCollider"; @@ -106634,8 +106972,8 @@ self: { ({ mkDerivation, base, directory, filepath, hsc3, process }: mkDerivation { pname = "hsc3-dot"; - version = "0.15"; - sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m"; + version = "0.16"; + sha256 = "0jz3x6s6svgil1cyalq4xkv09s55d8r44cc2ksp0npmgpmp3x454"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath hsc3 process ]; homepage = "http://rd.slavepianos.org/t/hsc3-dot"; @@ -110024,20 +110362,22 @@ self: { }) {}; "html-tokenizer" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, case-insensitive - , conversion, conversion-case-insensitive, conversion-text - , directory, doctest, filepath, text + ({ mkDerivation, attoparsec, base, base-prelude, html-entities + , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, vector + , vector-builder }: mkDerivation { pname = "html-tokenizer"; - version = "0.4.1"; - sha256 = "1h8pxphfx4pic0ds6mivk74ca761wkiklyd3bmfyqgbnhllsfxhh"; + version = "0.5"; + sha256 = "1i8pgl8vz36l6xm6cfx5slnav1115mhdj4qy2arkxysa7xh8lw7y"; libraryHaskellDepends = [ - attoparsec base-prelude case-insensitive conversion - conversion-case-insensitive conversion-text text + attoparsec base base-prelude html-entities semigroups text + text-builder vector vector-builder ]; testHaskellDepends = [ - base base-prelude directory doctest filepath + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/nikita-volkov/html-tokenizer"; description = "An \"attoparsec\"-based HTML tokenizer"; @@ -111222,8 +111562,8 @@ self: { }: mkDerivation { pname = "http2-client"; - version = "0.5.0.0"; - sha256 = "1vzbh65ifndpbwdwaam1zcy7myqxk39sl0m8244pg7ixy8yrnc25"; + version = "0.6.0.0"; + sha256 = "09xbpasgjy7hziml68237jvxadvl3wgg6mgykfd61lb7fiq3f7kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116366,12 +116706,16 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, template-haskell }: + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: mkDerivation { pname = "inspection-testing"; - version = "0.1.1.2"; - sha256 = "1q8xqm63s0filhlg942kql71m9w85dgr409z4wzr7fsrvqydmaqi"; - libraryHaskellDepends = [ base containers ghc template-haskell ]; + version = "0.1.2"; + sha256 = "1si89b5scc7qw88shmyzi1abbvgl7fv16yw731n5niw4cqps329j"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; testHaskellDepends = [ base ]; homepage = "https://github.com/nomeata/inspection-testing"; description = "GHC plugin to do inspection testing"; @@ -116995,6 +117339,22 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "intrinsic-superclasses" = callPackage + ({ mkDerivation, base, containers, haskell-src-meta, mtl + , template-haskell + }: + mkDerivation { + pname = "intrinsic-superclasses"; + version = "0.1.0.0"; + sha256 = "0vvkh65fdm6sgx3m5irk6l96krg99f14h3z45lz19z6xj57627y5"; + libraryHaskellDepends = [ + base containers haskell-src-meta mtl template-haskell + ]; + homepage = "https://github.com/daig/intrinsic-superclasses#readme"; + description = "A quasiquoter implementation of the Intrinsic Superclasses Proposal"; + license = stdenv.lib.licenses.mit; + }) {}; + "intro" = callPackage ({ mkDerivation, base, bifunctors, binary, bytestring, containers , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe @@ -126493,15 +126853,15 @@ self: { }) {}; "lenz" = callPackage - ({ mkDerivation, base, base-unicode-symbols, profunctors + ({ mkDerivation, base, base-unicode-symbols, hs-functors , transformers }: mkDerivation { pname = "lenz"; - version = "0.2.1.0"; - sha256 = "1c2l5r8p2j59lns7340j50wfv3dpmjj3cw71k88d82d9qc842hwl"; + version = "0.2.2.1"; + sha256 = "0w8imq8x5g71byjv8q00fp688mc02kf19n2i23b8474z6sk1mhg8"; libraryHaskellDepends = [ - base base-unicode-symbols profunctors transformers + base base-unicode-symbols hs-functors transformers ]; description = "Van Laarhoven lenses"; license = stdenv.lib.licenses.bsd3; @@ -130491,8 +130851,8 @@ self: { }: mkDerivation { pname = "logging-effect-extra"; - version = "1.2.0"; - sha256 = "0d4n4swwgwz4hw750a9firyi516mhb83nr3gqpnrbfyf4mqnr1bc"; + version = "1.2.1"; + sha256 = "0sk4wagknvspn45lll1sy5jx3vz1ljsjj3yabyx7cnlyf5bl3k61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130530,8 +130890,8 @@ self: { }: mkDerivation { pname = "logging-effect-extra-handler"; - version = "1.1.0"; - sha256 = "01kkkcn49m684rbf7vgyl5swbfv6yv7h1nkwcii2caghkc0yxapi"; + version = "1.1.1"; + sha256 = "1g73xyd1skh7paamnsia0x3cdayd34s12xvvxqaifm3wm19jy1rf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131992,6 +132352,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) lzma;}; + "lzma-conduit_1_2_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit + , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "lzma-conduit"; + version = "1.2.0"; + sha256 = "0jpzl1nb422d1a5k4ylh5wkl225x816xnx1y7qkd8wzxp5xxa7ba"; + libraryHaskellDepends = [ + base bytestring conduit lzma resourcet transformers + ]; + testHaskellDepends = [ + base base-compat bytestring conduit HUnit QuickCheck resourcet + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/alphaHeavy/lzma-conduit"; + description = "Conduit interface for lzma/xz compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit , lzma, mtl, QuickCheck, test-framework, test-framework-hunit @@ -134974,6 +135356,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mega-sdist_0_3_0_4" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude-conduit + , conduit-extra, directory, filepath, http-conduit, optparse-simple + , tar-conduit, temporary, text, typed-process, yaml + }: + mkDerivation { + pname = "mega-sdist"; + version = "0.3.0.4"; + sha256 = "1qf7lhk2063lpkg2bm7x7sxxxf87laxjwsr4rw46hvjj2m8frh41"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring classy-prelude-conduit conduit-extra directory + filepath http-conduit optparse-simple tar-conduit temporary text + typed-process yaml + ]; + homepage = "https://github.com/snoyberg/mega-sdist#readme"; + description = "Handles uploading to Hackage from mega repos"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, hspec, hspec-expectations, mtl, QuickCheck @@ -136263,8 +136667,8 @@ self: { }: mkDerivation { pname = "midimory"; - version = "0.0.0.2"; - sha256 = "13bfb2s6ybvspmmq427v55nb2csvcp4ijfgm9fvfh6cab2pm1dyz"; + version = "0.0.0.3"; + sha256 = "0jnzj3br3pb9ld1ha96kxk4zsxc38gc3njxmqb7nj8155b7r7x96"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137672,8 +138076,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "1.0.0.42"; - sha256 = "17817g4fyy03la1jh718mrncpjf6vjh819rpvgjcmzk6dl2p0a49"; + version = "1.0.0.43"; + sha256 = "1wbxvsisk1aah186xn32sndw8djrk96dpawhsmygxkncn264599f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -138070,6 +138474,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-io-adapter" = callPackage + ({ mkDerivation, base, exceptions, hspec, monad-control + , monad-logger, mtl, transformers, transformers-base + }: + mkDerivation { + pname = "monad-io-adapter"; + version = "0.1.0.0"; + sha256 = "0lbgc89d4wh7ciiv9mdp9fr1zfffqgsj504jxv9v6v1ba25fy9is"; + libraryHaskellDepends = [ + base exceptions monad-control monad-logger mtl transformers + transformers-base + ]; + testHaskellDepends = [ base hspec transformers-base ]; + homepage = "https://github.com/cjdev/monad-io-adapter#readme"; + description = "Adapters between MonadIO and MonadBase IO"; + license = stdenv.lib.licenses.isc; + }) {}; + "monad-journal" = callPackage ({ mkDerivation, base, either, monad-control, mtl, transformers , transformers-base @@ -138816,12 +139238,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-unlift-ref_0_2_1" = callPackage + ({ mkDerivation, base, constraints, exceptions, monad-control + , monad-unlift, mtl, mutable-containers, resourcet, stm + , transformers, transformers-base + }: + mkDerivation { + pname = "monad-unlift-ref"; + version = "0.2.1"; + sha256 = "078xjz3a6rgqqgf8zg9ngspixf9pgch845l6gs5ssy3l54wra18g"; + libraryHaskellDepends = [ + base constraints exceptions monad-control monad-unlift mtl + mutable-containers resourcet stm transformers transformers-base + ]; + homepage = "https://github.com/fpco/monad-unlift"; + description = "Typeclasses for representing monad transformer unlifting"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-var" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "monad-var"; - version = "0.1.0.1"; - sha256 = "03il4cas2qsv900pcz5cd65kv1nv8vj7rdms04j9lkq1rsgc7qll"; + version = "0.1.1.1"; + sha256 = "1j9ydl29a4cqhkackcpzlp7amiwk0ifvyxdcmi2vka7m1d98jc6z"; libraryHaskellDepends = [ base stm transformers ]; homepage = "https://github.com/effectfully/monad-var#readme"; description = "Generic operations over variables"; @@ -148666,6 +149107,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opml-conduit_0_6_0_4" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, conduit + , conduit-combinators, containers, data-default, hlint, lens-simple + , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck + , quickcheck-instances, resourcet, safe-exceptions, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types + }: + mkDerivation { + pname = "opml-conduit"; + version = "0.6.0.4"; + sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base case-insensitive conduit conduit-combinators containers + lens-simple mono-traversable monoid-subclasses safe-exceptions + semigroups text time timerep uri-bytestring xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators containers data-default + hlint lens-simple mono-traversable mtl parsers QuickCheck + quickcheck-instances resourcet semigroups tasty tasty-hunit + tasty-quickcheck text time uri-bytestring xml-conduit + ]; + homepage = "https://github.com/k0ral/opml-conduit"; + description = "Streaming parser/renderer for the OPML 2.0 format."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opn" = callPackage ({ mkDerivation, base, directory, filepath, ini, network-uri , optparse-applicative, process, text, unordered-containers @@ -150073,22 +150544,25 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_0_2" = callPackage + "pandoc_2_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default , deepseq, Diff, directory, doctemplates, executable-path, filepath - , Glob, haddock-library, hslua, HTTP, http-client, http-client-tls - , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types - , parsec, process, QuickCheck, random, safe, scientific, SHA - , skylighting, split, syb, tagsoup, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, temporary, texmath, text, time - , unix, unordered-containers, vector, xml, yaml, zip-archive, zlib + , Glob, haddock-library, hslua, hslua-module-text, HTTP + , http-client, http-client-tls, http-types, JuicyPixels, mtl + , network, network-uri, pandoc-types, parsec, process, QuickCheck + , random, safe, scientific, SHA, skylighting, split, syb, tagsoup + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, temporary + , texmath, text, time, unix, unordered-containers, vector, xml + , yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.0.2"; - sha256 = "1ygrxq5hpzr29pdmir3ms2crihg1bqrdjlxjvm6yfq4pjdlxg7xp"; + version = "2.0.3"; + sha256 = "1vmk5kcys400gwbddxwsnh5lhv4n8jvi9nnhad1pf1hzva3y056q"; + revision = "1"; + editedCabalFile = "1fzvy28900577aca4sb8g36h4n50ifvmbhayppm02a755rfzqzdl"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -150098,11 +150572,11 @@ self: { aeson aeson-pretty base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive cmark-gfm containers data-default deepseq directory doctemplates filepath Glob - haddock-library hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri pandoc-types parsec process - random safe scientific SHA skylighting split syb tagsoup temporary - texmath text time unix unordered-containers vector xml yaml - zip-archive zlib + haddock-library hslua hslua-module-text HTTP http-client + http-client-tls http-types JuicyPixels mtl network network-uri + pandoc-types parsec process random safe scientific SHA skylighting + split syb tagsoup temporary texmath text time unix + unordered-containers vector xml yaml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -153954,8 +154428,8 @@ self: { }: mkDerivation { pname = "persistent-relational-record"; - version = "0.1.1.0"; - sha256 = "145am29vwjvvs93z8kqj4dgh71h64ascmqnd70w9g9qszb2rjwrm"; + version = "0.1.2.0"; + sha256 = "1xbrkf7vw872hxk6g7bv4c5hx0708x6sqf38a4qm0m9bf2qiakgd"; libraryHaskellDepends = [ base conduit containers mtl persistable-record persistent relational-query resourcet template-haskell text @@ -161281,8 +161755,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.0.0"; - sha256 = "1q4c2bhw6fjjc5344yz7bz5ig70gccv4s1cxkwh3ps1z7sbqbyk9"; + version = "5.1.0"; + sha256 = "0bl1kb24s2bs7li096s4iwvd2wj188lb2y3cfymhgsyqj8c2fbzp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162871,8 +163345,8 @@ self: { }: mkDerivation { pname = "pusher-ws"; - version = "0.1.0.1"; - sha256 = "0i5659wljhaindimm8b6khibr8mcmcr5iaags2a33zjb67gjbsd7"; + version = "0.1.1.0"; + sha256 = "04nk5jdw7pv57366hjscl5sdhbhyplpfb34y1dj3i31d8s20yn1a"; libraryHaskellDepends = [ aeson base bytestring containers deepseq hashable http-conduit lens lens-aeson network scientific stm text time transformers @@ -163301,15 +163775,16 @@ self: { "qr-imager" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory - , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode - , microlens, MissingH, optparse-applicative, process, vector + , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels + , libqrencode, microlens, MissingH, optparse-applicative, process + , vector }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.2"; - sha256 = "0hvyjhb1pki1w59zhps7lbzz8l7wslz0a46vb4licm81m85fxhbk"; + version = "1.0.1.3"; + sha256 = "0n2y4z6s00b31dj5qwyykncxfi4yyiqvpxq1r7ls2xvv9pa4bhgc"; libraryHaskellDepends = [ - aeson base bytestring cryptonite directory haskell-qrencode + aeson base bytestring cryptonite directory either haskell-qrencode jose-jwt JuicyPixels microlens MissingH optparse-applicative process vector ]; @@ -169789,6 +170264,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "repline_0_1_7_0" = callPackage + ({ mkDerivation, base, containers, haskeline, mtl, process }: + mkDerivation { + pname = "repline"; + version = "0.1.7.0"; + sha256 = "1pjmkr5lnc6vdy8g90wnxlh1rzq6f3sc0j1facfc42iqi9fh6fjh"; + libraryHaskellDepends = [ base containers haskeline mtl process ]; + homepage = "https://github.com/sdiehl/repline"; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -170969,6 +171457,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rfc" = callPackage + ({ mkDerivation, aeson, aeson-diff, async, base, blaze-html + , classy-prelude, containers, data-default, exceptions, hedis + , http-api-data, http-client-tls, http-types, lens, lifted-async + , markdown, monad-control, postgresql-simple, resource-pool + , servant, servant-blaze, servant-docs, servant-server + , servant-swagger, simple-logger, string-conversions, swagger2 + , temporary, text, time-units, unordered-containers, url + , uuid-types, vector, wai, wai-cors, wai-extra, wreq + }: + mkDerivation { + pname = "rfc"; + version = "0.0.0.3"; + sha256 = "0068sckjcgcacjlj7xp0z02q60qghkji9l4frjagjsxxsskkksvc"; + libraryHaskellDepends = [ + aeson aeson-diff async base blaze-html classy-prelude containers + data-default exceptions hedis http-api-data http-client-tls + http-types lens lifted-async markdown monad-control + postgresql-simple resource-pool servant servant-blaze servant-docs + servant-server servant-swagger simple-logger string-conversions + swagger2 temporary text time-units unordered-containers url + uuid-types vector wai wai-cors wai-extra wreq + ]; + homepage = "https://github.com/RobertFischer/rfc#README.md"; + description = "Robert Fischer's Common library, for all Robert Fischer's common needs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rfc1413-server" = callPackage ({ mkDerivation, base, network-simple, rfc1413-types }: mkDerivation { @@ -180925,8 +181441,8 @@ self: { }: mkDerivation { pname = "silvi"; - version = "0.0.2"; - sha256 = "1rls25wifkgkz1fg4xw4bvpxa1807dp1h2q8kk7j7if7b66pj0cx"; + version = "0.0.3"; + sha256 = "1brvx8acfvpcw402b3676ydi6r95js6bhaasll59bm1khhl8d90b"; libraryHaskellDepends = [ base bytestring chronos http-types ip quantification savage text ]; @@ -182477,7 +182993,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_3_2" = callPackage + "skylighting_0_4_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -182486,8 +183002,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.3.2"; - sha256 = "00qs35kjj68z75vmc0ijqn5ghrq2gdyi5q2j9x4lchvizgq6czhw"; + version = "0.4.4"; + sha256 = "0i5wp229gbix0dhdwqm59af0v6g51wsdk8q5b7d49kp3rl4iv2bi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185312,19 +185828,15 @@ self: { }) {}; "sort-by-pinyin" = callPackage - ({ mkDerivation, air, air-extra, air-th, base, bytestring - , containers, text - }: + ({ mkDerivation, air, base, bytestring, containers, text }: mkDerivation { pname = "sort-by-pinyin"; - version = "2014.5.19"; - sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd"; + version = "2017.10.18"; + sha256 = "0gxz5kmkcmq8330v1iclhxqzfb6p9qk4prnskm16qmv2i4dp1p34"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - air air-extra air-th base bytestring containers text - ]; + libraryHaskellDepends = [ air base bytestring containers text ]; homepage = "https://github.com/nfjinjing/sort-by-pinyin"; - description = "Sort simplified Chinese by PinYin"; + description = "Sort Simplified Chinese by PinYin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -185994,8 +186506,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.3.0"; - sha256 = "05xc8dkrzf60pdbxw4mpdy2yqd4l3vxsqkq27f2wf6qqf6bc4vsh"; + version = "0.3.1"; + sha256 = "01w44hd53n770fm49x70k3c4pwvsvp641x7kdnafg6czy8500s2k"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -191215,6 +191727,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "subzero" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "subzero"; + version = "0.1.0.1"; + sha256 = "09fbj5gkppy2i7bnkhm8qai0zqazw0943d8fk1jfzhdz59pby4vm"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/code5hot/subzero#readme"; + description = "Helps when going \"seed values\" -> alternatives and optional -> answers"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "success" = callPackage ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base @@ -191591,14 +192116,17 @@ self: { }) {}; "supermonad" = callPackage - ({ mkDerivation, base, containers, fgl, ghc, mtl, transformers }: + ({ mkDerivation, base, containers, fgl, ghc, mtl, QuickCheck + , transformers + }: mkDerivation { pname = "supermonad"; - version = "0.1"; - sha256 = "0qlf3alrfi8zibqzlnd6gd422vwbhz37inr0ycdl7cz5x7m4g5pd"; + version = "0.2.0"; + sha256 = "1k1ysyjgnq5wic8hifrhpcmbi267inllqrh1dij234xykrkifd1m"; libraryHaskellDepends = [ base containers fgl ghc mtl transformers ]; + testHaskellDepends = [ base containers ghc QuickCheck ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -192228,8 +192756,8 @@ self: { ({ mkDerivation, base, containers, hashable, QuickCheck, vector }: mkDerivation { pname = "sym"; - version = "0.12.1"; - sha256 = "0qh023v5008byrfcc5ryj8fcl2pck3g8yjqdnrdij0jb4fhx3prw"; + version = "0.13.0"; + sha256 = "0ppgdhhxn5w05194mwcsca6m853h8hh5bxsm2l3jz52y388pi0ic"; libraryHaskellDepends = [ base containers hashable vector ]; testHaskellDepends = [ base hashable QuickCheck ]; homepage = "https://github.com/akc/sym"; @@ -197109,8 +197637,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.4.2"; - sha256 = "1k3dna9l438cxlcyl2a28ld68ki3a7qrc35vrssn2dlcf5l89ng4"; + version = "0.5.1"; + sha256 = "1x5dacn3zkc3v72kspdicmp0c1cr8yq83xp115lfj7aq5riw6z1r"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -201707,8 +202235,8 @@ self: { }: mkDerivation { pname = "traildb"; - version = "0.1.2.0"; - sha256 = "0a6pjkslq4vi84l04g8s640hwg2yki3015z1glcslyyj4x4wb47m"; + version = "0.1.4.0"; + sha256 = "1qp3m8vfjy9kim9jikhxplyp6c21scj18n9qnb0pfd0hpjyigd9b"; libraryHaskellDepends = [ base bytestring containers directory exceptions primitive profunctors text time transformers unix vector @@ -206479,8 +207007,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.7.1.1"; - sha256 = "08q3ldx0saahlxh2zkwmsq71lkwrvfrs19nzbgwwdvd31y4r0iq6"; + version = "0.8.0"; + sha256 = "058c9fhf5lysswch8gwicpjjpqh6l03iz861vm913r3a8lam777f"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text @@ -207889,6 +208417,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "util"; + version = "0.1.0.0"; + sha256 = "10n0c7yxvyzf7j4i3mlkxcz1xpc7vdll80rd4pwrs7rhqmd94viw"; + libraryHaskellDepends = [ base ]; + description = "Utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "util-plus" = callPackage ({ mkDerivation, array, base, containers, hashable, HTF, QuickCheck , safe, unordered-containers @@ -209102,6 +209641,26 @@ self: { license = "GPL"; }) {}; + "vec" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, boring, criterion + , deepseq, distributive, fin, hashable, inspection-testing, lens + , semigroupoids, semigroups, tagged, vector + }: + mkDerivation { + pname = "vec"; + version = "0"; + sha256 = "1h4s4j10z94mjdifyibpnc7zzq6a8xklbzj164ck8hdq8fp7qj52"; + libraryHaskellDepends = [ + adjunctions base base-compat boring deepseq distributive fin + hashable lens semigroupoids semigroups + ]; + testHaskellDepends = [ base fin inspection-testing tagged ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + homepage = "https://github.com/phadej/vec"; + description = "Nat, Fin and Vec types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vect" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -210956,6 +211515,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_20_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.20.2"; + sha256 = "0szmh1wnbcw1mi89rrp35kgnjglc2dx6ib5l3rcki4d9fc04w8xn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive cookie fast-logger + hspec http-types HUnit resourcet text time transformers wai zlib + ]; + homepage = "http://github.com/yesodweb/wai"; + 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 @@ -211803,6 +212394,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-throttle_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, containers + , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm + , text, token-bucket, transformers, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-throttle"; + version = "0.2.2.0"; + sha256 = "0k5q6vziq67bscfrm1dx6i4wkvw30wa35mgdd7x1dzniibx87dva"; + libraryHaskellDepends = [ + base bytestring bytestring-builder containers hashable http-types + mtl network stm text token-bucket transformers wai + ]; + testHaskellDepends = [ + base bytestring hspec http-types HUnit QuickCheck stm transformers + wai wai-extra + ]; + description = "WAI Middleware for Request Throttling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-verbs" = callPackage ({ mkDerivation, base, errors, exceptions, hashable, http-types , mmorph, monad-logger, mtl, resourcet, text, transformers @@ -213805,6 +214418,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weigh_0_0_6" = callPackage + ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl + , process, random, split, template-haskell, temporary + , unordered-containers + }: + mkDerivation { + pname = "weigh"; + version = "0.0.6"; + sha256 = "0izi5qsxjq2cjhk0xzdkmf8q36zg469csricyzy8vhd70mlp9g4r"; + libraryHaskellDepends = [ + base deepseq mtl process split template-haskell temporary + ]; + testHaskellDepends = [ + base bytestring-trie containers deepseq random unordered-containers + ]; + homepage = "https://github.com/fpco/weigh#readme"; + description = "Measure allocations of a Haskell functions/values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weighted" = callPackage ({ mkDerivation, base, mtl, semiring-num, transformers }: mkDerivation { @@ -216272,15 +216906,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "xeno_0_3_1" = callPackage + "xeno_0_3_2" = callPackage ({ mkDerivation, array, base, bytestring, criterion, deepseq , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector , weigh, xml }: mkDerivation { pname = "xeno"; - version = "0.3.1"; - sha256 = "19ymz1gymv6balkrak90z4z6131lnd6k00i67s3l1djdnv1p1qqm"; + version = "0.3.2"; + sha256 = "14vwfkhfrxpa0mszjlbvm704nnv1xpbnb4klsyifihp7j4hngpp9"; libraryHaskellDepends = [ array base bytestring deepseq mtl mutable-containers vector ]; @@ -216842,6 +217476,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-conduit-parse_0_3_1_2" = callPackage + ({ mkDerivation, base, conduit, conduit-parse, containers + , data-default, exceptions, hlint, parsers, resourcet, tasty + , tasty-hunit, text, xml-conduit, xml-types + }: + mkDerivation { + pname = "xml-conduit-parse"; + version = "0.3.1.2"; + sha256 = "0233jcpv7lzan2hh6siw2rrjkjp4f5i1kkpjpdfija01f8by3an1"; + libraryHaskellDepends = [ + base conduit conduit-parse containers exceptions parsers text + xml-conduit xml-types + ]; + testHaskellDepends = [ + base conduit conduit-parse data-default hlint parsers resourcet + tasty tasty-hunit + ]; + homepage = "https://github.com/k0ral/xml-conduit-parse"; + description = "Streaming XML parser based on conduits"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-writer" = callPackage ({ mkDerivation, base, containers, data-default, dlist, mtl, text , xml-conduit, xml-types @@ -218438,8 +219095,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "1"; - editedCabalFile = "0jpksvr3ycw0mraryn113x0b44f0574fkd0n24lbga3ha5armscq"; + revision = "2"; + editedCabalFile = "1wl5g0mrxkpkdlhjizh7m9z33pdygb460zxjm6qrcy90naywchqj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -219451,17 +220108,17 @@ self: { }) {}; "yesod-csp" = callPackage - ({ mkDerivation, attoparsec, base, hspec, mono-traversable - , network-uri, semigroups, syb, template-haskell, text, uniplate - , yesod, yesod-core, yesod-test + ({ mkDerivation, attoparsec, base, case-insensitive, hspec + , mono-traversable, network-uri, semigroups, syb, template-haskell + , text, wai, yesod, yesod-core, yesod-test }: mkDerivation { pname = "yesod-csp"; - version = "0.2.1.0"; - sha256 = "15af948x2z9qyj358ba9ggil65jw9bc5d99h6xcydxpnlgvmg0q6"; + version = "0.2.3.0"; + sha256 = "167yl3c68bfr91mqxl650lfa64d6ljaqach7cyl91gvdxwb1q262"; libraryHaskellDepends = [ - attoparsec base mono-traversable network-uri semigroups syb - template-haskell text uniplate yesod yesod-core + attoparsec base case-insensitive mono-traversable network-uri + semigroups syb template-haskell text wai yesod yesod-core ]; testHaskellDepends = [ attoparsec base hspec network-uri semigroups template-haskell yesod @@ -220032,6 +220689,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_4_3" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.4.3"; + sha256 = "0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix new file mode 100644 index 000000000000..7a6ff3cc53d1 --- /dev/null +++ b/pkgs/development/python-modules/thespian/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, lib }: + +buildPythonPackage rec { + version = "3.8.3"; + pname = "thespian"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0vvwsh3waxd5ldrayr86kdcshv07bp361fl7p16g9i044vklwly4"; + }; + + # Do not run the test suite: it takes a long type and uses + # significant system resources, including requiring localhost + # network operations. Thespian tests are performed via it's Travis + # CI configuration and do not need to be duplicated here. + doCheck = false; + + meta = with lib; { + description = "Python Actor concurrency library"; + homepage = http://thespianpy.com/; + license = licenses.mit; + maintainers = [ maintainers.kquick ]; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index bbfcc8513078..8568b218f37e 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.3"; + name = "gradle-4.3.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0k358y18pp2809kn5il4kv3qvlqrbwmy276bbm3mnmwjxx7g9jwd"; + sha256 = "1irsv5c4g0c8iln5hiikjr78rj1w2hjgyar5dp8a54h3rscf1sqm"; }; }; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e0aac84abb70..9dfd3b7e7289 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "0rav5a6znx81gwaxin1ib10sbfg16bgdnnyv1zn5sjify3f1wpqj"; + sha256 = "0fyfwpsbm9s3khxq8876ah85vjwfd5r4a59aix3zjmhq2v7j8n9j"; }; completion = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 09ca05484f7f..988f4efb9cdb 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,31 +1,56 @@ { stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool -, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive -, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar -, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3 -, pillow, ninja, gcab +, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking +, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales +, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord +, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook }: -let version = "0.9.6"; -in - stdenv.mkDerivation - { name = "fwupd-${version}"; - src = fetchurl - { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0h3y4ygckvkjdx7yxwbm273iv84yk37ivlcf4xvq95g64vs8gfhf"; - }; - buildInputs = - [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev - polkit appstream-glib gusb sqlite libarchive libsoup - docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind - meson gpgme libuuid pygobject3 pillow ninja gcab - ]; - patches = [ ./fix-missing-deps.patch ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar" - ''; - mesonFlags = [ "-Denable-colorhug=false" "-Denable-man=false" "-Denable-tests=false" "--localstatedir=/var" "-Denable-doc=false" "-Dwith-bootdir=/boot" ]; - enableParallelBuilding = true; - meta = - { license = [ stdenv.lib.licenses.gpl2 ]; - platforms = stdenv.lib.platforms.linux; - }; - } +let + version = "1.0.1"; +in stdenv.mkDerivation { + name = "fwupd-${version}"; + src = fetchurl { + url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; + sha256 = "1k627rja7df51dkzqvkzgbwrrj4049k6408d01m34n66zwr2fp59"; + }; + + nativeBuildInputs = [ + meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales + valgrind gcab docbook2x libxslt pygobject3 python3Packages.pycairo wrapGAppsHook + ]; + buildInputs = [ + polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml + libgudev colord gpgme libuuid pillow gnutls glib_networking + ]; + + LC_ALL = "en_US.UTF-8"; # For po/make-images + + NIX_CFLAGS_COMPILE = [ + "-I${efivar}/include/efivar" + # warning: "__LIBELF_INTERNAL__" is not defined + "-Wno-error=undef" + ]; + + patches = [ + ./fix-missing-deps.patch + ]; + postPatch = '' + patchShebangs . + ''; + + mesonFlags = [ + "-Denable-man=false" + "-Denable-tests=false" + "-Denable-doc=false" + "-Dwith-bootdir=/boot" + "-Dwith-udevdir=lib/udev" + "-Dwith-systemdunitdir=lib/systemd/system" + "--localstatedir=/var" + ]; + + enableParallelBuilding = true; + meta = { + homepage = https://fwupd.org/; + license = [ stdenv.lib.licenses.gpl2 ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch index be199227f3f8..46e11952afe0 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch @@ -1,86 +1,99 @@ -diff -Naur fwupd-0.9.6-orig/data/meson.build fwupd-0.9.6/data/meson.build ---- fwupd-0.9.6-orig/data/meson.build 2017-08-03 05:45:02.000000000 -0400 -+++ fwupd-0.9.6/data/meson.build 2017-09-02 19:58:37.324596487 -0400 -@@ -20,7 +20,7 @@ +--- a/data/builder/meson.build ++++ b/data/builder/meson.build +@@ -1,3 +0,0 @@ +-install_data('README.md', +- install_dir : join_paths(get_option('localstatedir'), 'lib', 'fwupd', 'builder') +-) +--- a/data/meson.build ++++ b/data/meson.build +@@ -7,16 +7,12 @@ + subdir('installed-tests') + endif + +-install_data(['daemon.conf'], +- install_dir : join_paths(get_option('sysconfdir'), 'fwupd') +-) +- + install_data(['org.freedesktop.fwupd.metainfo.xml'], + install_dir: join_paths(get_option('datadir'), 'metainfo') ) - install_data(['90-fwupd-devices.rules'], -- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') -+ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') + install_data(['org.freedesktop.fwupd.conf'], +- install_dir : join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d') ++ install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') ) - con2 = configuration_data() -@@ -52,7 +52,7 @@ - output : 'fwupd-offline-update.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'lib', 'systemd', 'system'), + install_data(['metadata.xml'], +--- a/data/pki/meson.build ++++ b/data/pki/meson.build +@@ -3,13 +3,13 @@ + 'GPG-KEY-Hughski-Limited', + 'GPG-KEY-Linux-Vendor-Firmware-Service', + ], +- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd') ++ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd') + ) + + install_data([ + 'GPG-KEY-Linux-Vendor-Firmware-Service', + ], +- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata') ++ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata') ) endif -@@ -63,6 +63,6 @@ - output : 'fwupd.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'lib', 'systemd', 'system'), +@@ -17,12 +17,12 @@ + install_data([ + 'LVFS-CA.pem', + ], +- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd') ++ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd') + ) + install_data([ + 'LVFS-CA.pem', + ], +- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata') ++ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata') ) endif -diff -Naur fwupd-0.9.6-orig/libdfu/meson.build fwupd-0.9.6/libdfu/meson.build ---- fwupd-0.9.6-orig/libdfu/meson.build 2017-08-03 05:45:02.000000000 -0400 -+++ fwupd-0.9.6/libdfu/meson.build 2017-09-02 19:58:37.325596508 -0400 -@@ -23,6 +23,10 @@ - giounix, - libm, - gusb, -+ uuid, -+ libarchive, -+ soup, -+ libgcab - ] - if get_option('enable-libelf') -diff -Naur fwupd-0.9.6-orig/meson.build fwupd-0.9.6/meson.build ---- fwupd-0.9.6-orig/meson.build 2017-08-03 05:45:02.000000000 -0400 -+++ fwupd-0.9.6/meson.build 2017-09-02 19:59:07.406216716 -0400 -@@ -124,6 +124,7 @@ - if polkit.version().version_compare('>= 0.114') - conf.set('HAVE_POLKIT_0_114', '1') - endif -+libgcab = dependency('libgcab-1.0') - gudev = dependency('gudev-1.0') - appstream_glib = dependency('appstream-glib', version : '>= 0.6.9') - gusb = dependency('gusb', version : '>= 0.2.9') -@@ -200,7 +201,7 @@ - 'fwupd-plugins-2') - conf.set_quoted('PLUGINDIR', plugin_dir) - --conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) -+conf.set_quoted('SYSCONFDIR', '/etc') - conf.set_quoted('BINDIR', - join_paths(get_option('prefix'), - get_option('bindir'))) -@@ -227,6 +228,9 @@ - plugin_deps += gmodule - plugin_deps += gusb - plugin_deps += soup -+plugin_deps += libarchive -+plugin_deps += uuid -+plugin_deps += libgcab - - subdir('data') - subdir('docs') -@@ -255,6 +259,3 @@ - endif +--- a/data/remotes.d/meson.build ++++ b/data/remotes.d/meson.build +@@ -3,7 +3,7 @@ + 'lvfs.conf', + 'lvfs-testing.conf', + ], +- install_dir : join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d') ++ install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d') + ) endif --if get_option('enable-systemd') -- meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir) --endif -diff -Naur fwupd-0.9.6-orig/po/make-images.sh fwupd-0.9.6/po/make-images.sh ---- fwupd-0.9.6-orig/po/make-images.sh 2017-08-03 05:45:02.000000000 -0400 -+++ fwupd-0.9.6/po/make-images.sh 2017-09-02 19:58:37.328596570 -0400 +@@ -19,12 +19,12 @@ + output : 'fwupd.conf', + configuration : con2, + install: true, +- install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'), + ) + configure_file( + input : 'vendor.conf', + output : 'vendor.conf', + configuration : con2, + install: true, +- install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'), + ) +--- a/meson_post_install.sh ++++ b/meson_post_install.sh +@@ -11,6 +11,4 @@ + echo 'Updating systemd deps' + mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants + ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service +- echo 'Creating stateful directory' +- mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd + #fi +--- a/po/make-images.sh ++++ b/po/make-images.sh @@ -7,6 +7,7 @@ # install -m 0755 -d ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/ @@ -89,26 +102,3 @@ diff -Naur fwupd-0.9.6-orig/po/make-images.sh fwupd-0.9.6/po/make-images.sh for x in ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/*/LC_IMAGES/*.bmp ; do gzip -f ${x} done -diff -Naur fwupd-0.9.6-orig/src/meson.build fwupd-0.9.6/src/meson.build ---- fwupd-0.9.6-orig/src/meson.build 2017-08-03 05:45:02.000000000 -0400 -+++ fwupd-0.9.6/src/meson.build 2017-09-02 19:58:37.329596590 -0400 -@@ -24,6 +24,9 @@ - polkit, - soup, - sqlite, -+ uuid, -+ libarchive, -+ libgcab - ], - link_with : fwupd, - c_args : [ -@@ -73,6 +76,9 @@ - gpgme, - gpgerror, - valgrind, -+ uuid, -+ libarchive, -+ libgcab - ], - link_with : fwupd, - c_args : [ diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 93a0f8a4c290..6039ada44e24 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-6.27"; + name = "ipset-6.34"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "0ddj66wr0xh9v6ks430l8r80lj2s9qc44d9c2ik48lwm0fl9fj3j"; + sha256 = "106nv1ngcvap0mqmb6jm07lc1q3w796rkzc1vrfs4yhbcwdq63np"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index bc940e0bc1bb..72ae02bbecde 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.15"; + version = "4.13.16"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1cnixf90pi9xsb8p1sncwcnl5acp8b46xxxmsizk335knmn919g4"; + sha256 = "0cf7prqzl1ajbgl98w0symdyn0k5wl5xaf1l5ldgy6l083yg69dh"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 71a9c9322ebd..127a65b715c2 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; import ./generic.nix (args // rec { - version = "4.14.1"; + version = "4.14.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rsdrdapjw8lhm8dyckwxfihykirbkincm5k0lwwx1pr09qgdfbg"; + sha256 = "0k264zxibhldgi9fcax11bjdv89jkdn1nbvvng312j2f19i909p9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index bff438fa0a27..11809364d96c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.100"; + version = "4.4.102"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kyi3cplkd839alyd6vsw2cqkb523zfsrjb2d6ygcddxqjcwsdlr"; + sha256 = "1zmaispqs9lw1kyalhln2l53hsg99riisgnmc50qj7cyalmc5qpd"; }; } // (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 96fe2223b94e..3e3626cb39d4 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.64"; + version = "4.9.65"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1h1h71nyiwvx2jy3j3yjazya6gz3k47bhm00mm311syaplhp0qhr"; + sha256 = "15a8a7p6i2dgiglps22cwsy5gsfkc39fy4jzvhjwz8s9fn3p1fi4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 5043c36f8c20..972bd53d95ee 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -11,6 +11,10 @@ buildGoPackage rec { sha256 = "048ap70hdfkxhy0y8q1jsb0lql1i99jnf3cqaqar6qs2ynzsw9hd"; }; + buildFlagsArray = [ ''-ldflags= + -X main.version=${version} + '' ]; + goPackagePath = "github.com/influxdata/influxdb"; excludedPackages = "test"; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index bb07c42b872c..d8dde97a0969 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,8 +2,8 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.8.3"; - sha256 = "077bdx22sj29v8q493b49xfzxpc38q45pjhmn4znw2fmkjilih5p"; + rev = "4.9"; + sha256 = "1qffh413k8c1mf3jj9hys3a7y1qfjcg2w96w4c9x3ida3lchg7ln"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index de51e1ad25f5..aeb4546ff4d3 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 30c75f19fbf8..dd88dd8c4ac2 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.63.0) + fastlane (2.66.2) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -52,9 +52,9 @@ GEM slack-notifier (>= 1.3, < 2.0.0) terminal-notifier (>= 1.6.2, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (~> 0.5.0) + tty-screen (~> 0.6.2) word_wrap (~> 1.0.0) - xcodeproj (>= 1.5.0, < 2.0.0) + xcodeproj (>= 1.5.2, < 2.0.0) xcpretty (>= 0.2.4, < 1.0.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.0.3) @@ -65,7 +65,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.6.1) + googleauth (0.6.2) faraday (~> 0.12) jwt (>= 1.4, < 3.0) logging (~> 2.0) @@ -112,7 +112,7 @@ GEM terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-screen (0.5.1) + tty-screen (0.6.3) uber (0.1.0) unf (0.1.4) unf_ext diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 8dd51a5733e6..16179d9118b6 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1al75bb3zq0y9r1ilrbhks198zmvwykmqnn2675jd9i2ijcbxv78"; + sha256 = "12pwfz36l1ks84618g6y7l6s4pbb86ngr4fmg1dnxgj01h4m7dx6"; type = "gem"; }; - version = "2.63.0"; + version = "2.66.2"; }; gh_inspector = { source = { @@ -163,10 +163,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13laklpf99m3qzq9n3vnc9dblgw7q05n1r16jlxsh4lxlaijr0sf"; + sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.2"; }; highline = { source = { @@ -393,10 +393,10 @@ tty-screen = { source = { remotes = ["https://rubygems.org"]; - sha256 = "12qkjwpkgznvhwbywq2y7l5mcq2f4z404b0ip7xm4byg3827lh4h"; + sha256 = "0582kwz0y0h5pn67gh36cds6b087i0jh622vw6f85gnqzmynilcv"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.3"; }; uber = { source = { diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 7284ee95a909..42ca4cf2e270 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, boost -, zlib, libpng, libjpeg, libtiff +, zlib, libpng, libjpeg, libtiff, x11, SDL }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ]; + buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} ''; - configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" ]; + configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/ckb/ckb-animations-location.patch b/pkgs/tools/misc/ckb/ckb-animations-location.patch index 07dcfab86be8..8e53685e76a6 100644 --- a/pkgs/tools/misc/ckb/ckb-animations-location.patch +++ b/pkgs/tools/misc/ckb/ckb-animations-location.patch @@ -1,12 +1,12 @@ diff --git a/src/ckb/animscript.cpp b/src/ckb/animscript.cpp -index d0b7f46..d7a3459 100644 +index f49a64c..d7a3459 100644 --- a/src/ckb/animscript.cpp +++ b/src/ckb/animscript.cpp @@ -30,7 +30,7 @@ QString AnimScript::path(){ #ifdef __APPLE__ return QDir(QApplication::applicationDirPath() + "/../Resources").absoluteFilePath("ckb-animations"); #else -- return QDir(QApplication::applicationDirPath()).absoluteFilePath("ckb-animations"); +- return QDir("/usr/lib").absoluteFilePath("ckb-animations"); + return QDir(QApplication::applicationDirPath() + "/../libexec").absoluteFilePath("ckb-animations"); #endif } diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix index 41116288e533..a0dbc6fd4fe9 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }: stdenv.mkDerivation rec { - version = "0.2.6"; - name = "ckb-${version}"; + version = "0.2.8"; + name = "ckb-next-${version}"; src = fetchFromGitHub { - owner = "ccMSC"; - repo = "ckb"; + owner = "mattanger"; + repo = "ckb-next"; rev = "v${version}"; - sha256 = "04h50qdzsbi77mj62jghr52i35vxvmhnvsb7pdfdq95ryry8bnwm"; + sha256 = "0b3h1d54mdyfcx46zvsd7dfqf2656h4jjkiw044170gnfdzxjb3w"; }; buildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; - homepage = https://github.com/ccMSC/ckb; + homepage = https://github.com/mattanger/ckb-next; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis ]; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 5e0c87c2f7d5..908a47e6326f 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,29 +1,21 @@ -{ fetchurl, stdenv, python, gnupg }: +{ fetchFromGitHub, stdenv, pythonPackages, gnupg }: -let version = "2.0.11"; in -stdenv.mkDerivation { +let version = "2.2.4"; in +pythonPackages.buildPythonApplication { name = "pius-${version}"; namePrefix = ""; - src = fetchurl { - url = "mirror://sourceforge/pgpius/pius/${version}/pius-${version}.tar.bz2"; - sha256 = "0pdbyqz6k0bm182cz81ss7yckmpms5qhrrw0wcr4a1srzcjyzf5f"; + src = fetchFromGitHub { + owner = "jaymzh"; + repo = "pius"; + rev = "v${version}"; + sha256 = "1yk6ngpk55yjdnzhm5sj675xbzwp7rir816a3aris647gsph1vlx"; }; - buildInputs = [ python ]; - patchPhase = '' - sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg|g' - ''; - - dontBuild = true; - - installPhase = '' - mkdir -p "$out/bin" - cp -v pius "$out/bin" - - mkdir -p "$out/doc/pius-${version}" - cp -v README "$out/doc/pius-${version}" + for file in libpius/constants.py pius-keyring-mgr; do + sed -i "$file" -E -e's|/usr/bin/gpg2?|${gnupg}/bin/gpg|g' + done ''; meta = { @@ -41,6 +33,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d4e2345e42d..6a6aba4f3ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19541,6 +19541,8 @@ with pkgs; pythonPackages = python3Packages; }; + ricty = callPackage ../data/fonts/ricty { }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; runit = callPackage ../tools/system/runit { }; @@ -19624,6 +19626,7 @@ with pkgs; terraform_0_8 terraform_0_9 terraform_0_10 + terraform_0_11 ; # Terraform with all the plugins, both to get Hydra to build all plugins for us and for diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 2a54566ef4a7..5f61c67b29cc 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -19,7 +19,7 @@ runCommand "nixpkgs-metrics" shift echo "running $@" - NIX_SHOW_STATS=1 time "$@" > /dev/null 2> stats + NIX_SHOW_STATS=1 time "$@" 2>&1 > /dev/null | tee stats cat stats @@ -40,9 +40,12 @@ runCommand "nixpkgs-metrics" echo "$name.values $x" >> $out/nix-support/hydra-metrics } - run nixos.smallContainer nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix -A closures.smallContainer.x86_64-linux - run nixos.kde nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix -A closures.kde.x86_64-linux - run nixos.lapp nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix -A closures.lapp.x86_64-linux + run nixos.smallContainer nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix \ + -A closures.smallContainer.x86_64-linux --show-trace + run nixos.kde nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix \ + -A closures.kde.x86_64-linux --show-trace + run nixos.lapp nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix \ + -A closures.lapp.x86_64-linux --show-trace run nix-env.qa nix-env -f ${nixpkgs} -qa run nix-env.qaDrv nix-env -f ${nixpkgs} -qa --drv-path --meta --xml diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e6afce3aeda8..3d70bb0cc252 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1394,13 +1394,18 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginHTMLWidget = buildPerlPackage { + CatalystPluginHTMLWidget = buildPerlPackage rec { name = "Catalyst-Plugin-HTML-Widget-1.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Catalyst-Plugin-HTML-Widget-1.1.tar.gz; - sha256 = "1zzyfhmzlqvbwk2w930k3mqk8z1lzhrja9ynx9yfq5gmc8qqg95l"; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + sha256 = "b4a4873162f515ec7cead6272533fc347c34711d138cc4c5e46b63fa2b74feff"; + }; + propagatedBuildInputs = [ CatalystRuntime HTMLWidget ]; + meta = { + description = "HTML Widget Catalyst Plugin"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + broken = true; }; - propagatedBuildInputs = [CatalystRuntime HTMLWidget]; }; CatalystPluginLogHandler = buildPerlPackage rec { @@ -2084,30 +2089,30 @@ let self = _self // overrides; _self = with self; { }; ClassLoad = buildPerlPackage rec { - name = "Class-Load-0.23"; + name = "Class-Load-0.24"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "13xjfh4fadq4pkq7fcj42b26544jl7gqdg2y3imnra9fwxwsbg7j"; + sha256 = "0bb983da46c146534fc77a556d6e40d925142f2eb43103534025ee545265ca36"; }; - buildInputs = [ TestFatal TestRequires ]; + buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ DataOptList ModuleImplementation ModuleRuntime PackageStash TryTiny ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = https://github.com/moose/Class-Load; description = "A working (require \"Class::Name\") and more"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; ClassLoadXS = buildPerlPackage rec { - name = "Class-Load-XS-0.09"; + name = "Class-Load-XS-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "1aivalms81s3a2cj053ncgnmkpgl7vspna8ajlkqir7rdn8kpv5v"; + sha256 = "5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1"; }; - buildInputs = [ ModuleImplementation TestFatal TestRequires ]; + buildInputs = [ ModuleImplementation TestFatal TestNeeds ]; propagatedBuildInputs = [ ClassLoad ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = https://github.com/moose/Class-Load-XS; description = "XS implementation of parts of Class::Load"; license = stdenv.lib.licenses.artistic2; }; @@ -10782,6 +10787,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ModuleBuild TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; + perlPreHook = "export LD=$CC"; meta = { homepage = https://metacpan.org/release/Params-Validate; description = "Validate method/function parameters"; @@ -15325,11 +15331,11 @@ let self = _self // overrides; _self = with self; { }; }; - UNIVERSALrequire = buildPerlPackage { - name = "UNIVERSAL-require-0.17"; + UNIVERSALrequire = buildPerlPackage rec { + name = "UNIVERSAL-require-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.17.tar.gz; - sha256 = "5dc9f13f2d2bbdf852387e2a63c0753728c2bea9125dd628c313db3ef66ec4c3"; + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "b2a736a87967a143dab58c8a110501d5235bcdd2c8b2a3bfffcd3c0bd06b38ed"; }; meta = { description = "Require() modules from a variable"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a04ee6db449..302e9dec1b92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18144,6 +18144,8 @@ in { cudnnSupport = false; }; + thespian = callPackage ../development/python-modules/thespian { }; + tidylib = buildPythonPackage rec { version = "0.2.4"; name = "pytidylib-${version}";