diff options
110 files changed, 1678 insertions, 938 deletions
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 3b433fdcc1d2..a7b43aeec23f 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -305,7 +305,7 @@ </section> <section> - <title>Cross packagaing cookbook</title> + <title>Cross packaging cookbook</title> <para> Some frequently problems when packaging for cross compilation are good to diff --git a/doc/functions.xml b/doc/functions.xml index 746ef7131f86..c23f6aa25967 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -521,7 +521,7 @@ merge:"diff3" <callout arearefs='ex-dockerTools-buildImage-2'> <para> <varname>tag</varname> specifies the tag of the resulting image. By - default it's <literal>latest</literal>. + default it's <literal>null</literal>, which indicates that the nix output hash will be used as tag. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-3'> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c66fbadb6dd7..5d4dd12e16da 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3185,6 +3185,11 @@ github = "qknight"; name = "Joachim Schiele"; }; + qoelet = { + email = "kenny@machinesung.com"; + github = "qoelet"; + name = "Kenny Shen"; + }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 51e77d24a74e..13b244e12f8c 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -127,6 +127,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' Make sure the key file is accessible to the daemon. </para> </listitem> + <listitem> + <para> + <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> as default value for <varname>tag</varname>, + which indicates that the nix output hash will be used as tag. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 4101ef82f3e1..48c3b41bc091 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -231,10 +231,6 @@ in # a collision with an apparently unrelated environment # variable with the same name exported by dhcpcd. interface_order='lo lo[0-9]*' - '' + optionalString config.services.nscd.enable '' - # Invalidate the nscd cache whenever resolv.conf is - # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' '' + optionalString (length resolvconfOptions > 0) '' # Options as described in resolv.conf(5) resolv_conf_options='${concatStringsSep " " resolvconfOptions}' diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c70d52c94cdb..f6628b8e9c51 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -627,6 +627,7 @@ ./services/security/hologram-agent.nix ./services/security/munge.nix ./services/security/oauth2_proxy.nix + ./services/security/oauth2_proxy_nginx.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix index 263a06156f84..13f3d61e84ca 100644 --- a/nixos/modules/services/desktops/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire.nix @@ -3,20 +3,34 @@ with lib; -{ +let + cfg = config.services.pipewire; + packages = with pkgs; [ pipewire ]; + +in { ###### interface options = { services.pipewire = { enable = mkEnableOption "pipewire service"; + + socketActivation = mkOption { + default = true; + type = types.bool; + description = '' + Automatically run pipewire when connections are made to the pipewire socket. + ''; + }; }; }; ###### implementation - config = mkIf config.services.pipewire.enable { - environment.systemPackages = [ pkgs.pipewire ]; + config = mkIf cfg.enable { + environment.systemPackages = packages; + + systemd.packages = packages; - systemd.packages = [ pkgs.pipewire ]; + systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; }; meta.maintainers = with lib.maintainers; [ jtojnar ]; diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix new file mode 100644 index 000000000000..2aa2c57fd22c --- /dev/null +++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -0,0 +1,64 @@ +{ pkgs, config, lib, ... }: +with lib; +let + cfg = config.services.oauth2_proxy.nginx; +in +{ + options.services.oauth2_proxy.nginx = { + proxy = mkOption { + type = types.string; + default = config.services.oauth2_proxy.httpAddress; + description = '' + The address of the reverse proxy endpoint for oauth2_proxy + ''; + }; + virtualHosts = mkOption { + type = types.listOf types.string; + default = []; + description = '' + A list of nginx virtual hosts to put behind the oauth2 proxy + ''; + }; + }; + config.services.oauth2_proxy = mkIf (cfg.virtualHosts != [] && (hasPrefix "127.0.0.1:" cfg.proxy)) { + enable = true; + }; + config.services.nginx = mkMerge ((optional (cfg.virtualHosts != []) { + recommendedProxySettings = true; # needed because duplicate headers + }) ++ (map (vhost: { + virtualHosts.${vhost} = { + locations."/oauth2/" = { + proxyPass = cfg.proxy; + extraConfig = '' + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Auth-Request-Redirect $request_uri; + ''; + }; + locations."/oauth2/auth" = { + proxyPass = cfg.proxy; + extraConfig = '' + proxy_set_header X-Scheme $scheme; + # nginx auth_request includes headers but not body + proxy_set_header Content-Length ""; + proxy_pass_request_body off; + ''; + }; + locations."/".extraConfig = '' + auth_request /oauth2/auth; + error_page 401 = /oauth2/sign_in; + + # pass information via X-User and X-Email headers to backend, + # requires running with --set-xauthrequest flag + auth_request_set $user $upstream_http_x_auth_request_user; + auth_request_set $email $upstream_http_x_auth_request_email; + proxy_set_header X-User $user; + proxy_set_header X-Email $email; + + # if you enabled --cookie-refresh, this is needed for it to work with auth_request + auth_request_set $auth_cookie $upstream_http_set_cookie; + add_header Set-Cookie $auth_cookie; + ''; + + }; + }) cfg.virtualHosts)); +} diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index d0a87f183b6f..072004d5dd91 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -116,7 +116,7 @@ in { }; scrollMethod = mkOption { - type = types.enum [ "twofinger" "edge" "none" ]; + type = types.enum [ "twofinger" "edge" "button" "none" ]; default = "twofinger"; example = "edge"; description = diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index b89e08f82acb..42bff6a9a3f9 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, lib, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; - virtualisation.memorySize = 768; + virtualisation.memorySize = 1024; # Make sure we always have all the required dependencies for creating a # container available within the VM, because we don't have network access. virtualisation.pathsInNixDB = let diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index bda9d3b54bb8..4f2ec36152ae 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { name = "elisa-${version}"; - version = "0.1.80"; + version = "0.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "1kyvdxbsfi692zazw8vjy6mwyy0sa4r1cim8gsiv9pphfh5bpxb1"; + sha256 = "0lpzn55b8gf3byzwv9909x40p98aqlh35vidkrwnnbwgygsa85bw"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix new file mode 100644 index 000000000000..9687ff3106bd --- /dev/null +++ b/pkgs/applications/audio/muse/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, fetchFromGitHub +, libjack2 +, qt5 +, cmake +, libsndfile +, libsamplerate +, ladspaH +, fluidsynth +, alsaLib +, rtaudio +, lash +, dssi +, liblo +, pkgconfig +, gitAndTools +}: + +stdenv.mkDerivation rec { + name = "muse-sequencer-${version}"; + version = "3.0.2"; + + meta = with stdenv.lib; { + homepage = http://www.muse-sequencer.org; + description = "MIDI/Audio sequencer with recording and editing capabilities"; + longDescription = '' + MusE is a MIDI/Audio sequencer with recording and editing capabilities + written originally by Werner Schweer now developed and maintained + by the MusE development team. + + MusE aims to be a complete multitrack virtual studio for Linux, + it is published under the GNU General Public License. + ''; + license = stdenv.lib.licenses.gpl2; + }; + + src = + fetchFromGitHub { + owner = "muse-sequencer"; + repo = "muse"; + rev = "02d9dc6abd757c3c1783fdd46dacd3c4ef2c0a6d"; + sha256 = "0pn0mcg79z3bhjwxbss3ylypdz3gg70q5d1ij3x8yw65ryxbqf51"; + }; + + + buildInputs = [ + libjack2 + qt5.qtsvg + qt5.qttools + cmake + libsndfile + libsamplerate + ladspaH + fluidsynth + alsaLib + rtaudio + lash + dssi + liblo + pkgconfig + gitAndTools.gitFull + ]; + + sourceRoot = "source/muse3"; + + buildPhase = '' + cd .. + bash compile_muse.sh + ''; + + installPhase = '' + mkdir $out + cd build + make install + ''; +} diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 233be8ac73b2..142e9b789948 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -61,12 +61,12 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.28.0"; - sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; + version = "1.28.1"; + sha256 = "03phnbsc45i0r799ni9br7s4qjy05fczbca64jd0sr4jhzi7qmlx"; }; atom-beta = { - version = "1.29.0-beta0"; - sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; + version = "1.29.0-beta1"; + sha256 = "121y716pnq4vpjrymr505prskvi5a2lnn8hw79q8b4hf7yz0j6rb"; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index cfd869e5592f..c2ae98d71e7f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.26.1"; + version = "3.27.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0i53095g6wl3ghhpzfrvizj24b8zxbxs1c7bvcj3fpkf43wd45j0"; + sha256 = "1367fhgqynh6ic318wppv4m7343ghvdgazm4qq2jqli8y1gxdfbz"; }; patches = [ diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 16f63cfcd107..148031273bed 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180614"; + version = "20180623"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "011bxd418hrl88rhp6lhja68b2kvnm1b845v41g9qfsagvfmbv3g"; + sha256 = "0s7b5w98rblqfcpvaxkkri0sfqxmqjwgdf8syzva50vm7swrg946"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 1a809307cc12..12f1f78acb9e 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg +, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" ]; - postInstall = '' + buildFlags = if dunstify then [ "dunstify" ] else []; + + postInstall = stdenv.lib.optionalString dunstify '' + install -Dm755 dunstify $out/bin + '' + '' wrapProgram $out/bin/dunst \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 44531a672b32..97b60080365f 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }: stdenv.mkDerivation rec { name = "josm-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf"; }; - buildInputs = [ jre8 makeWrapper ]; + buildInputs = [ jre10 makeWrapper ]; desktopItem = makeDesktopItem { name = "josm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar - makeWrapper ${jre8}/bin/java $out/bin/josm \ + makeWrapper ${jre10}/bin/java $out/bin/josm \ --add-flags "-jar $out/share/java/josm.jar" mkdir -p $out/share/applications diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index e05cb0ad6f9d..ca06b5fa6df6 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -10,7 +10,7 @@ with lib; let pname = "orca"; - version = "3.28.1"; + version = "3.28.2"; in buildPythonApplication rec { name = "${pname}-${version}"; @@ -18,7 +18,7 @@ in buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "04l5ccn7wf175gyq3blfpx0yh70ny06n161297jwc9idf951852g"; + sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q"; }; patches = [ diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index f8b5f45d9c51..11a5baa288dd 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; - version = "1.40.0"; + version = "1.40.1"; enableParallelBuilding = true; @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "1cisplrfv6y9ijgl5bs46bxxmid5hl71hjzl73bay2i2bl8hid2f"; + sha256 = "022mdz8824wg68qwgd49gnplw7wn84hqw113xh8l25v3j1jb9zmc"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index cf461c498c1c..7bf9aca029b9 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.1.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "1n8nkrydic2zkglz9hyrf28np3v42b4xwia068b29szivr9fmnrn"; + sha256 = "0ncvfl5iyngw3lr2g7awpskrrld6y0x7w0xyp827lcr7x73fvqgp"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c2f27a0f7fc3..4e0f362360df 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,11 +12,11 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; - version = "1.7.225"; + version = "1.10.100"; src = fetchzip { - url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8"; + url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip"; + sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; stripRoot = false; }; @@ -27,15 +27,13 @@ let }; in python3Packages.buildPythonApplication rec { - name = "qutebrowser-${version}${versionPostfix}"; - namePrefix = ""; - version = "1.3.3"; - versionPostfix = ""; + pname = "qutebrowser"; + version = "1.4.0"; # the release tarballs are different from the git checkout! src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "169xgwizw9kpdg0xll5jrxkb1k107cl4j1zx3jhmpsfbgykcnxpz"; }; # Needs tox diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 7aed4b95dd45..554c56fdae66 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,8 +4,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.9.1"; - sha256 = "11rsvzyc74v14n7g0z1mwyykaz7m6bmvi38jx711b6vpxvm2scva"; + version = "1.9.5"; + sha256 = "12yhy0p4xciw70i0gvwzbg39f6mfin2cfdblxyqjlv9bwg26k7jz"; }; archive = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.16.0"; - sha256 = "0knivwxdjkxyaqka0vvn0lh2ndbg660dw2g03iw00fx6ska1zn0c"; + version = "1.25.0"; + sha256 = "1cg2pch6nip96qdzca7q0ak6308fkjxz9zjdcv74cwg0f65frh7d"; }; azure-classic = { @@ -46,8 +46,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.4.0"; - sha256 = "0g1i1aasi44zn5bdivzqkk1kshq271x2lydjskyqq7jfx27myibb"; + version = "1.7.0"; + sha256 = "0lf83pc5gdmd61i93221zdg9pdzfpfnvhis8kf1s2jlc6zshbabv"; + }; + azurestack = + { + owner = "terraform-providers"; + repo = "terraform-provider-azurestack"; + version = "0.1.0"; + sha256 = "144dfaq16g41i9y2pcq2ilgygndad3vivr6fbygg8yl10m5l4qp0"; }; bitbucket = { @@ -109,8 +116,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - version = "1.0.0"; - sha256 = "1008lrvdqn3kk8gwvq094nwknh00b429jmwi0hq4brick7vyvbvz"; + version = "2.1.0"; + sha256 = "1qm29vj8ms37zb4b3bhdv4b4vrl0am134zmc654lb2g582cnj9yw"; }; datadog = { @@ -137,8 +144,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-dns"; - version = "1.0.0"; - sha256 = "05ismwpmpkv9qxn6g5i29y18s1pw4yf2pyvv9ak8hj8idh4z6gz2"; + version = "2.0.0"; + sha256 = "1km0pq1wp0bdccb612z9n0kj9w7hn1yvhk7xszwp2mzs8qmd7flv"; }; dnsimple = { @@ -172,15 +179,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.1.4"; - sha256 = "0x8s11c30k9a95mafyb2zl3wh9hgbdm7jgajzy5y4xnnr96ca13k"; + version = "0.2.0"; + sha256 = "0vrvyqhzbrvhyhdkg2y2dgadf5j7bj0cbzd13f9m86d146zlf8lb"; + }; + flexibleengine = + { + owner = "terraform-providers"; + repo = "terraform-provider-flexibleengine"; + version = "1.0.1"; + sha256 = "1xf5cmn434a0zr9qxc7f0jma9gf111cp7fm2vgyhkd62hipafcas"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - version = "1.0.0"; - sha256 = "0nca90s4bangraly1pcn3jfkfksaw0g2chs5ba6m7z6bhkrj2ylb"; + version = "1.1.0"; + sha256 = "1f0yg2qpr9ffimscy17csh20cq9czkcs96ac79s3kl56f8c95ijm"; }; gitlab = { @@ -193,8 +207,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.10.0"; - sha256 = "08ayi30aqw9lz8qn982vl9m3z4prah60fqq2q9hvscf6qb9g8lr0"; + version = "1.15.0"; + sha256 = "0xwijnv7mzlyzplkylfphph568b9bxavrclnlwvp9ylvklq70nzl"; }; grafana = { @@ -203,12 +217,19 @@ version = "1.0.2"; sha256 = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i"; }; + hcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-hcloud"; + version = "1.2.0"; + sha256 = "17zrdzvb9hp02710khvh9pwkavp79zy3y2qzaydgmnrbkks4s8cg"; + }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "0.1.2"; - sha256 = "0dmq5v4bwzndy6l6vx29m5ykn2zhnnbmnla00ad8i7djm1sj1fbg"; + version = "1.0.1"; + sha256 = "1kx74d0ywzim5zj3y5ac80r18igsqax39yv9qaam546a88ya31yy"; }; http = { @@ -228,8 +249,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ignition"; - version = "1.0.0"; - sha256 = "0hr2zshrx4qfb7xdknsxsa4522kkf84rsqqbliz7ac9nsqpaarf4"; + version = "1.0.1"; + sha256 = "1j9rgwrb4bnm8a44rg3d9fry46wlpfkwxxpkpw9y6l24php0qxh8"; }; influxdb = { @@ -270,8 +291,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-logicmonitor"; - version = "1.1.0"; - sha256 = "16blwfbvx80j5s6809wrlfnkq0qvjasz0zi4ykwzvkqxh00igj7r"; + version = "1.2.0"; + sha256 = "1zir35i8j5w7ra4i7f9k0ghac9b3bar0dy16sqy1kqwbh4ikmhb8"; }; mailgun = { @@ -291,8 +312,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - version = "1.0.0"; - sha256 = "1bcxq4f50qci54gckx4yax2v2qpazp10n5vcci4cba0bf5l8zx62"; + version = "1.0.1"; + sha256 = "0g4fd2rvx90f2bmjl6jjdvrsx7ayhf30vj9y3mklhxgsd9x83wpq"; }; nomad = { @@ -326,29 +347,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-oneandone"; - version = "1.0.0"; - sha256 = "0q14r36iyn1c1wfky42imkzvkys5znj1yzq27iaxnrsqp4hh7pl2"; + version = "1.1.0"; + sha256 = "1yps2mcdy61afxva7vg0i82s24zkdrn5abwblm0gcgc0cz588r9d"; }; opc = { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.1.0"; - sha256 = "19yip5v00b57j3h7870hw51nsxcwib7mlhdzzn276z74af6zirsr"; + version = "1.1.2"; + sha256 = "0v413wgnr8h682han88s0n15cdwd9a0dxr9s2mknpi4664c41qlk"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.3.0"; - sha256 = "0pyp95i6z6il2kl28cvilqi81wqs076d6f0zacjyvmn1d0blqrnx"; + version = "1.6.0"; + sha256 = "14chn2vb8y9rz5irh8m2ky9yxmw2za45gikncjm4gfc3xl6803iq"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.0.0"; - sha256 = "1wra9a6cjgsyvbfldvi2xnjk6y9zqv3y06pbq8c8dyjzssd5j591"; + version = "1.1.0"; + sha256 = "04pcgygcz2ld5hp7f29j2z3d4ypy4fm4m1zbbs9l9gc3fya88iny"; }; opsgenie = { @@ -361,8 +382,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.0.0"; - sha256 = "1h66ijnq172zk0bkv68iq0sy5l6jlasa2pi9q8fq54ib9sxnfkk2"; + version = "1.2.1"; + sha256 = "0r404rysjhbsxh45ad23k12rs8js2pdczakzavnjx508kr29gcqc"; }; ovh = { @@ -375,22 +396,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.2.3"; - sha256 = "0vx2pvrxgpy137v3i563w0sdqqrqp6p6sls27fg76cfxrqik5dpk"; + version = "1.2.4"; + sha256 = "11ga29d5bzmn6rzlb6sb28nh1zbbwglinzn185pysqx6n21l6wva"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.1.0"; - sha256 = "100zxmpgd5qbzivkc2ja75980yrlz0k50x7448wf1kp2inyylxq0"; + version = "1.1.1"; + sha256 = "1dpl6cnii9kzx9lr1f9vndh7w6mfg5kv6az7dq49lhi16sxwwb6a"; }; panos = { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.1.0"; - sha256 = "1j3j0bdblw54g2l4xdwm9604n3qfb6zb4b8p081hs5nv004awka4"; + version = "1.3.0"; + sha256 = "1isnhaszld96zpkcbwkf70nhhwmsl2z3s9868cjsac44b27gsvrq"; }; postgresql = { @@ -410,29 +431,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "1.1.1"; - sha256 = "0sn48adgpjw20a6jwagarnh5jasq0v36zsbd204j0vx4iam3vm9m"; + version = "1.3.1"; + sha256 = "1g4filwv38rq9wcdbpnpgfnv8qj1kzdnjc8awvbsdlxlj4fa06bi"; }; rabbitmq = { owner = "terraform-providers"; repo = "terraform-provider-rabbitmq"; - version = "0.2.0"; - sha256 = "1pbib43d1iqy8xl03zqwnz77362cb9cq8awcpid714n1sz7nd4im"; + version = "1.0.0"; + sha256 = "1md928243r4c46ihjnavz2375nxnfyhknyc86r9853hwhhyhsx5d"; }; rancher = { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.2.0"; - sha256 = "0xxff4mh4cv27mignvanhsz5sf5476ljk7q4h67fy4y0gzyxwpzw"; + version = "1.2.1"; + sha256 = "1z0gqchb268w5mw0519fbx4126nkxb9kvvay8vjj287yxdpi5grj"; }; random = { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.2.0"; - sha256 = "00gzqav21h2x2spczwcddlwl0llhgy03djvjjq9g9wb5yvcf4yll"; + version = "1.3.1"; + sha256 = "0zcvw0vz7mxx46m2jamhmkl7l0k8v0q5fha5z6cra3y2ikhqrnfl"; }; rundeck = { @@ -441,12 +462,19 @@ version = "0.1.0"; sha256 = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg"; }; + runscope = + { + owner = "terraform-providers"; + repo = "terraform-provider-runscope"; + version = "0.1.0"; + sha256 = "05l305423njds2cmmxg67swpdnp3zibs36dq4cfjk47i4byvipjz"; + }; scaleway = { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.3.0"; - sha256 = "1yd2xdr52z0f3ykfhsfgf57zzhjglci8mvbimdf6z8xmdgfhwjbf"; + version = "1.4.1"; + sha256 = "1zxb3981w30hv1aax28ayiy0sl0vzrrwkynp4lmwwhfjyhyagnm1"; }; softlayer = { @@ -459,8 +487,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "0.1.0"; - sha256 = "04sxdbx6qjxixrv9shnp8fxkss6pylqmphlm1l4q5c83dwk96pka"; + version = "1.0.0"; + sha256 = "1p05wamv70mywfqf0b3nxpvxc0m8ydb5zcl2kpzsrii9mq21pjrf"; }; statuscake = { @@ -494,8 +522,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.5.0"; - sha256 = "1cbv4bliswiwbhr9bh2m4faazhj0v89jnwn0fndfjw3rka1b97h7"; + version = "0.5.1"; + sha256 = "1bn5x6nmhfkrzpxhyfclls85l9qqffvzx1xsgcb3368lhwzarn2f"; }; ultradns = { @@ -522,7 +550,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.4.1"; - sha256 = "16dgszmcsfzbflqg053av1v8wgwy8m6f2qlk55fg3ww1a59c0wy1"; + version = "1.6.0"; + sha256 = "1xav341bal7lyb206zw2nzgzjvwkda54cgksza44q3jhqznxma47"; }; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index 24695066fa28..e7ded437edb7 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-telefonicaopencloud | sort) # Get all the providers with index diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 9a71f8911c25..cc89f09d6402 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -60,6 +60,7 @@ buildPythonApplication rec { idna itsdangerous markupsafe plumbum pytz six tzlocal urllib3 webencodings werkzeug zxcvbn-python + backports_functools_lru_cache ] ++ lib.optional (pythonOlder "3.4") pathlib ++ lib.optional delugeSupport deluge; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 2f08e8af6c90..98beced062a4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,16 +1,22 @@ { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook -, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, procps -, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtscript -, qtwebchannel, qtwebengine +# Dynamic libraries +, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative +, qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine +# Runtime +, libjpeg_turbo, pciutils, procps +, pulseaudioSupport ? true, libpulseaudio ? null }: +assert pulseaudioSupport -> libpulseaudio != null; + let + inherit (stdenv.lib) concatStringsSep makeBinPath optional optionalString; - version = "2.2.128100.0627"; + version = "2.2.128200.0702"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1x98zhs75c22x58zj4vzk8gb9yr7a9hfkbiqhjp5jrvccgz6ncin"; + sha256 = "0n9kyj94bj35gbpwiz4kq7hc8pwfqwnfqf003g4c8gx5pda3g56w"; }; }; @@ -24,11 +30,17 @@ in stdenv.mkDerivation { buildInputs = [ dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine + libjpeg_turbo pciutils procps ]; + runtimeDependencies = optional pulseaudioSupport libpulseaudio; + + # Don't remove runtimeDependencies from RPATH via patchelf --shrink-rpath + dontPatchELF = true; + installPhase = let - files = stdenv.lib.concatStringsSep " " [ + files = concatStringsSep " " [ "*.pcm" "*.png" "ZXMPPROOT.cer" @@ -52,8 +64,13 @@ in stdenv.mkDerivation { cp -ar ${files} $packagePath + # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd + ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so + makeWrapper $packagePath/zoom $out/bin/zoom-us \ - --prefix PATH : "${procps}/bin" + --prefix PATH : "${makeBinPath [ pciutils procps ]}" \ + --set QSG_INFO 1 \ + --run "cd $packagePath" runHook postInstall ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 56b9e5cfb04b..05c372d0780e 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.8.0"; + version = "52.9.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ar/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ar/thunderbird-52.9.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7ba3e6d4a64ce91b16d79607c3530deba2d68b09c81f7509991c62a11736ee51278b3cd60ca8063ce94748bf0b483cd9d9ea3be4ba84b24bef56194053502550"; + sha512 = "4585aabb08aaf049622f7cc8b485fb6a28ffd26759c760dab75af679a434d3ea7f356e5255a990f22f362e1506722207c2c2b866718a695dd651a53923a37fb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ast/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ast/thunderbird-52.9.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "192442636ec56f7751d752572122c8b435fb28d6801a398dc6d02896d1f99d51feebbdb906f3911da08bb9da2851d3ea29eb064949d53436a6764292a6aeee7e"; + sha512 = "f8558b2b833be94accd96ccd62b9b1fd8f837d11f9f53a514bf19b2007af4c69afac762f091c4116ec4b7ceadc3538183c2370b4b485a430d3b975aa94de0027"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/be/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/be/thunderbird-52.9.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "facdfa7f6ec8eacc6a9294958c879a32cd5dadd31364d64894f8ad1a38ff883a9f2471d49d1358fa79b2b585a33ba7d710b195ec6101760289b8429d073004a9"; + sha512 = "78e259db1a9b73178fe2ffcc8ee05c5b1324513a4ea0d564a0d702d42aa2bb87f990f780021c19d3c880922ea443b8925d71370fd31d4577e985f6dd1d2af11b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bg/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/bg/thunderbird-52.9.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5dae827d4111bf6f07f1f794ab71cfabd4763d9f344b9666143a0c559c93479da532056d43f25b8d130284b9affeddd4d08c8e7042c86b681a1566a7b8822c87"; + sha512 = "783fe76fb9c34b47a41ea625f31a66e047fc37a4df521c74628d785cdca2fe8c06a7fac1fa1a3cdb5f782c1acd79862317f19ee1597350c991881bde682061ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bn-BD/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/bn-BD/thunderbird-52.9.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "fc5816d829c836b8c0995405c9e33ead778ffdff7d1ec11c57113b87954ca1be6e58281244fe5985f7eb84572e56202a700d7bf382c0abe0e4f11598929cccea"; + sha512 = "bcc80e20e418f676936335ff0aca9d542ab6563d678e8f986373b86aba160be8a815bef28a1b3af70a54047d857bf2f09b1cd7e7926d32e8ff41b790bfbbfd61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/br/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/br/thunderbird-52.9.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "4b2ad9013cfe07708ec6cbab5fa79556d20d0146e5d853951c11c2d7629d795a7a9a16a6d7faf3c2dac535f5d368d98d98ca631c367c8b9cc6e3cd13763f6146"; + sha512 = "183faf91edaa6035b768fa24bbfa6aff165e07c43174828bf8de8d2a41f1e80b96d65b88714556b9230b2cef37a2b03f2d9b40baa623bda3a831b528a2c3d61c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ca/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ca/thunderbird-52.9.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2ef0f547dfea3d1ab97fba96673ff10d6bc0bdb24ea20c457b4baaf6cb987166219eb8d7c4e9c7a8f89b5933f65654f3cf8da8be7145c1378f1d5f51b8751825"; + sha512 = "4f55b3a0da97c3530f8c69f13b53b27e7ec492f0aeda2fd5075a9a340fd0b76a88a29e0f3c5ef8a801872bd263803e4da4b59dbf4258e6f4f0fd986aec63bd7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cs/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/cs/thunderbird-52.9.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "57f55ea5c102274b42154433a9df9663f8594d62a5b25aa18fcdaedeeb52d6556cdbce8542f2f301f5c7ea08354d90ed769c9e6b95664d6aecdd3f58e7e7aaeb"; + sha512 = "13ac8185a5bb7e20f4d1961cc5983e3a3a60467d9530a326d9cac184a1ce44113deb113242d21855504376396985e9307dfb0f95bf73f9ce50f68d1a6287355b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cy/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/cy/thunderbird-52.9.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "241729c3a385ca1fba281b5985513486a3fc9b768a41c4d8d1c0249bd9d3b4de032a76c6b2df383041840ec2913eadc854f2f8b85bc7de782a4f09001f0f5ab8"; + sha512 = "1bdff75c79684bd67564954844d53735e6d63c0815aa7629cbf55124f138476c17b891229a657892faf29decefcdfcef8e984eb1e9c935dbb2d555f18bad75fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/da/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/da/thunderbird-52.9.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4368a9301d40becf9675379c217040023faac8862482c5521a47f06e6c2a7466ec0b251475db111ed7f37c72cab0742e20b58463d2519a1fd6f77bc8e360330a"; + sha512 = "af08df6ddc75e3bf4d1fb678894799eb112963edeb424c149e4b5703e8112f4b747e25dae5706a5f7ac066258cb6a16dbb197e29c45b787124f42c004671897a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/de/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/de/thunderbird-52.9.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "08c2fa848f3dc5fdccc498c935a03ac4e12d3bc3707beaafa5b9bff1c2aa51d6eb2a6e8373a0185f123a1ba77bb720e40ec9f8b364ef5b7a2f7810260ca9c372"; + sha512 = "0aca6f9fa7549e36a10df14f2f74d213ba88c614c98b6701a1d5b3d498a6fd8c7b399464a170b55363746cb1b662d05a1e56bc171c778b83428314a2874e5177"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/dsb/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/dsb/thunderbird-52.9.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "83ccb82aad5d63952674707c2c2317b4296f4b8ac56cd3ff9e294023036c1354f8f373d3b977f5f1cc5f9a9fb4876cb68b8dca786d5e2a07e28443e85e531e63"; + sha512 = "73fcb0ea062f7cabf96088dc4c8400d084a3b8e5258dbf56132f2d23046e6286ba041e77c97d6e12448809e14aec402bb4edbc9e7602e713e1d74cd2e1244bb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/el/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/el/thunderbird-52.9.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4e6f9982e661d6935bbf6b4490a0f66ab2c082ecaf3e6bfc67e32a878b3cb60c7e98d2b5ae07439e43aa4f0f5f7b64616dd22fe1e3db9a5e28e42285a2c1ac6f"; + sha512 = "0103d5de58e5971bf74f74e43e99b519b8ade5aedf70fe2422e4bfe68a9a8d8b9c4cb81efd82d485e085f7ab3afe4a40e81f65ab37681626385ecdd7384959b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-GB/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/en-GB/thunderbird-52.9.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "3ffb11f6ad966980eefa882933b2ac791d73eb338907b8c3915905420318f0e52e16037fb6e04c2add9641e4d89424a48d769cc472234c4b25ddcaa51913d1c5"; + sha512 = "608c7b33f333aea4a1737e763bb57562332eea53555f98e27ccfe8e5485d6850847242bbb9d6d63a840a68895b45b2fa036ce675b4d88fcf37b09f71ba8eef69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-US/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/en-US/thunderbird-52.9.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d5c2ab406d1820745bf425ba7bf6b947166747d0037f1519c0e4a76a6036be9eed1e00e563c7f663f7472ef77a6a85b646f9ed706f26666dc1d4dd39dba3f917"; + sha512 = "4b6479bdf244cc7dbf175109b9b353d021728e53f16c6f172a6c9b5d2f1018a0bb5a69f1f0fb40d95fa7ab117497f20514f7795b7180b69506102b1a6d654888"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-AR/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/es-AR/thunderbird-52.9.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c5971b74a717f24047cf43c4a20ee5c3d0c952a1f3c28ca2692887426746afaa1e8fdf4abbb601193cdf594912013b20ecabdcf8dcd301db221a8a632056e0ff"; + sha512 = "40106ce1b5f54870db329699ef434a7e7995cea50937df642afe17f2c11445ba4c2d337bd3e8d0a689500abe8e538dc6d5ad6e1b8bc82d47a8b23a4e70b9c269"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-ES/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/es-ES/thunderbird-52.9.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7b58ae76bd7026088c5d3a6e00b64e8445c29a898aaba8363524d436dba650ae1438feabe28e599e116ea7d995c864ff84688a09606476109bdd6aad48304973"; + sha512 = "2724a4e6355804e9fef679952aa435806bcab0e444b8ec2ca4e6ac950951723f02585683f7f9f203c8ab1388f3be53e0de161bd51250469d286ba82eb1ed2b2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/et/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/et/thunderbird-52.9.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a71f40dadab629369f8ece09613c8d7ad78314da38489705a880b436afb7649523f50c189501279c1c0269953c7561b81d1de29ff9c1fe1bd22fab734772e8bb"; + sha512 = "c5907d7998700e1915c35e4f45fde0f28339d3ea2daece85b63428aa39be24f23ab1f5f69ffa9241ef2fb858909dae4aa5f3577b569d237796d1d9a24bb15704"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/eu/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/eu/thunderbird-52.9.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2e9e6f58505c4873e5f3f263b75ea56bf50fd82320b78b2bb5ea0876773fe87ce5b76cd4e48c0781565690a28e86cc611ff17e7223db4134e2978e0729e2630a"; + sha512 = "d9711b60be3559f3905a6db72cda46c39c9cd89493effcc4f618241444910c8af19c244be3f043513c62e1d2a7e5c91a5e4be7e8397c71f783056c8e1141fbb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fi/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fi/thunderbird-52.9.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5b22836043bddda0abefd5a9613f17ee147988de819d221f184482161d1667c4a9555763376e5d0e28b3f0fe0ec4482994368ca26745ccabd1826db0bd847af9"; + sha512 = "07a915424b71e5b1bad7f76bf58e678374c3d385231a2f32c04da4374acd758a2425cd0766d7c904ad5edbe390ae8fbf20eb59996111410fd8853b618ca1d7ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fr/thunderbird-52.9.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c465c33cf95bced2fddd7d4e3c624c3f98ffe02c2aeb21ab8946c1b1c37a31211bf79fb80a5fe767872dbe9cb1cfeabcbebea7bfc8e8dee1404b8c75c9aa6a4e"; + sha512 = "7368953ce57bab8cb7a774f60aea222d59d7982c5e8f1015d0b11bad1f0857d8a8df05a59db6e3526af92562f70c8bef65882954e7b0b4534e4b240c196ca125"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fy-NL/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fy-NL/thunderbird-52.9.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "51d262f87d2766e1c44370ba8f9d22df7e2b0876059bcfdef4b9b7809056468fab1cc6ee7abb892ce293d392548ebbaeccc55bf58c251aa774a8d936a7a50ef3"; + sha512 = "2284bec81a2f082dee4820489941cc638f7026fd7a7e4256b7f9a4bfab688ca88e9b5fb08f3a1e796cb4845192ec49cf453a4a4d8f83bbc116630c0d40dba84c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ga-IE/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ga-IE/thunderbird-52.9.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f9354bb331f6ef82cccde57eaaaf73887d904b76ed2157ab4ffcf37109928160127714cf51586032049a78e7215c43211719f2be1c860828585a344742c1ec91"; + sha512 = "ae0722e8bbf24319b9276a2f8f9ba3551d7f0201152622133f53d0d42c8abc64d4ceb7b27e45a0a4447cc6d5abdcb705c74f44c0102fcd9c0d7e9938adc4a755"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gd/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/gd/thunderbird-52.9.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "926060b60e5fef2020c27e64a93c246ea9f477d82d8138c1a1e6439098e8e1809aa74747d45ee9b069dd32ac07624b24b022d318efaa3c1b5b02e8c8d599a54f"; + sha512 = "1464c0c2b1f2c89fd93419102da9a79400b6683767cc25d50bb249855091cb1549b410fddfa990b463404645ac3737d31ad4abffdbed58a7b94b17fe43f6ff6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/gl/thunderbird-52.9.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "d07e61440f1e938b0af4b5db38187a7cf7c6ca8584eec093c292b5f6b7096b529fc20db06766b11001f8d13e1c7dae7a5d3c798e82f3eac9dadcf8a8a50107bf"; + sha512 = "990202de53a2f86253819202337b312fdead9dccb6b011fae514614a7e45eb91976b5b9b7dbb3a7a9378c523280172b177a0ad7ac85e92b624086cdb8dab0651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/he/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/he/thunderbird-52.9.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7661135b35207b781bdc9a402128eaaace6f67c8558e6cdff271d946c88cf023de8307ca1a7c0ece4e0424e37d38b2b5e2f24fa966f7e13078dd56dc6a1972d3"; + sha512 = "862cb3047c83c1277ca195cffa21fae79e79f12b9330b3eb27378c050495552b857b43daf18425768e76004fc88f978f46d6b062b8e14d6a4789fa5442479d05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hr/thunderbird-52.9.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d5db8e96bdf2061d8f24b9b332b9ca4e7fe64316385e32f01023520f80605bba50b2de8263d7aa67fbd5b3a9b39fd20a050bef4742804da4ae03b4d866ed8012"; + sha512 = "419c10d7ad1168fc43c390651199c56aaf331fc9f6015a46f2fefde83ce31cd26c26f856d00b85b5f7278c6540f235d17f3f7f83d85bf79df7b50aeb6dc198fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hsb/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hsb/thunderbird-52.9.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "9cff35b2b5a4dab919e38180cfa88d7c3c249c9e119f6de850bd6e72018e6a62b1078ddafaef6c73c210b8c1dea3caa7987d88c75513f76033186bb7926f5e81"; + sha512 = "e2efdc85a7653e6dc3d15d27453bd3294aaba3b7cfd0b41da63d1a9954fabd544469304bd038beae6a3dd7bc5159e1960beeb18325d15190a24f5f8aff470e63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hu/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hu/thunderbird-52.9.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "56057845898226d58981107d1ab14c3ca02547c0767e768f45c48f30097e14a7745c43b3b2b0bbdae81bc6ecdcd323194d30006ad20ab2b0de2cb3b29c15dba0"; + sha512 = "1140a52c2bd80c46ec14a8ab429f94ab380fa091f29604b0045f35c210c670d66cf6dcae0ce16b3cd865b5756a08f8c3e31b561c4a36e75cdefe6ef333074b90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hy-AM/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hy-AM/thunderbird-52.9.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "6595e53a1b790cc2ee47f071d395dce94b44aafee80d2efc1613ee44d3698736db972f45806848dd9b35de699dec53b8b5e64e596b0b49b1e829326e57880904"; + sha512 = "35c657c76494dbce3d5c5f5e78be1983530caa1d028d4c8407c15bc6d104765ec47c247b48a8a848530fbf1f42ab2fea5202a73442b149caee7c85ceedaf2ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/id/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/id/thunderbird-52.9.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "878b475a2073c97e6af40bac24c2cfb88a73c8bdcba58b5d8cb2958f5114093fabaa6309f32096347c4ebb4baa828bbdf0077995284f1d2ae32eb234a7ca1d78"; + sha512 = "0659d0314cfdb1b8ac465281f5d6017b60f36eec2947ae608561f22c91edda6b294de3437e26d448b260b175e6e8b2bc8b5b253efbc14dbb93038bb535b8e8b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/is/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/is/thunderbird-52.9.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "a8ed951689420281cbfd660bf23a4e5e3764da4894b31eb723b18c2923ca7f5f1b13d6a279f93d3cdf524f0a9387bb706c3d187ee4b84c74490fdba7867ffe25"; + sha512 = "915e420a4ae20927dff42a5211d582548f9e20fc4079627a79bb96244d06ac983865c7ba814562eb0bc67ec620f07e06e7c9739d9985464370417d186b39724a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/it/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/it/thunderbird-52.9.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "24942a2fb5dc9a41641232f728077c8bfe5e99c5766ef4327a11e7e60858520a267ef12e0bebed7d9ff2664ba45d672fa1aa24c9ebdba9048bba10f6e73f6d85"; + sha512 = "61b94999940d80e6fdc5c446d0cf28382797f28f88f7f9175fba880c068d052f24a53ad6b8c5d688a11d5c756dcab6eb046694fa5454bcee24fbbfb7912a83d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ja/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ja/thunderbird-52.9.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "291e715308f4bfb605fe987ce774d3f5cac211f920f62ea5e8abf12b51458f2da19c36329eca8fbbf185ec2eac9793dccc3d7483b320c0341ecc17bb477af263"; + sha512 = "5068296796e6eae90711d7d36a8da446e11097e65bdf0ee57aaa231e96ee044baf5b9a82c77424e783ad4acf8a5b9b93433f73a7b0fb98de3ff01c576b19bddc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/kab/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/kab/thunderbird-52.9.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "de78483cd0b0a35687e091c52bd57d9de400a97ddeafd3b7708565501ff20da7ca1025940198aba6d410646d72be39bfca780d36df6b323ceef63cb085b214ec"; + sha512 = "d8ce200213fddfa2520a7df57be2daa8983dfdc8fbab5dfd5beec793234c82831fecf913387ad8043ce859abdabc1f2bbc08b5c5a2f7e476a987646cc8921870"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ko/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ko/thunderbird-52.9.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b87fcc1baee680496b5bc13b1c87a3440c50f46be6e22b175cc8aff51bfc18bdeaad662d3cc10ebb255cfdf6d35ff2e59e9082f9d36dc5ddb079c49cda4d9d70"; + sha512 = "84c2a4ccdda118b304a690eba28d92fbffa7616434a8278616a1e923b6d757c8600b5e35ab25a13c29fd1a290b1f19540725569db82f3e821fc8b8e9a119737b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/lt/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/lt/thunderbird-52.9.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "093519e8b927f2d716f76925fe40dc0b63835e51c446bf6759992419396f922a38f24d6f8e3fa2c0c252f391a2ff812084d26d36d414d77ba5d961a091b12756"; + sha512 = "38f9dd15a596af07b882fa265487dbaa638e1221a1fe8cf3377bb0a9e19f5f9450da8213ba63ed57d4e33e1543b9b9af6d0c4a7334260672d3c61b9b4ac51bfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nb-NO/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nb-NO/thunderbird-52.9.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "970a4d41c779e224504524ab8aa2b3bf83c71facc5f666c887b2eff27a8ee39e15404c0812376280dffa0c0642216e6e966004b577572ddb8d9e7cfae0544059"; + sha512 = "75fd6fd0bcb786bbffaa657344834af1f113823db703582968b8813de6e8a69d26e657542e29b6e309f714a222140b961de264e3b81f12a678731bc74ef8d65b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nl/thunderbird-52.9.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "7248b9d9a51f5f0b5b628b744e935c1d9c21a0a41cb5d77ab66b2e470bf6788774f1b769435f4526afb8d7c28d8fb240a3b3a918b6f20db617b599285e11b5fc"; + sha512 = "ff34802f626606b91fa01a7cc00b6ff97f84edff91afbd8a51a465e740ac97b3119357f8f04d214ddda3bc1a8f61574360baced40e38b5aeac8d870e06ccca24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nn-NO/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nn-NO/thunderbird-52.9.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6f8e73df3122bc6985f7c37b5eed90c64914e83a800caabeb27a5b155085b5def8685c6af237e8f0cd605db28681a5df0cf4cfed32fa97b6d594666041bbca16"; + sha512 = "ee73bc257ca5f1d35fe2c0cd861a4ff2ce6e9329a59feef2492bc9edf03d80bf879b7c2899417ed381faccf20813d8120a867107ee17f216a8c02d9011802c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pa-IN/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pa-IN/thunderbird-52.9.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "56f1e10c22acb54a5e6dea22be888525f24e9afc7ec2dfbe8cefee45196737bc68f0a39e7b25e0ab1376b3d7301f753958a11e66f60392f340a3f3f5896c9d5e"; + sha512 = "8874b47fc730e61dbad1a78e38d7be1f23cc898ac609e6dc302d2217633a812ba75f519699ceda0b492fc451d3d8f7bebe2e0a55f6ad9bcec0310c2927035d36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pl/thunderbird-52.9.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3dc5ae6f3e6451fa942fada6e2b7d7643975782cd9c43f0df9473f40117a5b8f91784462c444683aa180ff6decb677bbb1765bdbbd5ba69080fac806b4c7b97a"; + sha512 = "e612b9bf659f1124721c771015fc2698533d83f73d65cdc6ba95a5e1bc89748b0667f8b83b3d9f9b2173cd448ef8a88028e704fdbf5b6536884c6c9253075d24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-BR/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pt-BR/thunderbird-52.9.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ea4e6eae43d379e92adb54cf8a0e7cc1baf23bfb427e752f41d95bf9411dbf092ac94794aefbf2983dd7031db0961585c7bef31be63633035f907afb5a8f1a9d"; + sha512 = "a94c7feb52fc7ef1e819af28598d558f9b6b39833081bce0078b2e3aecc0ebe97cd519f3de8726512c453b89930eb3fc7280e66e89bd773222896fa807ade6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-PT/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pt-PT/thunderbird-52.9.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "0de5ad70739e456fdbceef8ba89445f37ca4be23a9b213ad5b52b92656b702dc7ab39d6b27f2d9012ee27c46a4749444a210070ced586963577ee386726ee72a"; + sha512 = "94eabd80a87d5201c141f8d54952dcab971eb3c3f4e1436465bd9adfaf606310c8cd3b0c0fb1270260f0fa34183112ac54cbfc1734d18dde84c848b5efcf0d0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/rm/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/rm/thunderbird-52.9.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "dd947ad65fa23c42f2a1d118343b54deb2e7c9ef374118e2bfcbbec0d5ccfe5217ad0d636e9b4eee56f1e373beca52d8ff9f12593ce77b9f5aa94a1f62f2dcc6"; + sha512 = "46ed5419e3d6d12d1de660c9a4d65a641f25716ad11392cfd88d0719610529f8bf92a961518d21f914dca5bff5a49a780df0c1a0a31632d13b89215e0e106726"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ro/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ro/thunderbird-52.9.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "41b74b034f00a7ec26aabe5b5cca0b4a332b161be06f15a41e0c850ef53760ce1b284bcc8b71e1657a20b46c436c4ab6ef0bedb8f4a00c46b59bff825c5d5583"; + sha512 = "c842a16aa76106bec5ef16edcda149296da7b2196d78830dbf51c9b840316f55fe1fa73943f4de6aac403a45a74af0f390a9499fccbd1d1f94de23a52e0e2a67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ru/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ru/thunderbird-52.9.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4bc1aee9cb629f59aba733a08d4c2f5951006e30ad38584688fce6772d19e2a01dc6ddb43b6c0d7375638c8e0714703e6e4cf47fc639c449a1ba02dabe7dc44f"; + sha512 = "4165b3b55c7106bb4f4f4d2aa46d17358be96dbdabb4d3bff8913f8f7b4efb898e13391ef3dd58875b244d49ca8aad6a83cbe2208e2e6e1be851f16659570194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/si/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/si/thunderbird-52.9.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "663ab05d2e5f90f1be7fa9b2b61734f2c5c7d314ab86196629447c05d220f8de0a405d7ecb67e333d0c31006c0f0c384fa891fa087335f585a757b397d29769b"; + sha512 = "23e9b1524451d5932701ead1b61ccfb1945b5aa752c5b686fd889c1ef1064b44fa2b96b8c5416ab124bcb04bdf21cfaa2e6ae3eb0a76997db72f91a9eeb958f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sk/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sk/thunderbird-52.9.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4e925c2ec5d218b82722d6141b4e7b9f3216ba35b5e8260cf15c58f647b60e93161e9bdc8501865567e693ccbe3b40458b69e85e7b7a0884a522a68cce2df123"; + sha512 = "0cdf4d30d1e466ea9779394238ecb76937aceb546b25b6dac038060273121450643ed83b0f279e4e7f67c084d263896cf02fbc138a01c3c917c1c0d54a229cbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sl/thunderbird-52.9.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9c0e33622d3cc6e735978b35643ae6c4028456964255b04aeee28486177e1711354cf1de02db84c6af928ba176578abf5b6a2a12a248389790fc6ade6fa96e2c"; + sha512 = "5be5d7b380ffe2147b3194b97c9811f62b7c7315a0c6746e28f7c1ae20ab9be04c3202dbca6ee0b235479ffad1f111d44eb4d636bdd3d3f077751cde14afeb86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sq/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sq/thunderbird-52.9.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "a6642a2c55db02058ce8bb9111afa3a9433372494e1e613fd8f1d575c64ce95e0c0e61a8b9cd60c662266f3347cabfebfbc606bfa333a121396caf3c0f89737d"; + sha512 = "fe24594d05688eadd9ce855a7f45b6c94e596beb967359611d21495ca890e5b9a3b2d2f8cf764fb81e88c62c7dc6285837993d05a88060f08d79fc6947becd6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sr/thunderbird-52.9.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e472a07bf64547b912b80a32212fa9a0c25023044aff165cf92cad8af1796fbda9d36ef32f6c11bf9b87b75babb4c6fc6d9d5463b7b88f31649298adc6947b50"; + sha512 = "9cb0ddd297e9261d4a2b852624a72370030d212cb2aab869aab117e4e21575eda635940fb55fd67cd95384ea956a180fbf5c6e3b6aa333a8907fec70461c15fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sv-SE/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sv-SE/thunderbird-52.9.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "18cc4af474e717dbec7ff88fffc6635b7fec7d8936f0c7d903c42a1b9482186d5d0a2ca661491f76b477c57de45e03c995c562e295e5fca574534d81d6e6d30b"; + sha512 = "c17e07785d86770acc788f8f05c1d404db08ad383a92dd21698532f85953fcf9f7cf1779824076937a2dd1ca362881db8b8b7a7213db6d431fe504355a42d1aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ta-LK/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ta-LK/thunderbird-52.9.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "22f8d3345de9de5eae1cb05bbeaead160779b9f8c1187ace426d7ff026ec0ee0762a56b909f22c2bcdc186088b333d6fcf52a0ebf87ff56959b31b1f6dd7777a"; + sha512 = "64701069778da5be5777fd12d4aa859bac2ccb229df076cc218ac4a8f07b29d614a25564d38a220ae76bdcfba874dbecf62294b53515fb6c1ba923b22dccc0a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/tr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/tr/thunderbird-52.9.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "fc9365d3c869c1c3c1c9435f00b5f8eeee6fb231230a5fb0ff48cc59a8184f57bc558ab7f7386ebaee74b9c61c34bf5f7c6e882cd0e431749247b4a58d068c50"; + sha512 = "99c2133c3a4bcdadd6803ee6dfcb204ae8a095edf68f7f854004844835ad88772ae1a83c92ccda717719b2c44aaf8776a2a49af2737111a6a5f1ff83a2028af5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/uk/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/uk/thunderbird-52.9.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "60ed7415eb87d9f1eedc2c92078823dc49db80652f6ad26de0ceeef34b7c499ec940ac3bf083a7731bac9c144b6bc04546209aabd1ddc0b399ac174fb88be6e1"; + sha512 = "b4006430e6b08d4ceb40bb76eb0a19bf743b4c6ba39ebb4999021c4ca625228a173c6e2539ba5e711be191e8b7550e45ea7160936aaafb0a3d1b44ca7ba7dbf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/vi/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/vi/thunderbird-52.9.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ea5892eb57fbdc0169f5dc39b2edb5eff2d06cddeae506e979d7556164fe55a65a402c7d791c873e6d0a3b48b97722d8dc90aae1b7389aaef3db836e803b9825"; + sha512 = "9f65e5447923f9f2d36fbcf80c056ede580221a8e5f5f0ba10bd5ecab354d1b35fb787f8a0f2779465c9fe78a83c8fcc9bf3a16d0f853aa620f899b48eb4b0c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-CN/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/zh-CN/thunderbird-52.9.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "22ab8baa3a41beda58f02612bcd5e0a9848c3cb93bc68037ea504cdd0b2a0b5ea5bf78e5bf735dcbad4079ebcb3c5434c34d6a5e2a9f09a513f91018084ce960"; + sha512 = "72768a3d97ca1093d381312923ac42127248c3aee9eea1c6b187a4989082b87c326c56cbea7f9c6c2dcc626e39391c834f28697e00b1dddbe22a861a1199aaa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-TW/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/zh-TW/thunderbird-52.9.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6c089225c57a0e010b0d413046004b53570afbf2d3b673dbca9a6e8cc102b6edf0e3a4f4858add4f5c1a4bb1fadc2641bd1c1dbc8659f970c84f61869b3634ea"; + sha512 = "496c01eb0aed26ff77c032f03617dee5340415837a039b1b7e953d1029b91163422430742499e7a1152b171760ea06cd9fe0e538a234edfba44033f6cf2b7978"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ar/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ar/thunderbird-52.9.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d48822233fa44e48b762e6aa2da302dafb38c32827b112197563952b35ee453a361a45eee35c6ee88317d6cc5215d0276e74862b167b01adf62f9c275f89a38b"; + sha512 = "44379cb4694512417728230fb6084fe13147dc25e832b5914eafc9f2b93c96103cf923025cee84570cc001221d8176d49752a7432792714f9dd4a0c454e02bee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ast/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ast/thunderbird-52.9.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3894ea6a01b335b92fa0d9f175aacefdf4fdcbfaeab3f3f5faa37f0bea090ebc7bfc130fb42ffff2293ecc95e3bdc8bf6142a5896dd4165fc3fa9f8e09fc3b5a"; + sha512 = "73ec4faf9c3ba21decffa60658e4db5ff22902f4bd8b65849ec98367bae8d309fafd596a17016275eb10e7ff9854315980ab87cce2d7efab29a287700d377c43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/be/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/be/thunderbird-52.9.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ad93e61d4d1437681bdd772ad815efcb30716e716a08a442b9df2351b27118a590426d0ac054c6f41c29f4abd14f6e8fe7a54206eed810bddf1a70d6afa6776e"; + sha512 = "21cc3cf7392b99ab566c69bda193457cd7b2fa2e0e0aabf29354ab6be6be3c556890e630650fd18deb940a89b93f91dff8d7e0763b684e32d599b0d6747cafbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bg/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/bg/thunderbird-52.9.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "de09ff65e4c24aad1faded64897f9cf7bbdcc21d4ed609fa1bb0d9ad5d5a9d1d4e780fc2d8a386890e6cf59641697fd1542701689ba82e22c844ac29012633b8"; + sha512 = "7d2fe68e8906083753e6f62a7fff622e0b2a959222c9cffbaca6797f6b401777b760c99802d9f2df6a200d6d7e89c81d58872bff93358605d1d2a5ef9f6ac0b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bn-BD/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/bn-BD/thunderbird-52.9.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "a5f3737e2cdfa540adb3682542163a5f9c34605e975fd66bbb579c1508f485ff891f997a8c90d576fbc09d5c4cd183f123f020df7a3cd1f23401e7d92e930724"; + sha512 = "18238e34dbeb90ca13cf38a0a5d9335e1ee669e7788afc0b369ca5bb2c45ae18b5faaa846e19a6089cbb098d862529003da29aada28bda0712401269e6aac05d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/br/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/br/thunderbird-52.9.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "37222d22ed65271e08fbfd32d5e6fa7cfe65d5d002116bdfbde8fec9c3877bafff6b6ef38680cd4373a1c86ed92402aa5afd5bf04f369029669af5451c9d884c"; + sha512 = "d65cd714e87d2e4901fc61b9749860617200043b019cd1888b66c86de06a5f5bca8947ac97ee25695c950c82f94ad334cdfba5d5cf18351c6409849529779e57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ca/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ca/thunderbird-52.9.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "87adf55bc6b50881b8d7ce30170f6e2f346db2c7f9801abbe37a17ef274417a3fb7dccab8d2eecb25d6c61a888ffede95c2ed40b6fe097fff2cf49a0e9490a00"; + sha512 = "d39b1855e78b6bf24c877649e408973770a7ef244e7a95ddaa571aeed88d75225c9f3e1e8fa6b3440c7480a57d3a0cc8ac63343af13f6031f4ddbc4e649ddd78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cs/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/cs/thunderbird-52.9.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "055df8c29546975bfca186dfccfc9fde5ba418f3f2be1e15c77ac00c3b759527609427aa6590e3bb06e417211be6642bc37db4d19be6c3b866358d65c3aa3bbc"; + sha512 = "bda0e525a980495ed72bfa9bfeb7f0235d8461b9ce057d8d7f4e5334348153e6c410abfa9b0f75946f3100a9693b0363cc8e4f542e834b1b15b2acb7b8fed1dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cy/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/cy/thunderbird-52.9.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "c60e61146c3fc195c482106d40a2eac47d0b621a13bcaeee5fd95a40ffaa5ae810f58a5ba85b2676a4277ad3fc6d7caa3907b1d4962fd42887e762236e7e9366"; + sha512 = "29e1f5e0bcb60d1eba274103c5f94b60dade1d04eeba3bfc684ec9aaf4f9750b0970badf94bbb3db7f575d82e53caa929584168e4663019a382b942a79636df7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/da/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/da/thunderbird-52.9.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1f8634f680512bf4ed0a44b41f3be55c118a114dcc262ee41010e58abc29f8bc3032a4c5264b948b9e4e13684d42761d97bf612050b891b4f52c78e91aa5a0c0"; + sha512 = "ca24d47fa8c71c9b182cb31998b72ce63ee82f8c4377090f155a3155988759e6be8e8e28c8e0f0217c4318c87c16ffa34e638bc27d06f5ac41ee2c6171d16fdb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/de/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/de/thunderbird-52.9.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9422296b970e77217581c0a10efb928923e55272baa485ccd1a7446d6e9a84da23e6f2b93623922ac85db84861ab4813282e328315bedf9e3b8cf344d869108e"; + sha512 = "2d820c628683710a3d5fb69212dc51523c867def469c7f5c4a15456d99e22988143c7804ec3692ba62e61628657abc286785925a94a1358c79ecc623f0693336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/dsb/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/dsb/thunderbird-52.9.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "281736767a8d59830b1452eff5e5058c4090661030068bdc33d2ceb960f10c38284c32ff94345685fa7a7781da502f67c34fc83314728161d75c5fb3fd0ad0b5"; + sha512 = "2f97cfd783405eab580457311d7faa24c8cf6956cc62a60272b60b21cb68ccc35fabb0964dd97786537e784eba7eff8d67e496a242e9edee2fb6f95891931592"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/el/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/el/thunderbird-52.9.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "baa144336339a3a271f5a852b3130d20054baab3633d453015a5862e630dd73f3a99f50b979da7910810e84e99120a2afa96f8dca8c8ce0017824851deb9d702"; + sha512 = "8ca85b4c91b07f914c805d020ab4424a3ecd443c86c52c66cafa6be16ec344b025407b7e52d0a6d240da1e8d9470dc6237b7a93e835f9fa6dc16b33b45de3807"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-GB/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/en-GB/thunderbird-52.9.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b9573d177ff237ad833e8064ac72f7560940c5accbb7b7f663f53f6942e0326ed451e2290b09003ef6b320b860cd388020b00cb340d39af34b38678556704390"; + sha512 = "7a51412c09c78bdfe03484db0bf7a274f5cdfe6c352cfdb710abecc56b2f203c782a70d4212b22602f61546a564c65b1341900a80a6d537074d8877479dca222"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-US/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/en-US/thunderbird-52.9.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "5f0d43831c256e00eb3cbe5953cae5b6e84f54bbbde8b71c83f841c38b3704620e1163bcc5cc903a0b716685371912401f90bd00f5500fd42cc6debe97b28470"; + sha512 = "fcd2d06dcd49a5b60284e0a370bb0e5cedfd01dbc06a9057a8063a0e84abde6a6c7a7779bc60e475629a33645b70b718508bbccfea76ff1e6be42c0052eb0e45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-AR/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/es-AR/thunderbird-52.9.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ad640b2048f064d3e0914a0e79311e66c169258dd259a6873983147c37778616eecdc6e22aa64db272b534813a11fd1a0e5c555ca158d565513f3f201197a9a0"; + sha512 = "b41eac5efe305b395237de378b49d33e1804661ddef3bd321f08a97bb8ab437299a899e81bdd5230981dc6119de45902ed1fd961cbe02570b2545ccba58f28e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-ES/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/es-ES/thunderbird-52.9.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "12c3f601473909f38f737a353dbda2bea515cec0e6934c389daeeb470a489104d8aa7f920b0d81f6da930f886ea74b0c82dc6a49a2142c1e843c458f597c1a5f"; + sha512 = "4405a7ca6b8809223ac6d441a52183687df9d016cb115dac10e4d78f0df4af4f41daf2c95544948f119cc5977e3b749be919d66f14049221aac50c81d2007847"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/et/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/et/thunderbird-52.9.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "840cee14b983e20a0aa6847e15aba2babdbba947b6df38c14d3d5f3b50dcdf6cddafec13191c75718634a15ec757ebeb664172d09f841fa2ee55db02bdc67cee"; + sha512 = "1c6933a054068f2a027e9e50200da3398d94152a4decf74750e3c8121103a628f6762c6867fc465216eee8dcec74ce8a06426b7ea668e6e157d00ae6df5c1aaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/eu/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/eu/thunderbird-52.9.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d6b4c9edcc54f22f39991c206e7316ea172e4450fca39202a81cb522040abea08eb9b48e296baaa19aca12d34de0b8af8379c1faf30a1111648a1c0cee84ac70"; + sha512 = "aa54aad06cee5d4a6130bb5269fd649157a09f377c10c2f3aecc24a88a48ae2ba4cd3d0af35ccb9a7cb5a54097bf19eec31ac23d652236a0e440c54468672a99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fi/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fi/thunderbird-52.9.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "23b25a0ab4879ddada9026991fb9955df9d32d635c4d0f746d329dcdfbce4593cbf7a3217845b8ef5f5a1b8e39a8a6bb1447557a5098f19acb82027e5993d549"; + sha512 = "6dc8d8c586ea6fd23fd5c5438c650f39e7fb441ff30f1ef541a1f62a3e39b58fa154b50298df6585d5f4a2451b8d660d620fae4a9d3812b50270cc4e2b6cde9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fr/thunderbird-52.9.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4033f784c31e8e13cfe408782e8b4e528f4d099abd02480090a28c6d0079a5bdd29ee0cd0953d5b94434c60d11c6b9867b355a8d8b6296ffee51d78337df3931"; + sha512 = "106d63fd73482886682e02f222b7907f130485c14ae8b2f6196f380828a224726d53e1ab0b9d6a12044fb62168934de745285a686ccc8e36bc78f4988cb3cee7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fy-NL/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fy-NL/thunderbird-52.9.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "64959a9a0d45564ff2ff344e1494c7f3d80792ecd8fd7df8f2ce3f35676533b033183f24ce44416f3cbd281dde20a7c7f2c3c488e8476d606d0416bdc341c02a"; + sha512 = "8ea82bc44e837e38f01fb3ae6310a9726c8ca2a8b1bd0a6f1eef9c5d4b83fe3d2ae62ae12e0aa5466dc591f1f566339b50fc03d77cbfbba2701784affd597585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ga-IE/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ga-IE/thunderbird-52.9.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "255215853d3eccc809b71b653d6e830d1cc3e5857409f8d8f91b9f7a2d6e4cfb1033ba927e79a407f482ef8b56c1175d2b0162eb04a153cda8c2e156b0da8c16"; + sha512 = "16d4de4df7ca43ff7b66c362f82ff2b9970e8a835042cc3a3725178c1d31459c7a41a2689f23640996317b7d3af6f7b35b9335f48c28e75144102611ce6c87b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gd/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/gd/thunderbird-52.9.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "483550a103337dd7807b85ff87ce0fead21851ebba75a470be88796017bf412979be6020eb3daacb7bbc15044236093277b6b2dac1ac66fa2c3b2fc2e403911f"; + sha512 = "121939eec9f61b07885d68bbfc864e24ab57be48f70ec866903ada1a8e9887169dc0d0fdb62ec7fba71d0d36429325cf1ebdc29d02bb38fb71a41439c4290411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/gl/thunderbird-52.9.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bbd79bf49e94720ffed29c07555488164de1188212fe4ae0e6076ede587997b3def662f880176e267d11c4ba1b1d4cdc6ed6721ee771a7cd9acabc3a231f76e9"; + sha512 = "7fc0f727d1f5d99c2c1d6c30778b949d0304ad614a2323ddb034e4f49e8647d600f3c3bd40a0879a08945a27025abb43cf3af453f3506e7cce9790e80450555f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/he/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/he/thunderbird-52.9.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "99b135b3f4aed9909daf8c2711ac10ad9ee85beecbc127e112fd61fb51a7d3d8f8575722cef0e7da6d4f79aa38de72ea4807c9503af5974c1ba9787180ec014f"; + sha512 = "bc792144bef2e87958e8773caef367750ee5dfa005d494e0c4f328c89de7555d3d3f8e19085551e5cc2aa06af06d5da698582c7b87b73b15d0fdd5e66daf566a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hr/thunderbird-52.9.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a11ff16f2993d07d748630e94ec7bd6cd7634506535f3b7e7cfa5d16439fb6d2118ec195752cdedb87bfbee20feb629b72d6ce2f84b72a1da87b876e8e9786dd"; + sha512 = "56a4e35b53c319b8e639c79ff9edcf6ce62c43d338645ea8b39f41deecd3d4fb4b03d6c3356f1875647dbb69b411eb28fb905a3434765b4e42bf0291c42bfe20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hsb/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hsb/thunderbird-52.9.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9090e5766ca42f0a633a2e639a520cf6f89a0a08f9d81d7e35fdec64b9effaab8759fb7241ab77c4b31b217e5fd72d52fc953544dd55c3b141a9a6d2e631ca5c"; + sha512 = "caa5bb1686a19ca904d55b5bf5de6760b1403df535f92e061e48720bfb62f7a3b6e8e0af690817b636774b0d0323e92393701aa9689c375c71545e7a56f93af3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hu/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hu/thunderbird-52.9.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "f5158c0d4ba87f2472fb07f850a709e174577293e431b482f0d67e3ecb16d818544a02e221d3b68dcbd1d8e750795d51254ad87eac98350f4919979651261e5f"; + sha512 = "d1d989dccf98f5db87ca565b33bf1d8278c4bef0e88a57f5465b1ec77328c9033bbae12b92115a9e431ae86bd33042e02f7dbf1933a70e3f0daadb13ca5f96ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hy-AM/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hy-AM/thunderbird-52.9.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c902f41fa9353e57c666876715da6175ee9bad96ed45e0e858b436fb5c10164038a56bea670fb73a8b0eb2a60ceed33a7c08e790718efe2e22e6883768b21529"; + sha512 = "6f4e519dc51cca5fba623e2883d72337392a831e837f294ef0359541e9483a8ef9ccee9065867482af92f57a230ae40bf38cd8cceea56c8a430a0735b5ec5f02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/id/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/id/thunderbird-52.9.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "2366a3c32145012e073c84527f7e0f8cb1b311728b414084ee7b99727df5ea2ba6b6323def0c7fff2df20066f65ee530ed635a981e42bd1b7fe21874b893a680"; + sha512 = "c73238c614ccabc55bd231f1337cb9c91a38f25a6a3c5420ee278a68d4b00eb56cf02f9cfee4fe52457762ffe4826a441cc25f5868bdb3c8afd81857f74c19c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/is/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/is/thunderbird-52.9.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ae858675cac66dec80de439a2d9a1290ef2d6644a896b183692a10924eb55184b18866227787bae30cc01482453e65040618158a05c2f8d6d9dc2b7b60dca09b"; + sha512 = "187fd5bb383d775fdd00bd558aadd38cacbcf14066b6e0db50e0bb72ea2abc4e3a123ec2e33b12895d7c1ab6911b75949e3216beb06b044294b1f92f9ff336d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/it/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/it/thunderbird-52.9.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ace77d1b7385f9aa825d5f67f640a77187891d5a257a00a4a9c565f46f742d931093a26f1d234f65f5e372d9598cb26c98766913e5b10a1c593fc6faab32edf3"; + sha512 = "d4df787eab69c8a342cc48698d1c329a6e2feafc634d297d20d451b15bc8b7843a4dc7fbb39bdff24fd1720d387e101dda01dcd8a7fb5570d70016f1a98bf486"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ja/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ja/thunderbird-52.9.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "cb61fdcf68f4d02340a25c5b01b7037a7d102423bbd7068a9e7766f823a88ce461d52d6aca4211c1d871d31b8503477bd606c1f814c725f65240c260284e63f1"; + sha512 = "22cd069e4b1a1326888aaeff5a74d73d84ebacc160717fc8fa046ec3d011f082053ac7110870284e61931808c447ae54b40acda4b3aec2d267f572220fafe492"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/kab/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/kab/thunderbird-52.9.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a52705049e4baef0e8f884f97fd3dc15097c855987e540adcca6b9d27d9d1a38538e326bf1f6bb2893055f72f3fdefe0563b6e048c02031af4e7e4bb77140698"; + sha512 = "acd50322046c5e42fdebaab02f565e7c716e83c84a3813dbc7e957fe37e9c01a02c7574486a6296eb2080744c1798a1b02ab993218d56f277dd7284d557b29fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ko/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ko/thunderbird-52.9.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a4bbe35e6a5fbf4db08982b0538390e3ec5e54d4e8b627a0e9267ae9137822710add418e5042ace3be8da3d5d56ea41ee4d5bbc5bfb95afe1587a5f81d5b32d4"; + sha512 = "71e85afe9b8b7f8c2eb96f014b4d2e55272fa458d088cff90b58506be8100ab43fcff9ee5d8a2faedc4be30d8afb0bf40afa4626455c9b17d8f0ceb61708d1d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/lt/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/lt/thunderbird-52.9.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0ef3fdb51246274198221cdbe07ebe6083c36759edd73243ed3568650b2d6570e90fc25b414d61d6a4bc0755b44eea21818cac09900c6eeef9dfcf24b403d3a1"; + sha512 = "5dc9f270212862ae4dc0e6e0e10229ee6e3ad83720f7ba9fbbf604bc406114d16775d087a3209c35471218e7bdac8fea348984b7d8501309b4b7d39dbf95f0b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nb-NO/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nb-NO/thunderbird-52.9.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4a08c425fc32dccd29901e7211b2e35dc151d954c1a6ec607ece3ffeedff1a913bef8910b46e4285edb785111643d6b1eeb19284af953e8446d92c055c62621a"; + sha512 = "4e187c7aef208e00c80632a075d649cd1dc4d2ffe8847fe32df78112d81dc98b5f665bfaf9d63911d389a2a24fc6fc4581ca95023fce05908fb9062c6d287923"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nl/thunderbird-52.9.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8f54f5b2131bdd6579dcf7dce3afea57ac069206258ba52649d4f587aeed6e9aac9a08c4dc3920fd9be37074c2e619071bf502490b43d40a164d3f8d283de5f7"; + sha512 = "c0c15136ed4865c76d4b0ba24e7dcccec4c50e3706a770c6adfafc94a119df33bab7643d7cc6abdb85f37d4afdada5d5ad556b91ec3111501a2a9fd93f37ed54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nn-NO/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nn-NO/thunderbird-52.9.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "2d93dc0829669babf3ae3c3d6f16a7c9d2c9491c6127b1d7adc9b071cc6343e6383f0eed78bde342ce52d9570cc56b74595970e48430f08215143ed9642ad6cd"; + sha512 = "2ebd9d8c516d506fc7454768a71d0ec5fef6e766b285ddc46d97041624df8688eb6aa6cdf5082911c0d338e1293d73f87dd411081c209c4e4ca7f390d61040b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pa-IN/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pa-IN/thunderbird-52.9.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "98a844a40538224f750934132deac0270fa401afac00cc19352798ba813249408f976809b261419d0b8613a4ebbaf7e8ed2b8669f0d3ffed63916b9e71f1b28d"; + sha512 = "9a8b43faf81d0e12b0a36af4f3bee1e360c09a8612ceb7df8200763f2e2c8c99a3e73551c4954359dccd9d393ba190f0d18904e59658272f93a8cb8ea6955d44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pl/thunderbird-52.9.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8c7465446cd1cae4d1bbaae69541516765d9388c79e73bb64996fa0154802f5a20f86cd6c1d0f835f7f7b631455d0b5d1ccc1d0d6119705bc5a9f6f06ecce8de"; + sha512 = "1323658b75438e2e473b34c810aec9094f2933af2c492cdfa0617ab58be5a956226640998241835d5c39868bf5d0a4ce176cd0e9b59e70a519649c858362c769"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-BR/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pt-BR/thunderbird-52.9.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "718b4af9ae8b205f1cdf666b68b851b7c0fd5f0152237f8933dc1ccc843265fe8a869c2656d044ce7b5ef857981c827fc6dee85ff1008921108313bbfe1266a9"; + sha512 = "669d5583d94692786bb4719d2a6428dcb52733811439636c6aa0f5a18a10804824cb9f158bf45d9f82c8a6317c2950c4da3d1391c6a0096ad13745ba95c5506c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-PT/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pt-PT/thunderbird-52.9.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3bf4ae15abfc39505f7f846e468baaa70b01e370a05258f31150e778ff67517098e27a9be135ead2f8f53ef96291d8d04a201d6aeb7d56a9e45e211f44246b21"; + sha512 = "8de8b7bf494cf9ca9132b98c53659e8238db06df60449858cbf53e129eeb7640e26f7134744a031aad428bf1440e5339aef36e45b1a93b6250b130401ad68bf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/rm/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/rm/thunderbird-52.9.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "9214ecc41dd65de573cb21bb9ad56bc53baf8b86261ab41fdddca57173d157cb055f46aa2a087151c0a9b0dca4960914e7afc1095d118754f847dbc952a4a998"; + sha512 = "de74e4afa564f0caefde8ddac66bfd41fb2ea0be2f03fe7b83cb1abb0fef184391a10d0993c680b56cecd282176e6d499101519a785b8f58e92ef0d0e0edb123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ro/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ro/thunderbird-52.9.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "aa46ef621604b95cb97b0e9cd4400a5f57aac58f82b3a5225a7828a757a24fa3e03d80839e1c6c03f914632fa6652386fc1787b8879343b06b6a59f9fe08b87c"; + sha512 = "c4a9305420bc835840a319b334beb4ab45de7e509123b1a5d60466ecf4ed237153caf0d4f4fc75dc277de25bc8d05d017dea730b50cc977d5397a2466d8dfd5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ru/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ru/thunderbird-52.9.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f07d8fe2b6f81ebd151804d1c0f0a39851bf3ee1e468092a2b0eee5f69438a94872b467840da11aaa7fa5f5604dd86f28ee61c85fe62ae283f844f8aac4ced7d"; + sha512 = "a16338cfc3d8f6b5dfbbbfd846ace944791bc27414ebd7c9e429fb4131f988cd6fc5d33ef21c1b0b19b7ef15c3aac134dd4566a994f39609429fa35a85c77238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/si/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/si/thunderbird-52.9.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "8f1b53473fb3e995c499e1583156114557548c1dc8a283a2e8f8c32a90cf2f765b3827455b1abb11272eae3dcd02d39e10b4eb4c2d6cd138f1905cf47bb8c696"; + sha512 = "f45e41437c28dac8ed5ca9993128973a7ea8026b49147aec2f338722f06e6874bdedd62b08df00e0e7ef66b23d174374852e5d621db5354c78f8d22bb4382bf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sk/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sk/thunderbird-52.9.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9d40559c28a79375bd70b382b959227be036b00115b8c331d1383eadcc4599099247d76a67880e284e8cf9137bed0271c8edc2b61059ae4d91a540de5f50bec8"; + sha512 = "cd5ba98037c0429f36a82604cb7f620a41f536fb4941b3f39ec730668ce9c11ff89dbf3aa900dae6541b263ff602372cb9456c6da6c084e4e7f90d883153070e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sl/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sl/thunderbird-52.9.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "9426449a10bcc6ed3f24123fd5452cfcc87bead7014877a05be59d54db77af0833c15614c8c6e42f57005c9b773b1ebb2e59bcd9afd17177160b4010c0d5423a"; + sha512 = "39a89eb8b69b1ecdb815a95e423487c67ff381a0200af57ec7939be6f10b9c4219df1c0fdecc814d85f1fb60f37b039e283fdc4060cff5a2481dda425d847446"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sq/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sq/thunderbird-52.9.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a6d914e1df0b240afba8aa5467f5c1e62b48a263e86d32ab5b8e2cf07b8ad747ceeb733e9431f018779f4e1e9f6a9291f29f3e05681727a9b4981ad09a8cba45"; + sha512 = "d21440caf9fa0c70fcd8f9af1110fdff1dd2674fc0774712e8aec182c3e7521992b64ee079b88a8834afde689abe9f64429ddbcd2935eb07191db2a6bc454e44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sr/thunderbird-52.9.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "f333626201a1445aebeef71926fe3d57f08fb0fbbeb2adf50b30fa75d3c28c4828489675e74a76fe07b0684e2ab949bc13b87ead003b54119efd11b1c7c11cc8"; + sha512 = "42101562502934485c11324ac63d13a3e0a0ee5044f36b6d5f938197c8932bc4305333744079313f6570c350936d2f79e122a3764dc73d98051dc9fa5805b13e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sv-SE/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sv-SE/thunderbird-52.9.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "5fcc5b4210320f5d571938fddd312493615e829bd6415aeaca2c37ec63db46a1e2d8942e9ce58164c4b8d1d40e88eff0de43861f0e20d796129d9088e624a4ec"; + sha512 = "0bc5cf65d0d3baecc6b611107b595422dce5c7fda51465545a730b7499bac7419b8b914a9731fb54a3e197bd150d87954c94281a0942d0a1f44b1e39e2312bb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ta-LK/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ta-LK/thunderbird-52.9.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "6f48b7b74a11e42fab58436112f8216942dc288e57594e4bd99d951efd8a4f4e2fee668425342635ce1fece60f0fb21027932b4e678a119f38ac45a6f7a89365"; + sha512 = "c326294f7d0d6b016bdd468b9b24a87f2a874f7773388213f55e9001f4a7b0fe1c21ffaf08efdb9286590308a413b821a61c567e79408d5e9851299b992366c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/tr/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/tr/thunderbird-52.9.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c6a5c01c21e9b07fe1555c9f9148f888c793d4290d9b582cfd2741b895166a6b2407f0ff94de098f136758a816d59a1e6064f38c927574bc175afff168be72a6"; + sha512 = "2b850e90127c7dff0bc4a937a5a1fcdeee0d855be1cc484713db210d7e1fe6991869841da79dc859e9b01528a3c5186965fdd78b4b21bf14714af09caffa2acc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/uk/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/uk/thunderbird-52.9.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "6492260323d1e50a2bc129ba22008d3681283b2931bd6df0d5e5d9087a45294cffc74e711a40994d86d98c1d430f4349ffc4b97d0a1b539c35653c6ed6ea877b"; + sha512 = "9e249bf0cc84218c5e59a0e4f026650975a49ba1bc49955802d86e348fca437619455e90472a6e75b3489f8a5c13f8dca44567a5b6af4bb709500600ba44be7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/vi/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/vi/thunderbird-52.9.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d43c675312a30a3e6c02f70e9af921025a6798bb5143864ef7d1bc44e11ad654be66a79590698faa44fd404a4090d6dde37088a26339f3c244e0f1cc4d9042f2"; + sha512 = "4bfd348a419e59a4c1665c99122e9b8fb9d768b7fead8dc3f5576bcb7d24f915da243f6fb31a233eec07894806807966c07234add2d8a48a6439c488358f1c95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-CN/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/zh-CN/thunderbird-52.9.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "fe81ec132fbfd17a15f76299853c45306be9f801d2c03a10fa9e4b25ac48e6e14efe4bc4ff2e5f01a94e46b0c1752add48e5277b11dee7d52325bebf5126616f"; + sha512 = "caefc3ff5cf38dd792daecfb2c6c5c8789ba4f5cf5e965b5e542b7b9605c8c89a2a3d86a330aa497d5984931f9b4daaedf4fc0c8bd9d16c42f2d3fa973ee8967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-TW/thunderbird-52.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/zh-TW/thunderbird-52.9.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "96b53b5287e3625b4045588118427fe696827aa25b790665aeacb9096ca9ee8bca8a67bd28f733d128d08541069a1e684819f4ce8a1fd29cf683bce546a04fd5"; + sha512 = "df930968d97d74ae4ccbbb10e83c65e59254a4669887b5ad5aa303903ad0180a61ad9e7801817d3a6994714004c6391f96ff0335583ed344a8881c9b3baf55a4"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 15d2c58e816c..43684c897302 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.8.0"; + version = "52.9.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03"; + sha512 = "30jv4r8yh270dynqiwlc0yf52f6bka366l48rsppz5nqdb9jvxz04vghhcrp832wrmhd9z6r4b09yb1syhg7n3sl7zsjj2gq1yblhi1"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 279dc508225b..c9d2a111753d 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.1.8"; + version = "6.2.1"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "0gy7jfxr5f8qvbqj80g7fzaw9b3vax750c4z5cr7f43rv99284pc"; + sha256 = "02nzihs720pmgr5139s7fz88f7gm19dn1x2kqdpi81k7gdwqq0bp"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 62dcf5dd8a88..7c07082b3041 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "grisbi-${version}"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { url = "mirror://sourceforge/grisbi/${name}.tar.bz2"; - sha256 = "1m31a1h4i59z36ri4a22rrd29byg6wnxq37559042hdhn557kazm"; + sha256 = "1rh2iqvi7lpz5l57vn7qk9azil3y1g65mfbi9hhbx956knh9bpf6"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 9ecc9f20ac16..6ee3f3266f8d 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 91ea7e500144..222021bb1c9f 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cln, gmp, swig, pkgconfig , readline, libantlr3c, boost, jdk, autoreconfHook -, python2, antlr3_4 +, python3, antlr3_4 }: stdenv.mkDerivation rec { name = "cvc4-${version}"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; - sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi"; + sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python2 ]; + buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://cvc4.cs.nyu.edu/web/; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ vbgl thoughtpolice ]; + maintainers = with maintainers; [ vbgl thoughtpolice gebner ]; }; } diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 12b2a36c6eae..e05839b2a143 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, z3, zlib, git }: +{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }: stdenv.mkDerivation rec { version = "4.2.2"; @@ -16,7 +16,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ git ]; buildInputs = [ z3 zlib ]; - makeFlags = [ "vampire_z3_rel" ]; + makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ]; + + patches = [ + # https://github.com/vprover/vampire/pull/54 + (fetchpatch { + name = "fix-apple-cygwin-defines.patch"; + url = https://github.com/vprover/vampire/pull/54.patch; + sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; + }) + # https://github.com/vprover/vampire/pull/55 + (fetchpatch { + name = "fix-wait-any.patch"; + url = https://github.com/vprover/vampire/pull/55.patch; + sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; + }) + # https://github.com/vprover/vampire/pull/56 + (fetchpatch { + name = "fenv.patch"; + url = https://github.com/vprover/vampire/pull/56.patch; + sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g"; + }) + ]; + + enableParallelBuilding = true; fixupPhase = '' rm -rf z3 diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index beef26c6032a..e0993a580193 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, callPackage_i686, fetchFromGitHub, python27Packages, graphviz +{ stdenv, lib, buildEnv, pkgsi686Linux, fetchFromGitHub, python27Packages, graphviz , includeGUI ? true , includeProtocols ? true }: @@ -20,7 +20,7 @@ let platforms = platforms.linux; }; - cli = callPackage_i686 ./cli.nix { + cli = pkgsi686Linux.callPackage ./cli.nix { inherit version src meta; }; @@ -47,7 +47,7 @@ let python27Packages.wxPython graphviz ]; - + installPhase = '' mkdir -p "$out"/gui "$out"/bin cp -r gui/* "$out"/gui diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 8c442f31cd14..01a4f4023023 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -2,7 +2,8 @@ , qt4, xapian, file, python, perl , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , libwpd, unrtf, untex -, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }: +, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib +, withGui ? true }: assert stdenv.system != "powerpc-linux"; @@ -15,10 +16,13 @@ stdenv.mkDerivation rec { sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; - configureFlags = [ "--enable-recollq" ] ++ - (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); + configureFlags = [ "--enable-recollq" ] + ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] + ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - buildInputs = [ qt4 xapian file python bison ]; + buildInputs = [ xapian file python bison zlib ] + ++ lib.optional withGui qt4 + ++ lib.optional stdenv.isDarwin libiconv; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f6816ec15484..3f05bd08f3f4 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,14 +5,14 @@ let pname = "meld"; - version = "3.18.1"; + version = "3.18.2"; inherit (python3Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0yg8i1ff3rsavsaxbnd6dxmfsiyv49kk8rv5wqnyhf2zmfp8rxis"; + sha256 = "109px6phfizi2jqrc7d7k7j6nvmanbfp5lykqfrk2sky77sand0r"; }; buildInputs = [ diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b01f0b722724..ff45cf81d7e5 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -420,8 +420,8 @@ rec { buildImage = args@{ # Image name. name, - # Image tag. - tag ? "latest", + # Image tag, when null then the nix output hash will be used. + tag ? null, # Parent image, to append to. fromImage ? null, # Name of the parent image; will be read from the image otherwise. @@ -471,12 +471,19 @@ rec { buildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; - imageTag = lib.toLower tag; + imageTag = if tag == null then "" else lib.toLower tag; inherit fromImage baseJson; layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; passthru.layer = layer; } '' + ${lib.optionalString (tag == null) '' + outName="$(basename "$out")" + outHash=$(echo "$outName" | cut -d - -f 1) + + imageTag=$outHash + ''} + # Print tar contents: # 1: Interpreted as relative to the root directory # 2: With no trailing slashes on directories diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index ca7f78093794..ec2667310cdd 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -13,6 +13,7 @@ rec { # 1. basic example bash = buildImage { name = "bash"; + tag = "latest"; contents = pkgs.bashInteractive; }; @@ -65,6 +66,7 @@ rec { in buildImage { name = "nginx-container"; + tag = "latest"; contents = pkgs.nginx; runAsRoot = '' @@ -106,6 +108,7 @@ rec { # docker run -it --rm nix nix-store -qR $(nix-build '<nixpkgs>' -A nix) nix = buildImageWithNixDb { name = "nix"; + tag = "latest"; contents = [ # nix-store uses cat program to display results as specified by # the image env variable NIX_PAGER. @@ -121,6 +124,7 @@ rec { # dockerTools chain. onTopOfPulledImage = buildImage { name = "onTopOfPulledImage"; + tag = "latest"; fromImage = nixFromDockerHub; contents = [ pkgs.hello ]; }; @@ -129,6 +133,7 @@ rec { # See issue #34779 and PR #40947 for details. runAsRootExtraCommands = pkgs.dockerTools.buildImage { name = "runAsRootExtraCommands"; + tag = "latest"; contents = [ pkgs.coreutils ]; # The parens here are to create problematic bash to embed and eval. In case # this is *embedded* into the script (with nix expansion) the initial quotes diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 9cdcc2a752d0..6a6deaa875a7 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -965,22 +965,22 @@ rec { }; debian8i386 = { - name = "debian-8.10-jessie-i386"; - fullName = "Debian 8.10 Jessie (i386)"; + name = "debian-8.11-jessie-i386"; + fullName = "Debian 8.11 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "1w1gm195dcrndy5486kcv0h9l3br9dqnqyyhmavp4vr5w2zk7amk"; + sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.10-jessie-amd64"; - fullName = "Debian 8.10 Jessie (amd64)"; + name = "debian-8.11-jessie-amd64"; + fullName = "Debian 8.11 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "045700qsrmd3lng2rw8nfs5ci7pf660lwl6alpzkyjikyp6pg7k8"; + sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 5ed4b487bdd9..06510c8f34ac 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.28.2"; + version = "3.28.3"; in stdenv.mkDerivation rec { name = "bijiben-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1z1dqspjpyym27yav7pr813x7k0jdxifgj5rdxgp4m6cs1ixcvjs"; + sha256 = "0lg92fl6dmrybkxs3gqhyr8rq945y64k51l6s72yiads7pqabli2"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 2a26f9301123..6d55cbe8ee79 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.28.4"; + version = "3.28.5"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1378zzqdwv0hnirg8k91s5vgkcl1brfild3hgach5jhg78nxdb4j"; + sha256 = "1z1qimspx1nw7l79rardxcx2bydj9nmk60vsdb611xzlqa3hkppm"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 614308f7b631..ae2b0f29f980 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,19 +1,46 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd }: +{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils +, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }: stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.28.2"; + version = "3.28.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0"; + sha256 = "1bpg8172f16sgbhsn2sis3xh2ylrv8vj7j12xdxkmsmfh2k2bqfy"; }; - configureFlags = [ "--disable-tests" ]; + patches = [ + # Fix post_install script + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-logs/commit/2f498464ac539fdf98199294bfb9205436b9c323.patch; + sha256 = "1v6d8zgd31waliwlvk5xlfjap5h84bpqb1az0wdjm4c2a53iiwlp"; + }) + # Fix a typo in manpage generation + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-logs/commit/02b782fcd64d4773e2dadbdb9ea74bf3923003b3.patch; + sha256 = "1a8zcp62shspw45s0dvi2iv83qppz4hcw31id6zlwq0dp94vvb46"; + }) + ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + mesonFlags = [ + "-Dtests=true" + "-Dman=true" + ]; + + nativeBuildInputs = [ + (python3.withPackages (pkgs: with pkgs; [ dogtail ])) + meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils + libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + doCheck = true; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 03fdf4b14fe0..794f37fcbbdc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.28.1"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "05zpdp9mkfjz22hs7hfjikkxhzmvy02mxrldrjxsv8ff17w9xvic"; + sha256 = "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index c035dc408dc0..6605d15a697e 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,18 +1,6 @@ { pkgs, lib }: -let - - pkgsFun = overrides: - let - self = self_ // overrides; - self_ = with self; { - - overridePackages = f: - let newself = pkgsFun (f newself self); - in newself; - - callPackage = pkgs.newScope self; - +lib.makeScope pkgs.newScope (self: with self; { # Convert a version to branch (3.26.18 → 3.26) # Used for finding packages on GNOME mirrors versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version)); @@ -431,7 +419,4 @@ let yelp_xsl = yelp-xsl; # added 2018-02-25 yelp_tools = yelp-tools; # added 2018-02-25 - }; - in self; # pkgsFun - -in pkgsFun {} +}) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 7635f151c55f..9e5faf96de29 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 7daf81e64ec9..966237b73a82 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/bluedevil-5.13.0.tar.xz"; - sha256 = "1aikg2nlhkzasliiyqa0ijk78mpa1lrpgl7gqh3lva3dvq7w9v3m"; - name = "bluedevil-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/bluedevil-5.13.2.tar.xz"; + sha256 = "16ip2myq0s5d1yjipr0k0cvbq22mc668pms33qhs2836mqxq4c87"; + name = "bluedevil-5.13.2.tar.xz"; }; }; breeze = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/breeze-5.13.0.tar.xz"; - sha256 = "0aaih84h8bh6ljcw6fk7nl4wpvcnk6vqz65s0b1qb8y7q6xr6cd0"; - name = "breeze-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/breeze-5.13.2.tar.xz"; + sha256 = "1yl41rjh2qmplny6x9hm885mwsfn6w5asw8dkp7rk0qpyb607jkq"; + name = "breeze-5.13.2.tar.xz"; }; }; breeze-grub = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/breeze-grub-5.13.0.tar.xz"; - sha256 = "0q0a8ijg7npw5nl20xnna26jvrqdvmil1z7jmc8awdy3bhyi47n6"; - name = "breeze-grub-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/breeze-grub-5.13.2.tar.xz"; + sha256 = "1j2lh8prbdivy7vlv3iyizgkmsc2qwpjkivyn9b9r6gpp0ii0dwk"; + name = "breeze-grub-5.13.2.tar.xz"; }; }; breeze-gtk = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/breeze-gtk-5.13.0.tar.xz"; - sha256 = "131fknmj1aiixzv2vqk2vza1swxcvm5haj3v9h6j3xp1l9q8rr7l"; - name = "breeze-gtk-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/breeze-gtk-5.13.2.tar.xz"; + sha256 = "12hs3nqjf20kcn18ab64qdwc8aq33l220giqfffdb7rh8n7wyknx"; + name = "breeze-gtk-5.13.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/breeze-plymouth-5.13.0.tar.xz"; - sha256 = "13g4dpx094x4hmhhv5ghbdf59kzlgdxb9b7dpak8bliq3npdh1ri"; - name = "breeze-plymouth-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/breeze-plymouth-5.13.2.tar.xz"; + sha256 = "18020rppw59iwqdrmm0xsmq2cl98z6m5na8walvvzvlqsskc7hh6"; + name = "breeze-plymouth-5.13.2.tar.xz"; }; }; discover = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/discover-5.13.0.tar.xz"; - sha256 = "1xg0n1za12ib70iqyxs0kcqrixxfhghi96qqs0l24cmwfca6g4km"; - name = "discover-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/discover-5.13.2.tar.xz"; + sha256 = "0jh2d9gk72fm2csf8i41hq4i0dd467m3cw5y81wbrz3k9qd3llrb"; + name = "discover-5.13.2.tar.xz"; }; }; drkonqi = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/drkonqi-5.13.0.tar.xz"; - sha256 = "0mm9bssz87camwi7zkgf0ajrnd1pb3gs044k19vgcj85g6knf1bk"; - name = "drkonqi-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/drkonqi-5.13.2.tar.xz"; + sha256 = "1zfd4pbrqp67zqmhydimqdbq49bc5b20d9z8px27l1rgj951ms2j"; + name = "drkonqi-5.13.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kactivitymanagerd-5.13.0.tar.xz"; - sha256 = "10sqzc4mhbbrzsf9bgmlssk836ylxdqvz8k8wzjsqi7r1iiqmcq6"; - name = "kactivitymanagerd-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kactivitymanagerd-5.13.2.tar.xz"; + sha256 = "1z6nncnlzmk0l1k4vsg9g2z18k1z4k73j2gv7bbhyx9xmb0aypdf"; + name = "kactivitymanagerd-5.13.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kde-cli-tools-5.13.0.tar.xz"; - sha256 = "0qjjchdnib28728b0mbkbwq99zr5h9xzljqkskj1npbj723z2bzs"; - name = "kde-cli-tools-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kde-cli-tools-5.13.2.tar.xz"; + sha256 = "04hyhbr288girwsp5h8rbxkp8m56wm69h9vhbb7g4lr5b3jrr1ps"; + name = "kde-cli-tools-5.13.2.tar.xz"; }; }; kdecoration = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kdecoration-5.13.0.tar.xz"; - sha256 = "1fgv73wyahk7q2kvs6vzjnxj0h2g7g137xlczc7wjwxpyrlchavm"; - name = "kdecoration-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kdecoration-5.13.2.tar.xz"; + sha256 = "1gjp1ma0d0kxkky13kx16gwmwwjllz2w9h4ffa9hnw93sk0z1rb0"; + name = "kdecoration-5.13.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kde-gtk-config-5.13.0.tar.xz"; - sha256 = "1l6zjnjwb8yiy00xnkcaljw0c6mcwd93c2qyc3p23aaxw31jnhyg"; - name = "kde-gtk-config-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kde-gtk-config-5.13.2.tar.xz"; + sha256 = "0np7r02ihgii1894fysr8ik9jxs3b6bdb5blkdnh51j44dr7c5a4"; + name = "kde-gtk-config-5.13.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kdeplasma-addons-5.13.0.tar.xz"; - sha256 = "034qnphk2biz6jqc494bwzqv3sqr63hvqadiywnhy53n0l9crf3i"; - name = "kdeplasma-addons-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kdeplasma-addons-5.13.2.tar.xz"; + sha256 = "03a0w3gimiak32zhhqwi4y35lpdq7fblbjg8xfgsdzrps7zh1n7x"; + name = "kdeplasma-addons-5.13.2.tar.xz"; }; }; kgamma5 = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kgamma5-5.13.0.tar.xz"; - sha256 = "0yg89p87kx7s2mzhz02rbav07cqb5s3689x3d7r60ppmmf43ylv9"; - name = "kgamma5-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kgamma5-5.13.2.tar.xz"; + sha256 = "0d3yhwgyag5yzny9adsxvdd1dmfq0k6aslz9cgi5fn7k9jppvn6j"; + name = "kgamma5-5.13.2.tar.xz"; }; }; khotkeys = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/khotkeys-5.13.0.tar.xz"; - sha256 = "1x79cn5wi917d3bvy0sfiaqyziziajcgpc9d74var5g9fqg6kali"; - name = "khotkeys-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/khotkeys-5.13.2.tar.xz"; + sha256 = "13fffa73mddm4wb436kw6m7i2p1mv8c3z8dj6gr7ccbcsmzhlj88"; + name = "khotkeys-5.13.2.tar.xz"; }; }; kinfocenter = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kinfocenter-5.13.0.tar.xz"; - sha256 = "15g16455m7csi07llfks58yry7bmv14avs15lb67nadba3clb5mx"; - name = "kinfocenter-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kinfocenter-5.13.2.tar.xz"; + sha256 = "00cvc3idbghl74nbrbii9xp969vngr0jbdsjh1rriv1is8vfldfn"; + name = "kinfocenter-5.13.2.tar.xz"; }; }; kmenuedit = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kmenuedit-5.13.0.tar.xz"; - sha256 = "12k8y1mw5frg24i6bp39sax9mjv4q9p996rvma9nmwqfxp6br1bf"; - name = "kmenuedit-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kmenuedit-5.13.2.tar.xz"; + sha256 = "0ss2dwnaqsfir0s95iyp1sjmh1kx19jihj1nbnix5hdlwgbp5qvd"; + name = "kmenuedit-5.13.2.tar.xz"; }; }; kscreen = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kscreen-5.13.0.tar.xz"; - sha256 = "12hgynpbdj22fg896js9nw9rqddk4j5a8dl6iyr7rwixgv1nw8y5"; - name = "kscreen-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kscreen-5.13.2.tar.xz"; + sha256 = "080m1kii0xxd2r1b2gvz40qj7ixkammgb3ki3sbxa74avwxd1p10"; + name = "kscreen-5.13.2.tar.xz"; }; }; kscreenlocker = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kscreenlocker-5.13.0.tar.xz"; - sha256 = "12jar9dh0c221v3zlpzcrlpzfrxk39gxqxz3bvb16k6ws5307psh"; - name = "kscreenlocker-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kscreenlocker-5.13.2.tar.xz"; + sha256 = "0hczdgx03i2r6y8qfrpj7pk4n5l1maigsip77qbgsli3d3fapri9"; + name = "kscreenlocker-5.13.2.tar.xz"; }; }; ksshaskpass = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/ksshaskpass-5.13.0.tar.xz"; - sha256 = "09id83az5pxn56xqnkilmha0ada86mysxlvvhy6rnm10c340rc0j"; - name = "ksshaskpass-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/ksshaskpass-5.13.2.tar.xz"; + sha256 = "1f4b12vqzg351m4ps316w0spbywm7mv21p95sd17zz17fm39pzzn"; + name = "ksshaskpass-5.13.2.tar.xz"; }; }; ksysguard = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/ksysguard-5.13.0.tar.xz"; - sha256 = "0sz7k0vkpji448pnqpc7q9plsxrf2q5fq3kly2bwh2isd44lxram"; - name = "ksysguard-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/ksysguard-5.13.2.tar.xz"; + sha256 = "0b4achg5dvb97mf25bd9s08nanj4ag6y4bwdbpr3zgbp1dp790n7"; + name = "ksysguard-5.13.2.tar.xz"; }; }; kwallet-pam = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kwallet-pam-5.13.0.tar.xz"; - sha256 = "1sbh771z84k9gmy9mkbiwp1mz5rhlb7jb0mbpac6s7gm47axl3za"; - name = "kwallet-pam-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kwallet-pam-5.13.2.tar.xz"; + sha256 = "1dpd7lgycfjrd9lgv1na4gb3wf22dvprigsxsqiq3zw9xqkc9778"; + name = "kwallet-pam-5.13.2.tar.xz"; }; }; kwayland-integration = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kwayland-integration-5.13.0.tar.xz"; - sha256 = "0hwyhw9y446ycjzshkdf159awlmkz2sziijabnnblkc75j7qhhzf"; - name = "kwayland-integration-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kwayland-integration-5.13.2.tar.xz"; + sha256 = "0bhx5678f21mxmrdlh6r8cxjj6dh45minkgarh6j2zdvzfxxif1s"; + name = "kwayland-integration-5.13.2.tar.xz"; }; }; kwin = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kwin-5.13.0.tar.xz"; - sha256 = "12ymycrh6ryrpkz96mhha38bgpfaxchf9ilwpiafmms5h6s8d3zh"; - name = "kwin-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kwin-5.13.2.tar.xz"; + sha256 = "03fhjl3zyk725xp6bj6ljgfmniw5zgwpacarfl7ifnnwzgfbni6f"; + name = "kwin-5.13.2.tar.xz"; }; }; kwrited = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/kwrited-5.13.0.tar.xz"; - sha256 = "0vpmcd9l4jl440wqh691rjk1zxbs7vaknfrbar8n5fj41w8bri24"; - name = "kwrited-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/kwrited-5.13.2.tar.xz"; + sha256 = "0m6ks0l9nyfpdl5lvfzlip9qk7z5cfnx3jvh4v20vm4cvr9rb1yr"; + name = "kwrited-5.13.2.tar.xz"; }; }; libkscreen = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/libkscreen-5.13.0.tar.xz"; - sha256 = "1fmffdw9hg4wcr78nmdryaam1dc890fcpwiq5v5n6plp78v99hv9"; - name = "libkscreen-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/libkscreen-5.13.2.tar.xz"; + sha256 = "05r56xynavq3zd3bvchy1yx3z0h8si12w8fcf8pqgdvr38vrqqm5"; + name = "libkscreen-5.13.2.tar.xz"; }; }; libksysguard = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/libksysguard-5.13.0.tar.xz"; - sha256 = "11b82rma2mqrjnzjpdij6316xbynr7ca9vizp3zqps7xvgq2hva1"; - name = "libksysguard-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/libksysguard-5.13.2.tar.xz"; + sha256 = "1xbjb4lm7bn41zpy9plsg4qdqg3i4m9gzvpaqd1rvd9v24qzy7pi"; + name = "libksysguard-5.13.2.tar.xz"; }; }; milou = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/milou-5.13.0.tar.xz"; - sha256 = "12azqm4ck4mlz5cnglp6b99lj229dk25c2r9dy1v2k1c0sa9wqk5"; - name = "milou-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/milou-5.13.2.tar.xz"; + sha256 = "1mzhgj6q4siaiy9kccrdr4dpjij5gkd1l60kmw0lk80sn92cc5pd"; + name = "milou-5.13.2.tar.xz"; }; }; oxygen = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/oxygen-5.13.0.tar.xz"; - sha256 = "15zxldc828vppswrqfkgmzpxx6fpx8i20qm0smljkx08yd280zry"; - name = "oxygen-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/oxygen-5.13.2.tar.xz"; + sha256 = "09dxn73fx78j7d0qfvv7hw7h0pv0yaz1f7s2m9f5f9d666v8fja5"; + name = "oxygen-5.13.2.tar.xz"; }; }; plasma-browser-integration = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-browser-integration-5.13.0.tar.xz"; - sha256 = "1pnzi02lfm33c47l3znzj9p2ksrc4mn9wvglj6ffnxfhcsdv1xqc"; - name = "plasma-browser-integration-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-browser-integration-5.13.2.tar.xz"; + sha256 = "08gdm4qyi89zffrk630cj8k6h0qimmv3va99s85bqwvjzslsf9i6"; + name = "plasma-browser-integration-5.13.2.tar.xz"; }; }; plasma-desktop = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-desktop-5.13.0.tar.xz"; - sha256 = "0bj6zkgqjc83yp0q3srpdvvppi2jh9gajr65bli370n52z86rmnn"; - name = "plasma-desktop-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-desktop-5.13.2.tar.xz"; + sha256 = "17xcvjbr5j75m8j54g9i7ny9qsiqvv930fgwdxzdwhvskca9lshi"; + name = "plasma-desktop-5.13.2.tar.xz"; }; }; plasma-integration = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-integration-5.13.0.tar.xz"; - sha256 = "1xl9zlc9z747zy2lzj3azbypljxv3gn03ssn5703dg8ab32kr0p4"; - name = "plasma-integration-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-integration-5.13.2.tar.xz"; + sha256 = "0273510djc7kbcvxw13dlhj3cislfrbryg8im8c4dasabafxfhmx"; + name = "plasma-integration-5.13.2.tar.xz"; }; }; plasma-nm = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-nm-5.13.0.tar.xz"; - sha256 = "02680npqafrqq2yvc96x03i3kiq6kwybvg6378718bwpdmrwfv1k"; - name = "plasma-nm-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-nm-5.13.2.tar.xz"; + sha256 = "1shbgdm4019crijpg4xbs9lsan6h63gijqckh4acvjfplbmk39q0"; + name = "plasma-nm-5.13.2.tar.xz"; }; }; plasma-pa = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-pa-5.13.0.tar.xz"; - sha256 = "0m2gss12rqzv4ba554mijqm9qf25c5ghjb8v785si5amm012dkfr"; - name = "plasma-pa-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-pa-5.13.2.tar.xz"; + sha256 = "0sn59f3w3bz7xm41x6i03s9vd9p6vwynnj9xcnyc2797l0bf9vq9"; + name = "plasma-pa-5.13.2.tar.xz"; }; }; plasma-sdk = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-sdk-5.13.0.tar.xz"; - sha256 = "1zaxr8c9nybbap27jsgdb95sn22z0vfyxai969mkmdajxijcy8md"; - name = "plasma-sdk-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-sdk-5.13.2.tar.xz"; + sha256 = "1z1p8n327v1pgkdqj125nwdhip482lny1ryi7c2cdvivhppjdhv3"; + name = "plasma-sdk-5.13.2.tar.xz"; }; }; plasma-tests = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-tests-5.13.0.tar.xz"; - sha256 = "1cclf6cp19y4ylsgqlrq7rjvgpy59dxz91cq14d2fi93h1dcyrra"; - name = "plasma-tests-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-tests-5.13.2.tar.xz"; + sha256 = "0p7j3nhqvlywg32j627ci58ifn5zq9rgyiw0mv8gn79kghzkfc39"; + name = "plasma-tests-5.13.2.tar.xz"; }; }; plasma-vault = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-vault-5.13.0.tar.xz"; - sha256 = "1wx0jibn5fmp2ddy28azls9wb23mhpnwkvg8gihq16im62pb499i"; - name = "plasma-vault-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-vault-5.13.2.tar.xz"; + sha256 = "15w2qyjb4iab302v5n0a8xfiwj9hb62js82v17sln49axcs95xfb"; + name = "plasma-vault-5.13.2.tar.xz"; }; }; plasma-workspace = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-workspace-5.13.0.tar.xz"; - sha256 = "071za67v4d6kn4qn68r88lgwp9mchb2wh26p2mf0rmqxz3c56ihf"; - name = "plasma-workspace-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-5.13.2.tar.xz"; + sha256 = "1rjdh6ikiri6nikl5idhczlk17bzcn29m3g1c7gd67s2fglvak0p"; + name = "plasma-workspace-5.13.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plasma-workspace-wallpapers-5.13.0.tar.xz"; - sha256 = "1xnssczasr855fl5yaffs6a5dlvivrh7dvzhinfws1pk960vndyb"; - name = "plasma-workspace-wallpapers-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-wallpapers-5.13.2.tar.xz"; + sha256 = "0bx7r1xz8k1imi0h9l2rbrk68dbr9zyydj5khvpdbl81c7mmfw8r"; + name = "plasma-workspace-wallpapers-5.13.2.tar.xz"; }; }; plymouth-kcm = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/plymouth-kcm-5.13.0.tar.xz"; - sha256 = "1j7gaqypd5ijrvp4s4ry57q1lix8gfff8pxbwb7n6bnfka6hk8i6"; - name = "plymouth-kcm-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/plymouth-kcm-5.13.2.tar.xz"; + sha256 = "14n8b1ajrw8sx6b1bmlc2krsf3f6f2hwmp6rxay1bn3m3z1blndy"; + name = "plymouth-kcm-5.13.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.13.0"; + version = "1-5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/polkit-kde-agent-1-5.13.0.tar.xz"; - sha256 = "0sab09glz9b8i1ricww8lrvp9ivnfzh4g1nijks7f1wg8nk1vpcm"; - name = "polkit-kde-agent-1-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/polkit-kde-agent-1-5.13.2.tar.xz"; + sha256 = "1z455nh28hhh4f1wxwd6zrxcg4cfpiz02jrbbgqi7x3bflmswc2a"; + name = "polkit-kde-agent-1-5.13.2.tar.xz"; }; }; powerdevil = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/powerdevil-5.13.0.tar.xz"; - sha256 = "0w0x0lgi8xdifz811j749xbgkvqixvrpzamwv0iqn3zgg1m5b5vy"; - name = "powerdevil-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/powerdevil-5.13.2.tar.xz"; + sha256 = "0g9ag9y9pip4q5agvbmp642vjcvj9355gc1j25wh3innml6z7jp0"; + name = "powerdevil-5.13.2.tar.xz"; }; }; sddm-kcm = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/sddm-kcm-5.13.0.tar.xz"; - sha256 = "13mkd1b4c7ihp0s3n80snq70v76vs2gzvfx7f0s2pjq44q07bv5f"; - name = "sddm-kcm-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/sddm-kcm-5.13.2.tar.xz"; + sha256 = "0ya9l65i3lhk9zcnscsy1ps334k2nk7j3ixrv1xbfgr2w1plhkqx"; + name = "sddm-kcm-5.13.2.tar.xz"; }; }; systemsettings = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/systemsettings-5.13.0.tar.xz"; - sha256 = "1imnry86jz2rwwgz470h7pji2hajnj337hvxmrrlr0giijf1amlc"; - name = "systemsettings-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/systemsettings-5.13.2.tar.xz"; + sha256 = "0gzdh4cgvmbr99c96p6pw4a5l181rkpwpwfa79xm8pmr6lmcy254"; + name = "systemsettings-5.13.2.tar.xz"; }; }; user-manager = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/user-manager-5.13.0.tar.xz"; - sha256 = "10w5wr3pxlybqx192xiljni9nbqai33v5j2nvcs032i0ms7fbxpf"; - name = "user-manager-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/user-manager-5.13.2.tar.xz"; + sha256 = "1k3xkyfxs9xbgggs4ymyx1cx7fphxcnh0cfmwqdjbsa6fqjbh7jh"; + name = "user-manager-5.13.2.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.13.0"; + version = "5.13.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.0/xdg-desktop-portal-kde-5.13.0.tar.xz"; - sha256 = "13pnj7mpnv30fqwzpnjrfwmjx4isbkhlznpr6hpvsh0f178zhfz4"; - name = "xdg-desktop-portal-kde-5.13.0.tar.xz"; + url = "${mirror}/stable/plasma/5.13.2/xdg-desktop-portal-kde-5.13.2.tar.xz"; + sha256 = "1vydh7vqycd9fgkiysnz3kf4xqqkvmzr2pmhbng4yz7vy4pci981"; + name = "xdg-desktop-portal-kde-5.13.2.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index ff269afd1a64..794467443715 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: +{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: let # pre-download some cache entries ('mx' will not be able to download under nixbld1) @@ -8,69 +8,84 @@ let buildCommand = '' mkdir $out ${lib.concatMapStrings ({url, name, sha1}: '' - ln -s ${fetchurl { inherit url sha1; }} $out/${name} + install -D ${fetchurl { inherit url sha1; }} $out/${name} echo -n ${sha1} > $out/${name}.sha1 '') list} ''; }; jvmci8-mxcache = [ - rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } - rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } - rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } - rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } - rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } - rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } - rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } - rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } - rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } - rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } - rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } - rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } - rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } - rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } - rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } - rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; } - rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; } - rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; } - rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; } - rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; } - rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3-sources.jar; } - rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}.so"; url = https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-0d031013db9a80d6c88330c42c983fbfa7053193.so; } + rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}/jacococore.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } + rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE_${sha1}/jacococore.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } + rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}/jacocoreport.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } + rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT_${sha1}/jacocoreport.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } + rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } + rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } + rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } + rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } + rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } + rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } + rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}/asm-debug-all.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } + rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } + rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } + rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}/jmh-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } + rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18_${sha1}/jmh-1-18.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } + rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; } + rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; } + rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12.jar; } + rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12-sources.jar; } + rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; } + rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; } + rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "jvmci/intel-hsdis-amd64-linux-${sha1}.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } ]; graal-mxcache = jvmci8-mxcache ++ [ - rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } - rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } - rec { sha1 = "aca5eb39e2a12fddd6c472b240afe9ebea3a6733"; name = "org.json_${sha1}.jar"; url = mirror://maven/org/json/json/20160810/json-20160810.jar; } - rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } - rec { sha1 = "476d9a44cd19d6b55f81571077dfa972a4f8a083"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-allocation-instrumenter/java-allocation-instrumenter-8f0db117e64e.jar; } - rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-5.0.4.jar; } - rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-tree-5.0.4.jar; } - rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } - rec { sha1 = "616a4fca49c5d610a3354e78cd97e7627024bb66"; name = "GSON_SHADOWED_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4.jar; } - rec { sha1 = "b13337a4ffd095c2e27ea401dc6edfca0d23a6e4"; name = "GSON_SHADOWED.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4-sources.jar; } + rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } + rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } + rec { sha1 = "30b13b7efc55b7feea667691509cf59902375001"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7.jar; } + rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } + rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; } + rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } + rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; } + rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://github.com/graalvm/mx/releases/download/checkstyle-8.8/checkstyle-8.8-all.jar; } ]; + findbugs = fetchzip { + name = "findbugs-3.0.0"; + url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip; + sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m"; + }; + in rec { mx = stdenv.mkDerivation rec { - version = "5.171.0"; + version = "5.176.4"; name = "mx"; src = fetchFromGitHub { owner = "graalvm"; repo = "mx"; rev = version; - sha256 = "0ag3g49fnjrnlmjb55dbn9l2cwyvanx36f5hyf21ad8px05fh6jv"; + sha256 = "0xmx4hpnd6m9hk49lgwnvwd0q11s2m4d8axwq7zzc8wm10d692xw"; }; nativeBuildInputs = [ makeWrapper ]; buildPhase = '' substituteInPlace mx --replace /bin/pwd pwd + + # forbid network access while simulate success for passing obligatory "VerifyLibraryURL" + substituteInPlace mx.py --replace \ + 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):' \ + 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False): + print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly)) + return True' ''; installPhase = '' mkdir -p $out/bin cp -dpR * $out/bin - wrapProgram $out/bin/mx --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} + wrapProgram $out/bin/mx \ + --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} \ + --set FINDBUGS_HOME ${findbugs} ''; meta = with stdenv.lib; { homepage = https://github.com/graalvm/mx; @@ -82,7 +97,7 @@ in rec { # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too) jvmci8 = stdenv.mkDerivation rec { - version = "0.43"; + version = "0.45"; name = let n = "jvmci8u171-${version}"; in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then @@ -93,7 +108,7 @@ in rec { owner = "graalvm"; repo = "graal-jvmci-8"; rev = "jvmci-${version}"; - sha256 = "0jkp67m7s252kngxnj0yp397pgx5z95v1lbi68v9g4dw050l28rk"; + sha256 = "1nppk9dpamisiadss1iy82i3rf6igndbf1vax85w9lz310kh0d12"; }; buildInputs = [ mx mercurial ]; postUnpack = '' @@ -122,6 +137,8 @@ in rec { installPhase = '' mv jdk1.8.0_*/linux-amd64/product $out find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \; + + install -v -m0555 -D $MX_CACHE_DIR/jvmci/*hsdis*.so $out/jre/lib/amd64/hsdis-amd64.so ''; dontFixup = true; # do not nuke path of ffmpeg etc dontStrip = true; # why? see in oraclejdk derivation @@ -129,7 +146,7 @@ in rec { }; graalvm8 = stdenv.mkDerivation rec { - version = "1.0.0-rc1"; + version = "1.0.0-rc3"; name = let n = "graal-${version}"; in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then @@ -140,7 +157,7 @@ in rec { owner = "oracle"; repo = "graal"; rev = "vm-${version}"; - sha256 = "1j1m53d8x0mkvqr9lwlkjddfha5jrsq9hxlblbjv1bqcivfmmfn7"; + sha256 = "1hcs4m6ailapgi3bikav1i517vqn5pn595cyqqjfvlnkjwihbnc3"; }; buildInputs = [ mx zlib mercurial jvmci8 ]; postUnpack = '' @@ -161,20 +178,42 @@ in rec { export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild export MX_CACHE_DIR=${makeMxCache graal-mxcache} - ( cd substratevm; mx --java-home $out build --no-daemon ) + ( cd substratevm + + mkdir -p clibraries + mx --java-home $out build + + # bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4) + mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/svm-driver.jar com.oracle.svm.driver.NativeImage + ) + ( cd tools + mx --java-home $out build + ) ''; installPhase = '' - # add graal files - mkdir -p $out/jre/tools/{profiler,chromeinspector} - cp -pR substratevm/svmbuild/native-image-root/linux-amd64/bin/* $out/jre/bin/ - cp -pLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks - cp -pLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ - cp -pR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/ - cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ - cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ - echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties - ln -s --relative $out/jre/bin/native-image $out/bin/native-image - cp -dpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ + # add graal files modelling after directory structure of "graalvm-ce" binary distribution + mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include} + cp -vpLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/* $out/jre/lib/amd64/ + cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-*processor*.jar $out/jre/lib/graal/ + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/ + cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-management.jar $out/jre/lib/jvmci/ + cp -vdpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ + cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/ + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/ + cp -vpLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ + cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ + cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ + cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/* $out/jre/tools/truffle/ + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/truffle-nfi.jar $out/jre/tools/truffle/builder/ + + echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties + echo -n "graal" > $out/jre/lib/jvmci/compiler-name + echo -n "../truffle/truffle-api.jar:../truffle/truffle-nfi.jar" > $out/jre/lib/jvmci/parentClassLoader.classpath + + install -v -m0555 -D substratevm/com.oracle.svm.driver.nativeimage $out/jre/lib/svm/bin/native-image + ln -s ../lib/svm/bin/native-image $out/jre/bin/native-image + ln -s ../jre/bin/native-image $out/bin/native-image # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html substituteInPlace $out/jre/lib/security/java.security \ diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/mint/crystal2nix.cr index f2ef5dafdbc3..9b84b20d03a3 100644 --- a/pkgs/development/compilers/mint/crystal2nix.cr +++ b/pkgs/development/compilers/mint/crystal2nix.cr @@ -5,16 +5,23 @@ class PrefetchJSON JSON.mapping(sha256: String) end +class ShardLock + YAML.mapping( + version: String, + shards: Hash(String, Hash(String, String)) + ) +end + File.open "shards.nix", "w+" do |file| file.puts %({) - yaml = YAML.parse(File.read("shard.lock")) - yaml["shards"].as_h.each do |key, value| - owner, repo = value["github"].as_s.split("/") + yaml = ShardLock.from_yaml(File.read("shard.lock")) + yaml.shards.each do |key, value| + owner, repo = value["github"].split("/") url = "https://github.com/#{value["github"]}" rev = if value["version"]? "v#{value["version"]}" else - value["commit"].as_s + value["commit"] end sha256 = "" diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 40527e879215..0e558e766f77 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -28,21 +28,19 @@ let }; in stdenv.mkDerivation rec { - version = "0.0.4"; + version = "0.1.0"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = "0.0.4"; - sha256 = "04zq6qqh2dbqgnywsy6qfpimsr2zg19gs3xls1bphbaygnb2yi3l"; + rev = "0.1.0"; + sha256 = "0n9lnkm2k8lv3wcw0jc7bcpgvcjyp3a8cywn0w7ipb22q8cl0n96"; }; buildInputs = [ crystal zlib openssl duktape ]; buildPhase = '' - mkdir -p $out/bin - - mkdir tmp + mkdir -p $out/bin tmp cd tmp ln -s ${crystalLib} lib cp -r $src/* . diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 7882fa49b07e..2c76d59512b6 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath , minimal ? false @@ -36,7 +36,7 @@ let buildInputs = [ cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor lndir fontconfig + libXi libXinerama libXcursor libXrandr lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 9db5e8ba23c9..57771e383279 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath , minimal ? false @@ -70,7 +70,7 @@ let buildInputs = [ cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor lndir fontconfig + libXi libXinerama libXcursor libXrandr lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ gtk2 gnome_vfs GConf glib ]; diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 2760d6ad5d03..a6abe6791d7e 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, -bison, flex, mesa_glu, pythonPackages +bison, flex, libGLU, pythonPackages }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4"; }; - buildInputs = [ cmake mesa_glu libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; + buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; meta = with stdenv.lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = https://www.disneyanimation.com/technology/seexpr.html; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 1867d9605661..ec5491622bb4 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -14,6 +14,12 @@ let param = sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h"; }; + "8.8" = { + version = "1.0"; + rev = "v1.0-8.8"; + sha256 = "129rxsdsf88vjcw0xhm74yax1hmnk6f8n9ksg0hcyyjq1ijddiwa"; + }; + }."${coq.coq-version}" ; in diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 7f0703c62884..5a4893db0637 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { Libs: -L$out/lib -llua -lm Cflags: -I$out/include EOF + ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc" ''; meta = { diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index abf251f97f97..c61e960e051d 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "8.500.1"; + version = "8.600.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0bm1g93yr79i74382pq1almakpyf42yipiqkqy742jyzwbxhxr5c"; + sha256 = "0h3bj93s7pr7nfwgjx6c49hgf6jlp5ninp921a8krhkzx4swf02z"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index f33ee8623580..c11d6689624d 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops, enableLargeConfig ? false +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 , buildPlatform, hostPlatform }: diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index b784088dc652..838693ba12d0 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { Where you had a simple non-structrured string in syslog() you have a combination of description and tag/value pairs. ''; - homepage = http://www.balabit.com/support/community/products/; + homepage = https://www.balabit.com/support/community/products/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 9f704dc6a089..9a7acc287cc4 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.99.1"; + version = "0.99.2"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "0f0mfmnc531pifrpkp1qv20wvbvi4la41rwyb3m8lnh1q5bmrch0"; + sha256 = "1cc82nxd290m4ljkd1phllwb3hkhz41h4ncfdrmhbg3gk47zgpyw"; }; patches = [ diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 9113b6716649..c8ce99dc90dd 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.26.1"; + version = "1.27.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "1v1apx9421m8zkjmych5yr66mvqjrrygc98bvyl4miasmsb4ndfs"; + sha256 = "1vx6bx9jhz5vdh2vx5y532ihwgyylagqz6pbx2p2bsx4kmj4pxdd"; }; preConfigure = '' diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix new file mode 100644 index 000000000000..b97f62dcf25c --- /dev/null +++ b/pkgs/development/libraries/iksemel/default.nix @@ -0,0 +1,25 @@ +{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: + +stdenv.mkDerivation rec { + name = "iksemel-${version}"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "timothytylee"; + repo = "iksemel-1.4"; + rev = "v${version}"; + sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ]; + buildInputs = [ gnutls ]; + + meta = with stdenv.lib; { + description = "XML parser for jabber"; + + homepage = https://github.com/timothytylee/iksemel-1.4; + license = licenses.gpl2; + maintainers = with maintainers; [ disassembler ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 67552181d9a6..7f4eaa5fd14b 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.28.2"; + version = "3.28.3"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kfxnyqjwb1r8d4bpr59j1cikd94m6nxf1641hlg7dqlpl9rwlan"; + sha256 = "0q8apibs99yvrwdxlknq4nayss88wsj0rp5fv2x4hh0bgfw8i7w7"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ]; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 0c7c02f80d47..d9a77f4bb8ba 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux }: let @@ -23,6 +23,14 @@ in stdenv.mkDerivation rec { json_c kmod systemd utillinux ]; + patches = [ + (fetchpatch { + name = "add-missing-include-for-ssize_t.patch"; + url = "https://github.com/pmem/ndctl/commit/8f1798d14dda367c659b87362edb312739830ddf.patch"; + sha256 = "1jr5kh087938msl22hgjngbf025n9iplz0czmybfp7lavl73m0pm"; + }) + ]; + preAutoreconf = '' substituteInPlace configure.ac --replace "which" "${which}/bin/which" substituteInPlace git-version --replace /bin/bash ${stdenv.shell} diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 2955aaebc010..96bd983e64cd 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libnfs-${version}"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; rev = "libnfs-${version}"; - sha256 = "1xd1xb09jxwmx7hblv0f9gxv7i1glk3nbj2vyq50zpi158lnf2mb"; + sha256 = "115p55y2cbs92z5lmcnjx1v29lwinpgq4sha9v1kq1vd8674h404"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index fae6dc82fcf6..c2f0da910055 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: +{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: -stdenv.mkDerivation rec -{ - version = "3.0.7"; - seafileVersion = "6.1.0"; +stdenv.mkDerivation rec { + version = "3.0.8"; name = "libsearpc-${version}"; - src = fetchurl - { - url = "https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"; - sha256 = "0fdrgksdwd4qxp7qvh75y39dy52h2f5wfjbqr00h3rwkbx4npvpg"; + src = fetchFromGitHub { + owner = "haiwen"; + repo = "libsearpc"; + # Tag is missing: https://github.com/haiwen/libsearpc/commit/12a01268825e9c7e17794c58c367e3b4db912ad9 + rev = "12a01268825e9c7e17794c58c367e3b4db912ad9"; + sha256 = "00ck1hl1x0pn22q3ba32dq3ckc4nrsg58irsmrnmalqbsffhcim0"; }; patches = [ ./libsearpc.pc.patch ]; @@ -18,12 +18,13 @@ stdenv.mkDerivation rec buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; propagatedBuildInputs = [ glib jansson ]; + postPatch = "patchShebangs autogen.sh"; + preConfigure = "./autogen.sh"; buildPhase = "make -j1"; - meta = - { + meta = { homepage = https://github.com/haiwen/libsearpc; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 150da3d45997..7178e64b6b6a 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://pyyaml.org/; + homepage = https://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch index 119c8b61da36..e9b501c29e26 100644 --- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -1,15 +1,31 @@ -diff -ru -x '*~' LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm ---- LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm 2013-04-29 23:16:18.000000000 +0200 -+++ LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm 2016-03-02 14:59:01.639844511 +0100 -@@ -24,6 +24,11 @@ +From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001 +From: Tyson Whitehead <twhitehead@gmail.com> +Date: Fri, 29 Jun 2018 15:47:00 -0400 +Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order) + +--- + lib/LWP/Protocol/https.pm | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm +index f7230e2..c78b9ce 100644 +--- a/lib/LWP/Protocol/https.pm ++++ b/lib/LWP/Protocol/https.pm +@@ -23,6 +23,14 @@ sub _extra_sock_opts + $ssl_opts{SSL_verify_mode} = 0; } if ($ssl_opts{SSL_verify_mode}) { - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}; ++ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { ++ $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'} ++ if !defined $ssl_opts{SSL_ca_file}; ++ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'} ++ if !defined $ssl_opts{SSL_ca_file}; + $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt" + if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt"; + } -+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { eval { require Mozilla::CA; - }; +-- +2.14.0 + diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index e6269503a4c4..b995e0e2540a 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, callPackage, callPackage_i686, makeWrapper, ...} @pkgs: +{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs: let - i686 = callPackage_i686 ./vms.nix {}; + i686 = pkgsi686Linux.callPackage ./vms.nix {}; native = callPackage ./vms.nix {}; in @@ -11,5 +11,3 @@ rec { spur64 = if stdenv.is64bit then native.spur else "none"; multi-vm-wrapper = callPackage ../wrapper { inherit cog32 spur32 spur64; }; } - - diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 57a34268df86..b0992141faa0 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -1,26 +1,37 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, - discid, six, parsedatetime, isodate, Babel, pytimeparse, - leather, python-slugify }: +{ lib, fetchFromGitHub, buildPythonPackage, isPy3k +, six, pytimeparse, parsedatetime, Babel +, isodate, python-slugify, leather +, glibcLocales, nose, lxml, cssselect, unittest2 }: buildPythonPackage rec { - pname = "agate"; - version = "1.6.1"; + pname = "agate"; + version = "1.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3"; - }; + # PyPI tarball does not include all test files + # https://github.com/wireservice/agate/pull/716 + src = fetchFromGitHub { + owner = "wireservice"; + repo = pname; + rev = version; + sha256 = "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl"; + }; - propagatedBuildInputs = [ discid six parsedatetime - isodate Babel pytimeparse leather python-slugify ]; + propagatedBuildInputs = [ + six pytimeparse parsedatetime Babel + isodate python-slugify leather + ]; - doCheck = !isPy3k; - # (only) on python3 unittest loader (loadTestsFromModule) fails + checkInputs = [ glibcLocales nose lxml cssselect ] + ++ lib.optional (!isPy3k) unittest2; - meta = with stdenv.lib; { - description = "A Python data analysis library that is optimized for humans instead of machines"; - homepage = https://github.com/wireservice/agate; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; - }; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests tests + ''; + + meta = with lib; { + description = "A Python data analysis library that is optimized for humans instead of machines"; + homepage = https://github.com/wireservice/agate; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + }; } diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 3fcf0973e7ad..7becf1cffc41 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "0.9.9"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "85bd3ea7633024e4930900bc64fb58f9742dedbc6ebb6ecf25be2ea9a3c1b32e"; + sha256 = "1cd32df9a3b8c1749082ef60ffbe05ff16617b6afadfdabc680dcb9344af33d7"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix new file mode 100644 index 000000000000..2d193616e5f6 --- /dev/null +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, python +, pygobject3 +, pyatspi +, pycairo +, at-spi2-core +, gobjectIntrospection +, gtk3 +, gsettings-desktop-schemas +, fetchurl +, dbus +, xvfb_run +# , fetchPypi +}: + +buildPythonPackage rec { + pname = "dogtail"; + version = "0.9.10"; + + # https://gitlab.com/dogtail/dogtail/issues/1 + # src = fetchPypi { + # inherit pname version; + # sha256 = "0p5wfssvzr9w0bvhllzbbd8fnp4cca2qxcpcsc33dchrmh5n552x"; + # }; + src = fetchurl { + url = https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz; + sha256 = "14sycidl8ahj3fwlhpwlpnyd43c302yqr7nqg2hj39pyj7kgk15b"; + }; + + patches = [ + ./nix-support.patch + ]; + + nativeBuildInputs = [ gobjectIntrospection dbus xvfb_run ]; # for setup hooks + propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; + + checkPhase = '' + runHook preCheck + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS + # export NO_AT_BRIDGE=1 + gsettings set org.gnome.desktop.interface toolkit-accessibility true + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + ${python.interpreter} nix_run_setup test + runHook postCheck + ''; + + # TODO: Tests require accessibility + doCheck = false; + + meta = { + description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications"; + homepage = https://gitlab.com/dogtail/dogtail; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/dogtail/nix-support.patch b/pkgs/development/python-modules/dogtail/nix-support.patch new file mode 100644 index 000000000000..e8a65bbc87be --- /dev/null +++ b/pkgs/development/python-modules/dogtail/nix-support.patch @@ -0,0 +1,35 @@ +--- a/dogtail/distro.py ++++ b/dogtail/distro.py +@@ -233,6 +233,11 @@ + PackageDb.__init__(self) + + ++class _NixPackageDb(PackageDb): # pragma: no cover ++ def __init__(self): ++ PackageDb.__init__(self) ++ ++ + class JhBuildPackageDb(PackageDb): # pragma: no cover + def __init__(self): + PackageDb.__init__(self) +@@ -324,6 +329,11 @@ + self.packageDb = _SolarisPackageDb() + + ++class Nix(Distro): # pragma: no cover ++ def __init__(self): ++ self.packageDb = _NixPackageDb() ++ ++ + class JHBuild(Distro): # pragma: no cover + def __init__(self): + self.packageDb = JhBuildPackageDb() +@@ -358,6 +368,8 @@ + elif os.path.exists("/etc/release") and \ + re.match(".*Solaris", open("/etc/release").readline()): # pragma: no cover + distro = Solaris() # pragma: no cover ++ elif os.path.exists("/nix/store"): # pragma: no cover ++ distro = Nix() # pragma: no cover + elif os.path.exists("/etc/os-release") and \ + re.match(".*GNOME-Continuous", open("/etc/os-release").readline()): # pragma: no cover + distro = GnomeContinuous() # pragma: no cover diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index a57823a09872..41735c4d1c6e 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k , nose, mock, blinker , flask, six, pytz, aniso8601, pycrypto }: @@ -12,19 +12,27 @@ buildPythonPackage rec { sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap"; }; -# TypeError: Only byte strings can be passed to C code - patchPhase = if isPy3k then '' + patches = [ + (fetchpatch { + url = https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch; + sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5"; + }) + (fetchpatch { + url = https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch; + sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl"; + }) + ]; + + postPatch = lib.optionalString isPy3k '' + # TypeError: Only byte strings can be passed to C code rm tests/test_crypto.py tests/test_paging.py - '' else null; -# Disable test broken with aniso > 3.0.0, can be removed when updating to a flask-restful version with commit 54979f0 - preCheck = '' - substituteInPlace "./tests/test_inputs.py" --replace "test_bad_isointervals" "disabled_bad_isointervals" ''; - buildInputs = [ nose mock blinker ]; + + checkInputs = [ nose mock blinker ]; + propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://flask-restful.readthedocs.io/"; description = "REST API building blocks for Flask"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 34ec95b866f5..19c4baca8b29 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -2,26 +2,22 @@ , buildPythonPackage , fetchPypi , requests -, tox, pytest, flake8, responses +, pytest, pytestrunner, responses }: buildPythonPackage rec { - pname = "matrix-client"; - version = "0.2.0"; + pname = "matrix_client"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "b96e87adf1bc2270166b2a4cff1320d2ef283779ea8b3c4edd0d9051fc7b7924"; + sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; }; - checkInputs = [ tox pytest flake8 responses ]; + checkInputs = [ pytest pytestrunner responses ]; propagatedBuildInputs = [ requests ]; - checkPhase = '' - pytest - ''; - meta = with stdenv.lib; { description = "Matrix Client-Server SDK"; homepage = https://github.com/matrix-org/matrix-python-sdk; diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 0c754fcfe3bc..2f9a82238325 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.16.1"; - source.sha256 = "42b8e0f57093e1d10c15542f956a871446b759e7969d99f91caf3b6731c156e8"; + version = "1.16.2"; + source.sha256 = "3bb53e03db0a8008161eb4c816ccd317120d3c415ba6fee6f90bbc7f7eec8690"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 7ba4bbf25d12..07f3053b9d43 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,16 +4,23 @@ with lib; stdenv.mkDerivation rec { - version = "0.72.0"; + version = "0.75.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1lfnl1crwkygzbv3l85n30dqsfz627xrnmn4z3zxh7lazir5h8b8"; + sha256 = "0xrcjjk16w6anpy58qa4la1jyfjs0xg5xkp58slhai996wqif24k"; }; + # lwt.log is being split out into a separate package, so this can be + # removed once nixpkgs is updated. + # See https://github.com/ocsigen/lwt/issues/453#issuecomment-352897664 + postPatch = '' + substituteInPlace Makefile --replace lwt_log lwt.log + ''; + installPhase = '' mkdir -p $out/bin cp bin/flow $out/bin/ diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 12152e988669..f4f7af0e084a 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gauge-${version}"; - version = "0.9.7"; + version = "1.0.0"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "09afsi97yxlqwmrxvihravqvz17m7y402gbw4hvdk0iixa6jpq6a"; + sha256 = "1dnlqnpzqsikpxy2mndrmxpcsj4r1zcjmv8px1idzblp117vsnw1"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 73c9021c5e9f..17aa3214ebcc 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; - homepage = http://www.jirka.org/gob.html; + homepage = https://www.jirka.org/gob.html; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index fcde5b5ea59f..f4590081898a 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; - homepage = http://www.scummvm.org/; + homepage = https://www.scummvm.org/; license = licenses.gpl2; maintainers = [ maintainers.peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 351a64abd331..1c0b8e13ab0b 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, callPackage_i686 }: +{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux }: let - i686_NIX_GCC = callPackage_i686 ({gcc}: gcc) {}; - i686_libxml2 = callPackage_i686 ({libxml2}: libxml2) {}; - i686_glibc = callPackage_i686 ({glibc}: glibc) {}; + i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {}; + i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {}; + i686_glibc = pkgsi686Linux.callPackage ({glibc}: glibc) {}; src_canon = fetchurl { url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index d2305aa37ba6..156db148435e 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,11 +1,11 @@ -{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686, +{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, wineRelease ? "stable", supportFlags }: let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); in with src; { - wine32 = callPackage_i686 ./base.nix { + wine32 = pkgsi686Linux.callPackage ./base.nix { name = "wine-${version}"; inherit src version supportFlags; pkgArches = [ pkgsi686Linux ]; @@ -33,4 +33,3 @@ in with src; { platforms = [ "x86_64-linux" ]; }; } - diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 813000492039..fe9e8d3f4b00 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec{ - version="1.27"; + version="1.28"; name = "mxt-app-${version}"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "0m1qxsdkwgajyd0sdw909l4w31csa26nw0xzr9ldddnvzb1va05h"; + sha256 = "1z2mir4ib9xzxmy0daazzvlga41n80zch1xyp1iz98rrdsnvd1la"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec{ homepage = https://github.com/atmel-maxtouch/mxt-app; license = licenses.bsd2; maintainers = [ maintainers.colemickens ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index f1ab822c6f4a..c47b3c322ca5 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: +{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.1.0"; + version = "6.2.1"; name = "seafile-shared-${version}"; - src = fetchurl { - url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seafile"; + rev = "v${version}"; + sha256 = "199ivh6fbz4sgbz15mr6m8985yky5n3z6vpcpnh2ldjx4277gq68"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; @@ -18,13 +20,6 @@ stdenv.mkDerivation rec { "--disable-console" ]; - postInstall = '' - # Remove seafile binary - rm -rf "$out/bin/seafile" - # Remove cli client binary - rm -rf "$out/bin/seaf-cli" - ''; - meta = with stdenv.lib; { homepage = https://github.com/haiwen/seafile; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 478040132b82..5dc52c766f18 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,7 +3,7 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gcc -, forceSystem, newScope, platform, config +, pkgsi686Linux, newScope, platform, config , targetPlatform, buildPlatform , overrides ? {} , buildPackages, pkgs @@ -90,7 +90,7 @@ let mig = callPackage ./mig { # Build natively, but force use of a 32-bit environment because we're # targeting `i586-pc-gnu'. - stdenv = (forceSystem "i686-linux" "i386").stdenv; + stdenv = pkgsi686Linux.stdenv; }; # XXX: Use this one for its `.crossDrv'. Using the one above from diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 0fe0f3d92c92..b5435f23e71b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -12,7 +12,7 @@ , patches ? [] }: -{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch +{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch , kernel ? null, xorg, zlib, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -70,7 +70,7 @@ let disallowedReferences = optional (!libsOnly) [ kernel.dev ]; passthru = { - settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) { + settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { withGtk2 = preferGtk2; withGtk3 = !preferGtk2; }; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix new file mode 100644 index 000000000000..a334465fb71d --- /dev/null +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: + +stdenv.mkDerivation rec { + name = "pscircle-${version}"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "mildlyparallel"; + repo = "pscircle"; + rev = "v${version}"; + sha256 = "188d0db62215pycmx2qfmbbjpmih03vigsz2j448zhsbyxapavv3"; + }; + + buildInputs = [ + meson + pkgconfig + cairo + ninja + ]; + + meta = with stdenv.lib; { + homepage = https://gitlab.com/mildlyparallel/pscircle; + description = "Visualize Linux processes in a form of a radial tree"; + license = licenses.gpl2; + maintainers = [ maintainers.ldesgoui ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index fd9c48f3469e..31cff39cb3e6 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, +{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, majorVersion ? "1.0" }: let @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ jre makeWrapper bash ]; + buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ]; installPhase = '' mkdir -p $out @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { wrapProgram $p \ --set JAVA_HOME "${jre}" \ --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ - --prefix PATH : "${bash}/bin" + --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin" done chmod +x $out/bin\/* ''; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index d9c7877978b2..b1d60d8c1456 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -2,7 +2,7 @@ jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, - srtp, wget, curl + srtp, wget, curl, iksemel }: let @@ -10,7 +10,7 @@ let inherit version; name = "asterisk-${version}"; - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl ]; + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ]; patches = [ # We want the Makefile to install the default /var skeleton diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 1466e7b2246a..448695930039 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat , gd, geoip +, withDebug ? false , withStream ? true , withMail ? false , modules ? [] @@ -44,6 +45,8 @@ stdenv.mkDerivation { "--with-pcre-jit" # Install destination problems # "--with-http_perl_module" + ] ++ optional withDebug [ + "--with-debug" ] ++ optional withStream [ "--with-stream" "--with-stream_geoip_module" @@ -64,6 +67,8 @@ stdenv.mkDerivation { hardeningEnable = optional (!stdenv.isDarwin) "pie"; + enableParallelBuilding = true; + postInstall = '' mv $out/sbin $out/bin ''; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index c80bbbcfde91..07ebf97ab2bf 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" - wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" + wrapProgram $out/bin/elasticsearch-plugin \ + --prefix ES_CLASSPATH : "$out/lib/*" \ + --set JAVA_HOME "${jre_headless}" ''; meta = { diff --git a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch index 6898ffcf1d79..ccdca1e53afc 100644 --- a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch +++ b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch @@ -32,3 +32,12 @@ diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh -fi - -ES_CLASSPATH="$ES_HOME/lib/*" +diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin +--- a/bin/elasticsearch-plugin 2018-04-13 01:21:55.000000000 +0900 ++++ b/bin/elasticsearch-plugin 2018-06-28 19:08:54.700969245 +0900 +@@ -88,4 +88,4 @@ if [ -e "$CONF_DIR" ]; then + path_props=("${path_props[@]}" -Des.path.conf="$CONF_DIR") + fi + +-exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginCli "${args[@]}" ++exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_CLASSPATH" org.elasticsearch.plugins.PluginCli "${args[@]}" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5e228ccba369..1c4201c0082a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1424,11 +1424,11 @@ let }) // {inherit libX11 libXau libXext libXmu xproto ;}; xbacklight = (mkDerivation "xbacklight" { - name = "xbacklight-1.2.1"; + name = "xbacklight-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2; - sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp"; + url = mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2; + sha256 = "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb xcbutil ]; diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix new file mode 100644 index 000000000000..7ece3acbd679 --- /dev/null +++ b/pkgs/tools/admin/adtool/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, openldap }: + +stdenv.mkDerivation rec { + name = "adtool-${version}"; + version = "1.3.3"; + + src = fetchurl { + url = "https://gp2x.org/adtool/${name}.tar.gz"; + sha256 = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n"; + }; + + configureFlags = [ + "--sysconfdir=/etc" + ]; + + installFlags = [ + "sysconfdir=$(out)/etc" + ]; + + buildInputs = [ openldap ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/share/doc/adtool + mv $out/etc/* $out/share/doc/adtool + rmdir $out/etc + ''; + + # It requires an LDAP server for tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Active Directory administration utility for Unix"; + homepage = https://gp2x.org/adtool; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/filesystems/gocrypfs/default.nix b/pkgs/tools/filesystems/gocrypfs/default.nix deleted file mode 100644 index b9314015cf55..000000000000 --- a/pkgs/tools/filesystems/gocrypfs/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -# This file was generated by go2nix. -{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgconfig, openssl }: - -with lib; - -let - goFuseVersion = substring 0 7 (head (filter ( - d: d.goPackagePath == "github.com/hanwen/go-fuse" - ) (import ./deps.nix))).fetch.rev; -in buildGoPackage rec { - name = "gocryptfs-${version}"; - version = "1.1.1"; - rev = "v${version}"; - - goPackagePath = "github.com/rfjakob/gocryptfs"; - - src = fetchFromGitHub { - inherit rev; - owner = "rfjakob"; - repo = "gocryptfs"; - sha256 = "0p173x2s0km7a43h6ihir5p19fdlkkb9lc9120k9hccr33iws25z"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl]; - - goDeps = ./deps.nix; - - postPatch = "rm -r tests"; - - buildFlagsArray = '' - -ldflags= - -X main.GitVersion=${rev} - -X main.GitVersionFuse=${goFuseVersion} - ''; - - meta = { - description = "Encrypted overlay filesystem written in Go"; - license = licenses.mit; - homepage = https://nuetzlich.net/gocryptfs/; - maintainers = with maintainers; [offline]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/tools/filesystems/gocrypfs/deps.nix b/pkgs/tools/filesystems/gocrypfs/deps.nix deleted file mode 100644 index 08a4afb52653..000000000000 --- a/pkgs/tools/filesystems/gocrypfs/deps.nix +++ /dev/null @@ -1,39 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "6c2b7d8f22c99776f8bfe17cd26d5f744a5b4cdc"; - sha256 = "1mb73vyqfy92830qif83zdlng0zycmm5fgmm9bwihqh92y8inw3h"; - }; - } - { - goPackagePath = "github.com/jacobsa/crypto"; - fetch = { - type = "git"; - url = "https://github.com/jacobsa/crypto"; - rev = "293ce0c192fb4f59cd879b46544922b9ed09a13a"; - sha256 = "12nm5h5dqqk8yrzlkmcqm0aam8l6l1s6rah48mrmz1z5bgm9h5rs"; - }; - } - { - goPackagePath = "github.com/rfjakob/eme"; - fetch = { - type = "git"; - url = "https://github.com/rfjakob/eme"; - rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255"; - sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; - sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; - }; - } -] diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix new file mode 100644 index 000000000000..75f5e9ffe11f --- /dev/null +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -0,0 +1,50 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: + +let + version = "v1.5"; + goFuseVersion = with stdenv.lib; substring 0 7 (head (filter ( + d: d.goPackagePath == "github.com/hanwen/go-fuse" + ) (import ./deps.nix))).fetch.rev; +in +buildGoPackage rec { + name = "gocryptfs-${version}"; + + goPackagePath = "github.com/rfjakob/gocryptfs"; + + nativeBuildInputs = [ pandoc pkgconfig ]; + buildInputs = [ openssl ]; + + src = fetchFromGitHub { + owner = "rfjakob"; + repo = "gocryptfs"; + rev = version; + sha256 = "0s5smjc7n9088n8a2mv7cy3cx31ci13i1i8fhg1vslc17a15qs2d"; + }; + + postPatch = "rm -r tests"; + + buildFlagsArray = '' + -ldflags= + -X main.GitVersion=${version} + -X main.GitVersionFuse=${goFuseVersion} + ''; + + goDeps = ./deps.nix; + + postBuild = '' + pushd go/src/github.com/rfjakob/gocryptfs/Documentation/ + mkdir -p $out/share/man/man1 + pandoc MANPAGE.md -s -t man -o $out/share/man/man1/gocryptfs.1 + pandoc MANPAGE-XRAY.md -s -t man -o $out/share/man/man1/gocryptfs-xray.1 + popd + ''; + + meta = with stdenv.lib; { + description = "Encrypted overlay filesystem written in Go"; + license = licenses.mit; + homepage = https://nuetzlich.net/gocryptfs/; + maintainers = with maintainers; [ flokli offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix new file mode 100644 index 000000000000..cb5aec527f24 --- /dev/null +++ b/pkgs/tools/filesystems/gocryptfs/deps.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "291273cb8ce0f139636a6fd7414be3c7e2de6288"; + sha256 = "1djfl6mni8k4wllhwcr6qwyg1nh6wykdalvdl6gpc1rwrjj9c6xi"; + }; + } + { + goPackagePath = "github.com/jacobsa/crypto"; + fetch = { + type = "git"; + url = "https://github.com/jacobsa/crypto"; + rev = "c73681c634de898c869684602cf0c0d2ce938c4d"; + sha256 = "02jbiy6szshbzcmp4j3gpc577hrhikxqvm4kzxixp27k9f2cx5si"; + }; + } + { + goPackagePath = "github.com/pkg/xattr"; + fetch = { + type = "git"; + url = "https://github.com/pkg/xattr"; + rev = "d15dbc2bb0b5da267362b5e066e2c44c1fcff6c7"; + sha256 = "1vab8mpk2x4vbhx0kd0i0kn6sf7z5ivilcmdklyizzcfcwghh17g"; + }; + } + { + goPackagePath = "github.com/rfjakob/eme"; + fetch = { + type = "git"; + url = "https://github.com/rfjakob/eme"; + rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"; + sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "151529c776cdc58ddbe7963ba9af779f3577b419"; + sha256 = "149yfzs4k8vxhjr8f832drndir2k5ha0ggs2dw2fd6xvxf698bcx"; + }; + } +] diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index e4b31f06b6e4..56091a89e48b 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, -eigen3_3, libpng, python, mesa_glu, qt4, openexr, openimageio, +eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio, opencolorio, xercesc, ilmbase, osl, seexpr }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ cmake pkgconfig boost_static guile eigen3_3 libpng python - mesa_glu qt4 openexr openimageio opencolorio xercesc + libGLU qt4 openexr openimageio opencolorio xercesc osl seexpr ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 387c8c0595e7..08d5ff851407 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, mesa_glu, gnome3, pcre +, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre , bison, flex, libpthreadstubs, libX11 , embree2, makeWrapper, gsettings_desktop_schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { buildInputs = [ embree2 pkgconfig cmake zlib boost_static libjpeg libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc mesa_glu pcre bison + tbb qt5.full c-blosc libGLU pcre bison flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 92a7d69aa915..c1e6c2afecce 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, unzip, mesa_glu, makeWrapper }: +{ stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; - buildInputs = [ qt4 unzip mesa_glu makeWrapper ]; + buildInputs = [ qt4 unzip libGLU makeWrapper ]; nativeBuildInputs = [ qmake4Hook ]; # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 4e4f5a5db4a6..778a12341540 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix new file mode 100644 index 000000000000..055fa9418a9a --- /dev/null +++ b/pkgs/tools/misc/sixpair/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, libusb }: +stdenv.mkDerivation { + name = "sixpair-2007-04-18"; + + src = fetchurl { + url = http://www.pabr.org/sixlinux/sixpair.c; + sha256 = "1b0a3k7gs544cbji7n29jxlrsscwfx6s1r2sgwdl6hmkc1l9gagr"; + }; + + # hcitool is depricated + patches = [ ./hcitool.patch ]; + + buildInputs = [ libusb ]; + + unpackPhase = '' + cp $src sixpair.c + ''; + + buildPhase = '' + cc -o sixpair sixpair.c -lusb + ''; + + installPhase = '' + mkdir -p $out/bin + cp sixpair $out/bin/sixpair + ''; + + meta = { + description = "Pair with SIXAXIS controllers over USB"; + longDescription = '' + This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. + ''; + homepage = http://www.pabr.org/sixlinux/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.tomsmeets ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/sixpair/hcitool.patch b/pkgs/tools/misc/sixpair/hcitool.patch new file mode 100644 index 000000000000..b66e791dd0e0 --- /dev/null +++ b/pkgs/tools/misc/sixpair/hcitool.patch @@ -0,0 +1,19 @@ +diff --git a/sixpair.c b/sixpair.c +index b009a6f..78b7ef0 100644 +--- a/sixpair.c ++++ b/sixpair.c +@@ -76,11 +76,11 @@ void process_device(int argc, char **argv, struct usb_device *dev, + exit(1); + } + } else { +- FILE *f = popen("hcitool dev", "r"); ++ FILE *f = popen("bluetoothctl list", "r"); + if ( !f || +- fscanf(f, "%*s\n%*s %x:%x:%x:%x:%x:%x", ++ fscanf(f, "%*s %x:%x:%x:%x:%x:%x", + &mac[0],&mac[1],&mac[2],&mac[3],&mac[4],&mac[5]) != 6 ) { +- printf("Unable to retrieve local bd_addr from `hcitool dev`.\n"); ++ printf("Unable to retrieve local bd_addr from `bluetoothctl list`.\n"); + printf("Please enable Bluetooth or specify an address manually.\n"); + exit(1); + } diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 90a17bdff704..9d12fa254d47 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify -, gobjectIntrospection, libgnome-keyring3 +, gobjectIntrospection, libsecret , cups-filters , pythonPackages , withGUI ? true @@ -9,32 +9,36 @@ stdenv.mkDerivation rec { name = "system-config-printer-${version}"; - version = "1.5.9"; + version = "1.5.11"; src = fetchurl { - url = "https://github.com/zdohnal/system-config-printer/releases/download/v${version}/${name}.tar.gz"; - sha256 = "03bwlpsiqpxzcwd78a7rmwiww4jnqd7kl7il4kx78l1r57lasd2r"; + url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz"; + sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q"; }; patches = [ ./detect_serverbindir.patch ]; - buildInputs = - [ intltool pkgconfig glib udev libusb1 cups xmlto - libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils - pythonPackages.python pythonPackages.wrapPython - libnotify gobjectIntrospection gdk_pixbuf pango atk - libgnome-keyring3 - ]; + buildInputs = [ + glib udev libusb1 cups + pythonPackages.python + libnotify gobjectIntrospection gdk_pixbuf pango atk + libsecret + ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ + intltool pkgconfig + xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils + pythonPackages.wrapPython + wrapGAppsHook + ]; pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; - configureFlags = - [ "--with-udev-rules" - "--with-udevdir=$(out)/etc/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ]; + configureFlags = [ + "--with-udev-rules" + "--with-udevdir=$(out)/etc/udev" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; stripDebugList = [ "bin" "lib" "etc/udev" ]; diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix new file mode 100644 index 000000000000..65b1f71194ac --- /dev/null +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -0,0 +1,27 @@ +{ lib, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "termtosvg"; + version = "0.3.0"; + + # tests are not available when fetching from pypi + src = fetchFromGitHub { + owner = "nbedos"; + repo = pname; + rev = version; + sha256 = "09hw0467pyfj5gwn3768b3rvs5ch3wb1kaax7zsqjd7mw2qh0cjw"; + }; + + propagatedBuildInputs = with python3.pkgs; [ svgwrite pyte ]; + + checkInputs = [ python3.pkgs.mock ]; + preCheck = "export HOME=$(mktemp -d)"; + postCheck = "unset HOME"; + + meta = with lib; { + homepage = https://github.com/nbedos/termtosvg; + description = "Record terminal sessions as SVG animations"; + license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix new file mode 100644 index 000000000000..23aec604d2d1 --- /dev/null +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, fetchurl, gnulib }: + +stdenv.mkDerivation rec { + name = "gnu-pw-mgr-${version}"; + version = "2.3.2"; + src = fetchurl { + url = "http://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz"; + sha256 = "0x60g0syqpd107l8w4bl213imy2lspm4kz1j18yr1sh10rdxlgxd"; + }; + + buildInputs = [ gnulib ]; + + meta = with lib; { + homepage = https://www.gnu.org/software/gnu-pw-mgr/; + description = "A password manager designed to make it easy to reconstruct difficult passwords"; + license = with licenses; [ gpl3Plus lgpl3Plus ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ qoelet ]; + }; +} diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 4f3795cf54c9..7abf9e85ab88 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = http://www.balabit.com/network-security/syslog-ng/; + homepage = https://www.balabit.com/network-security/syslog-ng/; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ rickynils fpletz ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 6555c999d7f2..32894748ac46 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -4,7 +4,7 @@ , freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext , xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig , poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr -, xpdf, cairo, pixman, xorg, clisp +, xpdf, cairo, pixman, xorg, clisp, biber , makeWrapper }: @@ -261,6 +261,7 @@ dvipng = stdenv.mkDerivation { }; +inherit biber; bibtexu = bibtex8; bibtex8 = stdenv.mkDerivation { name = "texlive-bibtex-x.bin-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fedc3b37623d..a2f78782e6ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2393,7 +2393,7 @@ with pkgs; flamerobin = callPackage ../applications/misc/flamerobin { }; - flashtool = callPackage_i686 ../development/mobile/flashtool { + flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool { platformTools = androidenv.platformTools; }; @@ -2407,7 +2407,7 @@ with pkgs; flvstreamer = callPackage ../tools/networking/flvstreamer { }; - hmetis = callPackage_i686 ../applications/science/math/hmetis { }; + hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { }; libbsd = callPackage ../development/libraries/libbsd { }; @@ -2704,6 +2704,8 @@ with pkgs; # must have AquaTerm installed separately gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; + gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { }; + gnused = callPackage ../tools/text/gnused { }; # This is an easy work-around for [:space:] problems. gnused_422 = callPackage ../tools/text/gnused/422.nix { }; @@ -2714,7 +2716,7 @@ with pkgs; goaccess = callPackage ../tools/misc/goaccess { }; - gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; + gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; godot = callPackage ../development/tools/godot {}; @@ -2803,13 +2805,13 @@ with pkgs; groonga = callPackage ../servers/search/groonga { }; - grub = callPackage_i686 ../tools/misc/grub { + grub = pkgsi686Linux.callPackage ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { }; + trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; - trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; + trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; grub2 = grub2_full; @@ -3289,7 +3291,7 @@ with pkgs; kbdd = callPackage ../applications/window-managers/kbdd { }; - kdbplus = callPackage_i686 ../applications/misc/kdbplus { }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { }; @@ -3408,7 +3410,7 @@ with pkgs; kippo = callPackage ../servers/kippo { }; - kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; + kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; mailcatcher = callPackage ../development/web/mailcatcher { }; @@ -4611,6 +4613,8 @@ with pkgs; ps3netsrv = callPackage ../servers/ps3netsrv { }; + pscircle = callPackage ../os-specific/linux/pscircle { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -5040,6 +5044,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + sixpair = callPackage ../tools/misc/sixpair {}; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; @@ -6179,7 +6185,7 @@ with pkgs; cmdstan = callPackage ../development/compilers/cmdstan { }; - cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; + cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; compcert = callPackage ../development/compilers/compcert { }; @@ -6486,25 +6492,25 @@ with pkgs; gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { version = "4.7-2013q3-20130916"; releaseType = "update"; sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; ncurses = pkgsi686Linux.ncurses5; }; - gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { version = "4.8-2014q1-20140314"; releaseType = "update"; sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; ncurses = pkgsi686Linux.ncurses5; }; - gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { version = "4.9-2015q1-20150306"; releaseType = "update"; sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; ncurses = pkgsi686Linux.ncurses5; }; - gcc-arm-embedded-5 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { dirName = "5.0"; subdirName = "5-2016-q2-update"; version = "5.4-2016q2-20160622"; @@ -6870,7 +6876,7 @@ with pkgs; manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( - callPackage_i686 ../development/compilers/mentor {} + pkgsi686Linux.callPackage ../development/compilers/mentor {} ); mercury = callPackage ../development/compilers/mercury { }; @@ -7057,7 +7063,7 @@ with pkgs; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = if stdenv.isDarwin then callPackage ../development/compilers/smlnj { } - else callPackage_i686 ../development/compilers/smlnj { }; + else pkgsi686Linux.callPackage ../development/compilers/smlnj { }; solc = callPackage ../development/compilers/solc { }; @@ -7568,7 +7574,7 @@ with pkgs; scheme48 = callPackage ../development/interpreters/scheme48 { }; - self = callPackage_i686 ../development/interpreters/self { }; + self = pkgsi686Linux.callPackage ../development/interpreters/self { }; spark = spark_22; spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; @@ -7702,6 +7708,8 @@ with pkgs; alloy = callPackage ../development/tools/alloy { }; + adtool = callPackage ../tools/admin/adtool { }; + augeas = callPackage ../tools/system/augeas { }; inherit (callPackages ../tools/admin/ansible {}) @@ -15012,7 +15020,7 @@ with pkgs; requests requests_toolbelt sqlalchemy fusepy; }; - adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; + adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; @@ -16618,6 +16626,8 @@ with pkgs; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; + iksemel = callPackage ../development/libraries/iksemel { }; + imagej = callPackage ../applications/graphics/imagej { }; imagemagick_light = imagemagick.override { @@ -16683,7 +16693,7 @@ with pkgs; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; - inferno = callPackage_i686 ../applications/inferno { }; + inferno = pkgsi686Linux.callPackage ../applications/inferno { }; inginious = callPackage ../servers/inginious {}; @@ -16806,7 +16816,7 @@ with pkgs; keepnote = callPackage ../applications/office/keepnote { }; - kega-fusion = callPackage_i686 ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; kermit = callPackage ../tools/misc/kermit { }; @@ -17607,7 +17617,7 @@ with pkgs; ffmpeg = ffmpeg_2; }; - pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { }; + pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { }; pekwm = callPackage ../applications/window-managers/pekwm { }; @@ -18413,6 +18423,8 @@ with pkgs; vte = gnome3.vte-ng; }; + termtosvg = callPackage ../tools/misc/termtosvg { }; + tesseract = callPackage ../applications/graphics/tesseract { }; tesseract_4 = lowPrio (callPackage ../applications/graphics/tesseract/4.x.nix { }); @@ -19844,7 +19856,7 @@ with pkgs; terraria-server = callPackage ../games/terraria-server { }; - tibia = callPackage_i686 ../games/tibia { }; + tibia = pkgsi686Linux.callPackage ../games/tibia { }; tintin = callPackage ../games/tintin { }; @@ -19913,7 +19925,7 @@ with pkgs; vectoroids = callPackage ../games/vectoroids { }; - vessel = callPackage_i686 ../games/vessel { }; + vessel = pkgsi686Linux.callPackage ../games/vessel { }; vms-empire = callPackage ../games/vms-empire { }; @@ -20903,7 +20915,7 @@ with pkgs; bootil = callPackage ../development/libraries/bootil { }; - brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {}; + brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {}; brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; @@ -20952,10 +20964,10 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; - cups-brother-hl1110 = callPackage_i686 ../misc/cups/drivers/hl1110 { }; + cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; # this driver ships with pre-compiled 32-bit binary libraries - cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { }; + cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { libusb = libusb1; @@ -21045,7 +21057,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript rec { cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); @@ -21146,12 +21158,15 @@ with pkgs; mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + muse = callPackage ../applications/audio/muse { }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; inherit (callPackages ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; curl = curl_7_59; + boehmgc = boehmgc.override { enableLargeConfig = true; }; }) nix nix1 @@ -21384,13 +21399,13 @@ with pkgs; hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; - mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { }; + mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { }; - mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { }; + mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { }; mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { }; - mfcl2700dnlpr = callPackage_i686 ../misc/cups/drivers/mfcl2700dnlpr { }; + mfcl2700dnlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcl2700dnlpr { }; mfcl2720dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2720dwcupswrapper { }; mfcl2720dwlpr = callPackage ../misc/cups/drivers/mfcl2720dwlpr { }; @@ -21590,7 +21605,17 @@ with pkgs; pythonPackages = python3Packages; }; - winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { }); + winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { + callPackage = newScope self; + + inherit wineBuild; + + inherit (callPackage ./wine-packages.nix {}) + minimal base full stable unstable staging; + }); + + winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); + wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow"); wine = winePackages.full; @@ -21699,7 +21724,7 @@ with pkgs; callPackage ../applications/networking/znc/modules.nix { } ); - zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; xcpc = callPackage ../misc/emulators/xcpc { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a7f6f49fa1f..ad3e4bf0a166 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -263,6 +263,8 @@ in { distorm3 = callPackage ../development/python-modules/distorm3 { }; + dogtail = callPackage ../development/python-modules/dogtail { }; + diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; fido2 = callPackage ../development/python-modules/fido2 { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index c209b05b09c5..cc70950c497c 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -117,29 +117,47 @@ let lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); - # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: kernel: nixpkgsFun { - localSystem = { - inherit system; - platform = stdenv.hostPlatform.platform // { kernelArch = kernel; }; - }; - }; - - # Convenience attributes for instantitating nixpkgs. Each of these - # will instantiate a new version of allPackages. They map example - # attributes to their own thing. - extraPkgs = self: super: { - pkgsCross = lib.mapAttrs (n: crossSystem: + # Convenience attributes for instantitating package sets. Each of + # these will instantiate a new version of allPackages. Currently the + # following package sets are provided: + # + # - pkgsCross.<system> where system is a member of lib.systems.examples + # - pkgsMusl + # - pkgsi686Linux + otherPackageSets = self: super: { + # This maps each entry in lib.systems.examples to its own package + # set. Each of these will contain all packages cross compiled for + # that target system. For instance, pkgsCross.rasberryPi.hello, + # will refer to the "hello" package built for the ARM6-based + # Raspberry Pi. + pkgsCross = lib.mapAttrs (n: crossSystem: nixpkgsFun { inherit crossSystem; }) lib.systems.examples; - pkgsLocal = lib.mapAttrs (n: localSystem: - nixpkgsFun { inherit localSystem; }) - lib.systems.examples; - # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux" "i386"; - callPackage_i686 = self.pkgsi686Linux.callPackage; - inherit forceSystem; + # All packages built with the Musl libc. This will override the + # default GNU libc on Linux systems. Non-Linux systems are not + # supported. + pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { + localSystem = { + parsed = stdenv.hostPlatform.parsed // { + abi = { + "gnu" = lib.systems.parse.abis.musl; + "gnueabi" = lib.systems.parse.abis.musleabi; + "gnueabihf" = lib.systems.parse.abis.musleabihf; + }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; + }; + }; + } else throw "Musl libc only supports Linux systems."; + + # All packages built for i686 Linux. + # Used by wine, firefox with debugging version of Flash, ... + pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun { + localSystem = { + parsed = stdenv.hostPlatform.parsed // { + cpu = lib.systems.parse.cpuTypes.i686; + }; + }; + }; }; # The complete chain of package set builders, applied from top to bottom. @@ -152,7 +170,7 @@ let trivialBuilders splice allPackages - extraPkgs + otherPackageSets aliases configOverrides ] ++ overlays ++ [ diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 109f01362555..8ff2d46c24e0 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,9 +1,9 @@ -{ stdenv, config, callPackage }: +{ stdenv, config, callPackage, wineBuild }: rec { minimal = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; - wineBuild = config.wine.build or "wine32"; + inherit wineBuild; }; base = minimal.override { |