diff options
580 files changed, 12752 insertions, 7101 deletions
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml index 99e2a63631a7..1bd90d2a0c76 100644 --- a/doc/functions/overrides.xml +++ b/doc/functions/overrides.xml @@ -6,8 +6,14 @@ <para> Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g. - derivation attributes, the results of derivations or even the whole package - set. + derivation attributes, the results of derivations. + </para> + + <para> + These functions are used to make changes to packages, returning only single + packages. <link xlink:href="#chap-overlays">Overlays</link>, on the other + hand, can be used to combine the overridden packages across the entire + package set of Nixpkgs. </para> <section xml:id="sec-pkg-override"> @@ -25,6 +31,9 @@ <para> Example usages: <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting> +<!-- TODO: move below programlisting to a new section about extending and overlays + and reference it + --> <programlisting> import pkgs.path { overlays = [ (self: super: { foo = super.foo.override { barSupport = true ; }; @@ -86,11 +95,11 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { in this case, as it overrides only the attributes of the final derivation. It is for this reason that <varname>overrideAttrs</varname> should be preferred in (almost) all cases to <varname>overrideDerivation</varname>, - i.e. to allow using <varname>sdenv.mkDerivation</varname> to process input + i.e. to allow using <varname>stdenv.mkDerivation</varname> to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. <varname>buildInputs</varname> vs - <varname>nativeBuildInputs</varname>, and involves less typing. + <varname>nativeBuildInputs</varname>), and it involves less typing). </para> </note> </section> diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index 640b04c7da9d..4314df5c9df2 100644 --- a/doc/languages-frameworks/coq.xml +++ b/doc/languages-frameworks/coq.xml @@ -12,8 +12,8 @@ <para> Some extensions (plugins) might require OCaml and sometimes other OCaml - packages. The <literal>coq.ocamlPackages</literal> attribute can be used - to depend on the same package set Coq was built against. + packages. The <literal>coq.ocamlPackages</literal> attribute can be used to + depend on the same package set Coq was built against. </para> <para> diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 1b235dbb52f6..2cec1543a249 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -23,6 +23,7 @@ Adding custom .vimrc lines can be done using the following code: ``` vim_configurable.customize { + # `name` specifies the name of the executable and package name = "vim-with-plugins"; vimrcConfig.customRC = '' @@ -31,6 +32,8 @@ vim_configurable.customize { } ``` +This configuration is used when vim is invoked with the command specified as name, in this case `vim-with-plugins`. + For Neovim the `configure` argument can be overridden to achieve the same: ``` @@ -83,6 +86,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n { packageOverrides = pkgs: with pkgs; { myVim = vim_configurable.customize { + # `name` specifies the name of the executable and package name = "vim-with-plugins"; # add here code from the example section }; diff --git a/doc/overlays.xml b/doc/overlays.xml index 2decf9febe80..90dd163072d3 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -17,91 +17,122 @@ <title>Installing overlays</title> <para> - The list of overlays is determined as follows. + The list of overlays can be set either explicitly in a Nix expression, or + through <literal><nixpkgs-overlays></literal> or user configuration + files. </para> - <para> - If the <varname>overlays</varname> argument is not provided explicitly, we - look for overlays in a path. The path is determined as follows: - <orderedlist> - <listitem> - <para> - First, if an <varname>overlays</varname> argument to the nixpkgs function - itself is given, then that is used. - </para> - <para> - This can be passed explicitly when importing nipxkgs, for example - <literal>import <nixpkgs> { overlays = [ overlay1 overlay2 ]; - }</literal>. - </para> - </listitem> - <listitem> - <para> - Otherwise, if the Nix path entry <literal><nixpkgs-overlays></literal> - exists, we look for overlays at that path, as described below. - </para> - <para> - See the section on <literal>NIX_PATH</literal> in the Nix manual for more - details on how to set a value for - <literal><nixpkgs-overlays>.</literal> - </para> - </listitem> - <listitem> - <para> - If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and - <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for - overlays at that path, as described below. It is an error if both exist. - </para> - </listitem> - </orderedlist> - </para> + <section xml:id="sec-overlays-argument"> + <title>Set overlays in NixOS or Nix expressions</title> - <para> - If we are looking for overlays at a path, then there are two cases: - <itemizedlist> - <listitem> - <para> - If the path is a file, then the file is imported as a Nix expression and - used as the list of overlays. - </para> - </listitem> - <listitem> - <para> - If the path is a directory, then we take the content of the directory, - order it lexicographically, and attempt to interpret each as an overlay - by: - <itemizedlist> - <listitem> - <para> - Importing the file, if it is a <literal>.nix</literal> file. - </para> - </listitem> - <listitem> - <para> - Importing a top-level <filename>default.nix</filename> file, if it is - a directory. - </para> - </listitem> - </itemizedlist> - </para> - </listitem> - </itemizedlist> - </para> + <para> + On a NixOS system the value of the <literal>nixpkgs.overlays</literal> + option, if present, is passed to the system Nixpkgs directly as an + argument. Note that this does not affect the overlays for non-NixOS + operations (e.g. <literal>nix-env</literal>), which are + <link xlink:href="#sec-overlays-lookup">looked</link> up independently. + </para> - <para> - On a NixOS system the value of the <literal>nixpkgs.overlays</literal> - option, if present, is passed to the system Nixpkgs directly as an argument. - Note that this does not affect the overlays for non-NixOS operations (e.g. - <literal>nix-env</literal>), which are looked up independently. - </para> + <para> + The list of overlays can be passed explicitly when importing nixpkgs, for + example <literal>import <nixpkgs> { overlays = [ overlay1 overlay2 ]; + }</literal>. + </para> - <para> - The <filename>overlays.nix</filename> option therefore provides a convenient - way to use the same overlays for a NixOS system configuration and user - configuration: the same file can be used as - <filename>overlays.nix</filename> and imported as the value of - <literal>nixpkgs.overlays</literal>. - </para> + <para> + Further overlays can be added by calling the <literal>pkgs.extend</literal> + or <literal>pkgs.appendOverlays</literal>, although it is often preferable + to avoid these functions, because they recompute the Nixpkgs fixpoint, + which is somewhat expensive to do. + </para> + </section> + + <section xml:id="sec-overlays-lookup"> + <title>Install overlays via configuration lookup</title> + + <para> + The list of overlays is determined as follows. + </para> + + <para> + <orderedlist> + <listitem> + <para> + First, if an + <link xlink:href="#sec-overlays-argument"><varname>overlays</varname> + argument</link> to the nixpkgs function itself is given, then that is + used and no path lookup will be performed. + </para> + </listitem> + <listitem> + <para> + Otherwise, if the Nix path entry + <literal><nixpkgs-overlays></literal> exists, we look for overlays at + that path, as described below. + </para> + <para> + See the section on <literal>NIX_PATH</literal> in the Nix manual for + more details on how to set a value for + <literal><nixpkgs-overlays>.</literal> + </para> + </listitem> + <listitem> + <para> + If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and + <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look + for overlays at that path, as described below. It is an error if both + exist. + </para> + </listitem> + </orderedlist> + </para> + + <para> + If we are looking for overlays at a path, then there are two cases: + <itemizedlist> + <listitem> + <para> + If the path is a file, then the file is imported as a Nix expression and + used as the list of overlays. + </para> + </listitem> + <listitem> + <para> + If the path is a directory, then we take the content of the directory, + order it lexicographically, and attempt to interpret each as an overlay + by: + <itemizedlist> + <listitem> + <para> + Importing the file, if it is a <literal>.nix</literal> file. + </para> + </listitem> + <listitem> + <para> + Importing a top-level <filename>default.nix</filename> file, if it is + a directory. + </para> + </listitem> + </itemizedlist> + </para> + </listitem> + </itemizedlist> + </para> + + <para> + Because overlays that are set in NixOS configuration do not affect + non-NixOS operations such as <literal>nix-env</literal>, the + <filename>overlays.nix</filename> option provides a convenient way to use + the same overlays for a NixOS system configuration and user configuration: + the same file can be used as <filename>overlays.nix</filename> and imported + as the value of <literal>nixpkgs.overlays</literal>. + </para> + +<!-- TODO: Example of sharing overlays between NixOS configuration + and configuration lookup. Also reference the example + from the sec-overlays-argument paragraph about NixOS. + --> + </section> </section> <!--============================================================--> <section xml:id="sec-overlays-definition"> diff --git a/doc/package-notes.xml b/doc/package-notes.xml index dad28d3ec8b2..49f94f3bd5d2 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -681,10 +681,10 @@ overrides = self: super: rec { </para> <para> - The python plugin allows the addition of extra libraries. For instance, the - <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or - libnotify, and the <literal>fish.py</literal> script requires pycrypto. To - use these scripts, use the <literal>python</literal> plugin's + The python and perl plugins allows the addition of extra libraries. For + instance, the <literal>inotify.py</literal> script in weechat-scripts + requires D-Bus or libnotify, and the <literal>fish.py</literal> script + requires pycrypto. To use these scripts, use the plugin's <literal>withPackages</literal> attribute: <programlisting>weechat.override { configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ diff --git a/doc/stdenv.xml b/doc/stdenv.xml index cc0c13c54471..b2f30bf08db1 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -372,7 +372,7 @@ let f(h, h + 1, i) = i + h They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), - put it in <varname>nativeBuildInputs</varname>instead. The most common + put it in <varname>nativeBuildInputs</varname> instead. The most common use for this <literal>buildPackages.stdenv.cc</literal>, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. @@ -2099,13 +2099,13 @@ someVar=$(stripHash $name) </para> <para> - In order to alleviate this burden, the <firstterm>setup - hook></firstterm>mechanism was written, where any package can include a - shell script that [by convention rather than enforcement by Nix], any - downstream reverse-dependency will source as part of its build process. That - allows the downstream dependency to merely specify its dependencies, and - lets those dependencies effectively initialize themselves. No boilerplate - mirroring the list of dependencies is needed. + In order to alleviate this burden, the <firstterm>setup hook</firstterm> + mechanism was written, where any package can include a shell script that [by + convention rather than enforcement by Nix], any downstream + reverse-dependency will source as part of its build process. That allows the + downstream dependency to merely specify its dependencies, and lets those + dependencies effectively initialize themselves. No boilerplate mirroring the + list of dependencies is needed. </para> <para> @@ -2445,6 +2445,28 @@ addEnvHooks "$hostOffset" myBashFunction </para> </listitem> </varlistentry> + <varlistentry> + <term> + breakpointHook + </term> + <listitem> + <para> + This hook will make a build pause instead of stopping when a failure + happen. It prevents nix to cleanup the build environment immediatly and + allows the user to attach to a build environment using the + <command>cntr</command> command. On build error it will print the + instruction that are neccessary for <command>cntr</command>. Installing + cntr and running the command will provide shell access to the build + sandbox of failed build. At <filename>/var/lib/cntr</filename> the + sandbox filesystem is mounted. All commands and files of the system are + still accessible within the shell. To execute commands from the sandbox + use the cntr exec subcommand. Note that <command>cntr</command> also + needs to be executed on the machine that is doing the build, which might + be not the case when remote builders are enabled. + <command>cntr</command> is only supported on linux based platforms. + </para> + </listitem> + </varlistentry> </variablelist> </para> </section> diff --git a/lib/licenses.nix b/lib/licenses.nix index 611e6ddb35b7..940baf53b7c3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "GNU General Public License v2.0 only"; }; + gpl2Classpath = { + spdxId = "GPL-2.0-with-classpath-exception"; + fullName = "GNU General Public License v2.0 only (with Classpath exception)"; + url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; + }; + gpl2ClasspathPlus = { fullName = "GNU General Public License v2.0 or later (with Classpath exception)"; url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; diff --git a/lib/strings.nix b/lib/strings.nix index 0c4095bb55cd..99399459bb48 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -502,9 +502,12 @@ rec { => false */ isStorePath = x: - isCoercibleToString x - && builtins.substring 0 1 (toString x) == "/" - && dirOf x == builtins.storeDir; + if isCoercibleToString x then + let str = toString x; in + builtins.substring 0 1 str == "/" + && dirOf str == builtins.storeDir + else + false; /* Convert string to int Obviously, it is a bit hacky to use fromJSON that way. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 853d911cdc81..1604fbb39cbb 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -112,7 +112,7 @@ runTests { storePathAppendix = isStorePath "${goodPath}/bin/python"; nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); - asPath = isStorePath goodPath; + asPath = isStorePath (/. + goodPath); otherPath = isStorePath "/something/else"; otherVals = { attrset = isStorePath {}; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e9563552fc2a..b6add449b9bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -158,6 +158,11 @@ github = "alexanderkjeldaas"; name = "Alexander Kjeldaas"; }; + akavel = { + email = "czapkofan@gmail.com"; + github = "akavel"; + name = "Mateusz Czapliński"; + }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; @@ -2962,6 +2967,11 @@ github = "nequissimus"; name = "Tim Steinbach"; }; + nikitavoloboev = { + email = "nikita.voloboev@gmail.com"; + github = "nikitavoloboev"; + name = "Nikita Voloboev"; + }; nfjinjing = { email = "nfjinjing@gmail.com"; github = "nfjinjing"; @@ -3636,6 +3646,11 @@ github = "roosemberth"; name = "Roosembert (Roosemberth) Palacios"; }; + royneary = { + email = "christian@ulrich.earth"; + github = "royneary"; + name = "Christian Ulrich"; + }; rprospero = { email = "rprospero+nix@gmail.com"; github = "rprospero"; @@ -4148,11 +4163,6 @@ github = "tazjin"; name = "Vincent Ambo"; }; - TealG = { - email = "~@Teal.Gr"; - github = "TealG"; - name = "Teal Gaure"; - }; teh = { email = "tehunger@gmail.com"; github = "teh"; @@ -4613,6 +4623,11 @@ github = "wucke13"; name = "Wucke"; }; + wykurz = { + email = "wykurz@gmail.com"; + github = "wykurz"; + name = "Mateusz Wykurz"; + }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index baddbcd8c68d..64ccddb6c672 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -130,6 +130,21 @@ were removed. They were never used for anything and can therefore safely be removed. </para> </listitem> + <listitem> + <para> + Package <literal>wasm</literal> has been renamed <literal>proglodyte-wasm</literal>. The package + <literal>wasm</literal> will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so + make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal> + </para> + </listitem> + <listitem> + <para> + OpenSMTPD has been upgraded to version 6.4.0p1. This release makes + backwards-incompatible changes to the configuration file format. See + <command>man smtpd.conf</command> for more information on the new file + format. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 1ef5313d3fdd..1eb6fb43604a 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -16,6 +16,13 @@ let resolvconfOptions = cfg.resolvconfOptions ++ optional cfg.dnsSingleRequest "single-request" ++ optional cfg.dnsExtensionMechanism "edns0"; + + + localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1"; + localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1"; + + localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ])); + in { @@ -23,8 +30,7 @@ in options = { networking.hosts = lib.mkOption { - type = types.attrsOf ( types.listOf types.str ); - default = {}; + type = types.attrsOf (types.listOf types.str); example = literalExample '' { "127.0.0.1" = [ "foo.bar.baz" ]; @@ -192,6 +198,29 @@ in config = { + assertions = [{ + assertion = localhostMapped4; + message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"''; + } { + assertion = !cfg.enableIPv6 || localhostMapped6; + message = ''`networking.hosts` doesn't map "::1" to "localhost"''; + } { + assertion = !localhostMultiple; + message = '' + `networking.hosts` maps "localhost" to something other than "127.0.0.1" + or "::1". This will break some applications. Please use + `networking.extraHosts` if you really want to add such a mapping. + ''; + }]; + + networking.hosts = { + "127.0.0.1" = [ "localhost" ]; + } // optionalAttrs (cfg.hostName != "") { + "127.0.1.1" = [ cfg.hostName ]; + } // optionalAttrs cfg.enableIPv6 { + "::1" = [ "localhost" ]; + }; + environment.etc = { # /etc/services: TCP/UDP port assignments. "services".source = pkgs.iana-etc + "/etc/services"; @@ -203,25 +232,13 @@ in "rpc".source = pkgs.glibc.out + "/etc/rpc"; # /etc/hosts: Hostname-to-IP mappings. - "hosts".text = - let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set ); - allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set ); - userLocalHosts = optionalString - ( builtins.hasAttr "127.0.0.1" cfg.hosts ) - ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" )); - userLocalHosts6 = optionalString - ( builtins.hasAttr "::1" cfg.hosts ) - ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" )); - otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]); - in - '' - 127.0.0.1 ${userLocalHosts} localhost - ${optionalString cfg.enableIPv6 '' - ::1 ${userLocalHosts6} localhost - ''} - ${otherHosts} - ${cfg.extraHosts} - ''; + "hosts".text = let + oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip}; + allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set); + in '' + ${allToString cfg.hosts} + ${cfg.extraHosts} + ''; # /etc/host.conf: resolver configuration file "host.conf".text = cfg.hostConf; @@ -296,4 +313,4 @@ in }; - } +} diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 426e1666a814..137ee243813d 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -266,7 +266,7 @@ let (mkIf config.isNormalUser { group = mkDefault "users"; createHome = mkDefault true; - home = mkDefault "/home/${name}"; + home = mkDefault "/home/${config.name}"; useDefaultShell = mkDefault true; isSystemUser = mkDefault false; }) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 3dc0f606bf60..bcdbffdc20b7 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -7,4 +7,6 @@ imports = [ ./installation-cd-base.nix ]; + + fonts.fontconfig.enable = false; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0b4ed6d3b628..5c30e512a1b3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -385,7 +385,7 @@ virtuoso = 44; #rtkit = 45; # unused dovecot2 = 46; - #dovenull = 47; # unused + dovenull2 = 47; prayer = 49; mpd = 50; clamav = 51; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fb6b4262568e..660644eade8d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -108,7 +108,6 @@ ./programs/oblogout.nix ./programs/plotinus.nix ./programs/qt5ct.nix - ./programs/rootston.nix ./programs/screen.nix ./programs/sedutil.nix ./programs/slock.nix @@ -121,11 +120,13 @@ ./programs/sysdig.nix ./programs/systemtap.nix ./programs/sway.nix + ./programs/sway-beta.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/udevil.nix ./programs/venus.nix ./programs/vim.nix + ./programs/wavemon.nix ./programs/way-cooler.nix ./programs/wireshark.nix ./programs/xfs_quota.nix @@ -234,6 +235,7 @@ ./services/desktops/dleyna-server.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix + ./services/desktops/gsignond.nix ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix @@ -504,6 +506,7 @@ ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/epmd.nix + ./services/networking/eternal-terminal.nix ./services/networking/fakeroute.nix ./services/networking/ferm.nix ./services/networking/firefox/sync-server.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 5aaffa4f1f2a..7e14b0e21143 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,7 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.w3m-nox # needed for the manual anyway + pkgs.w3m-nographics # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.ms-sys # for writing Microsoft boot sectors / MBRs pkgs.efibootmgr @@ -19,6 +19,9 @@ pkgs.cryptsetup # needed for dm-crypt volumes pkgs.mkpasswd # for generating password files + # Some text editors. + pkgs.vim + # Some networking tools. pkgs.fuse pkgs.fuse3 diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index d51ed195580d..370db2b08452 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -87,9 +87,6 @@ with lib; # console less cumbersome if the machine has a public IP. networking.firewall.logRefusedConnections = mkDefault false; - environment.systemPackages = [ pkgs.vim ]; - - # Allow the user to log in as root without a password. users.users.root.initialHashedPassword = ""; }; diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix deleted file mode 100644 index 842d9e6cfb48..000000000000 --- a/nixos/modules/programs/rootston.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.programs.rootston; - - rootstonWrapped = pkgs.writeScriptBin "rootston" '' - #! ${pkgs.runtimeShell} - if [[ "$#" -ge 1 ]]; then - exec ${pkgs.rootston}/bin/rootston "$@" - else - ${cfg.extraSessionCommands} - exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile} - fi - ''; -in { - options.programs.rootston = { - enable = mkEnableOption '' - rootston, the reference compositor for wlroots. The purpose of rootston - is to test and demonstrate the features of wlroots (if you want a real - Wayland compositor you should e.g. use Sway instead). You can manually - start the compositor by running "rootston" from a terminal''; - - extraSessionCommands = mkOption { - type = types.lines; - default = ""; - example = '' - # Define a keymap (US QWERTY is the default) - export XKB_DEFAULT_LAYOUT=de,us - export XKB_DEFAULT_VARIANT=nodeadkeys - export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape - ''; - description = '' - Shell commands executed just before rootston is started. - ''; - }; - - extraPackages = mkOption { - type = with types; listOf package; - default = with pkgs; [ - westonLite xwayland rofi - ]; - defaultText = literalExample '' - with pkgs; [ - westonLite xwayland rofi - ] - ''; - example = literalExample "[ ]"; - description = '' - Extra packages to be installed system wide. - ''; - }; - - config = mkOption { - type = types.str; - default = '' - [keyboard] - meta-key = Logo - - # Sway/i3 like Keybindings - # Maps key combinations with commands to execute - # Commands include: - # - "exit" to stop the compositor - # - "exec" to execute a shell command - # - "close" to close the current view - # - "next_window" to cycle through windows - [bindings] - Logo+Shift+e = exit - Logo+q = close - Logo+m = maximize - Alt+Tab = next_window - Logo+Return = exec weston-terminal - Logo+d = exec rofi -show run - ''; - description = '' - Default configuration for rootston (used when called without any - parameters). - ''; - }; - - configFile = mkOption { - type = types.path; - default = "/etc/rootston.ini"; - example = literalExample "${pkgs.rootston}/etc/rootston.ini"; - description = '' - Path to the default rootston configuration file (the "config" option - will have no effect if you change the path). - ''; - }; - }; - - config = mkIf cfg.enable { - environment.etc."rootston.ini".text = cfg.config; - environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages; - - hardware.opengl.enable = mkDefault true; - fonts.enableDefaultFonts = mkDefault true; - programs.dconf.enable = mkDefault true; - }; - - meta.maintainers = with lib.maintainers; [ primeos gnidorah ]; -} diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix new file mode 100644 index 000000000000..04f2e0662b86 --- /dev/null +++ b/nixos/modules/programs/sway-beta.nix @@ -0,0 +1,54 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.sway-beta; + swayPackage = cfg.package; +in { + options.programs.sway-beta = { + enable = mkEnableOption '' + Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0 + ''; + + package = mkOption { + type = types.package; + default = pkgs.sway-beta; + defaultText = "pkgs.sway-beta"; + description = '' + The package to be used for `sway`. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ + xwayland dmenu + ]; + defaultText = literalExample '' + with pkgs; [ xwayland dmenu ]; + ''; + example = literalExample '' + with pkgs; [ + xwayland + i3status i3status-rust + termite rofi light + ] + ''; + description = '' + Extra packages to be installed system wide. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ swayPackage ] ++ cfg.extraPackages; + security.pam.services.swaylock = {}; + hardware.opengl.enable = mkDefault true; + fonts.enableDefaultFonts = mkDefault true; + programs.dconf.enable = mkDefault true; + }; + + meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; +} + diff --git a/nixos/modules/programs/wavemon.nix b/nixos/modules/programs/wavemon.nix new file mode 100644 index 000000000000..ac665fe4a023 --- /dev/null +++ b/nixos/modules/programs/wavemon.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.wavemon; +in { + options = { + programs.wavemon = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add wavemon to the global environment and configure a + setcap wrapper for it. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ wavemon ]; + security.wrappers.wavemon = { + source = "${pkgs.wavemon}/bin/wavemon"; + capabilities = "cap_net_admin+ep"; + }; + }; +} diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index 3a1ffc55e5fe..63e00b548120 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -20,7 +20,6 @@ with lib; KERNEL=="random", TAG+="systemd" SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''} ''; systemd.services.rngd = { @@ -30,8 +29,7 @@ with lib; description = "Hardware RNG Entropy Gatherer Daemon"; - serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" + - (if config.services.tcsd.enable then " --no-tpm=1" else ""); + serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v"; }; }; } diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 77e4b2a616d8..dcb9c8d4ed5f 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -180,35 +180,6 @@ in # programs to be wrapped. WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin - # Remove the old /var/setuid-wrappers path from the system... - # - # TODO: this is only necessary for upgrades 16.09 => 17.x; - # this conditional removal block needs to be removed after - # the release. - if [ -d /var/setuid-wrappers ]; then - rm -rf /var/setuid-wrappers - ln -s /run/wrappers/bin /var/setuid-wrappers - fi - - # Remove the old /run/setuid-wrappers-dir path from the - # system as well... - # - # TODO: this is only necessary for upgrades 16.09 => 17.x; - # this conditional removal block needs to be removed after - # the release. - if [ -d /run/setuid-wrapper-dirs ]; then - rm -rf /run/setuid-wrapper-dirs - ln -s /run/wrappers/bin /run/setuid-wrapper-dirs - fi - - # TODO: this is only necessary for upgrades 16.09 => 17.x; - # this conditional removal block needs to be removed after - # the release. - if readlink -f /run/booted-system | grep nixos-17 > /dev/null; then - rm -rf /run/setuid-wrapper-dirs - rm -rf /var/setuid-wrappers - fi - # We want to place the tmpdirs for the wrappers to the parent dir. wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) chmod a+rx $wrapperDir diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix new file mode 100644 index 000000000000..cf26e05d5c18 --- /dev/null +++ b/nixos/modules/services/desktops/gsignond.nix @@ -0,0 +1,43 @@ +# Accounts-SSO gSignOn daemon + +{ config, lib, pkgs, ... }: + +with lib; + +let + package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; }; +in +{ + + ###### interface + + options = { + + services.gsignond = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable gSignOn daemon, a DBus service + which performs user authentication on behalf of its clients. + ''; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = []; + description = '' + What plugins to use with the gSignOn daemon. + ''; + }; + }; + }; + + ###### implementation + config = mkIf config.services.gsignond.enable { + environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf"; + services.dbus.packages = [ package ]; + }; + +} diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index dfefc1171e62..c06a0665d02f 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -27,13 +27,13 @@ in { destination = "/etc/udev/rules.d/51-trezor.rules"; text = '' # TREZOR v1 (One) - SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess" # TREZOR v2 (T) - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess" ''; }); diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index e6091182b2ab..30ad7d82fb80 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -311,7 +311,7 @@ in { name = "dovenull"; uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; - group = cfg.group; + group = "dovenull"; } ] ++ optional (cfg.user == "dovecot2") { name = "dovecot2"; @@ -332,6 +332,10 @@ in } ++ optional (cfg.createMailUser && cfg.mailGroup != null) { name = cfg.mailGroup; + } + ++ singleton + { name = "dovenull"; + gid = config.ids.gids.dovenull2; }; environment.etc."dovecot/modules".source = modulesDir; diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 8fd3455a238f..5434fe99347d 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -7,7 +7,7 @@ let ddConf = { dd_url = "https://app.datadoghq.com"; - skip_ssl_validation = "no"; + skip_ssl_validation = false; confd_path = "/etc/datadog-agent/conf.d"; additional_checksd = "/etc/datadog-agent/checks.d"; use_dogstatsd = true; @@ -16,6 +16,7 @@ let // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; } // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; } // optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; } + // optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; } // cfg.extraConfig; # Generate Datadog configuration files for each configured checks. @@ -132,6 +133,15 @@ in { default = false; type = types.bool; }; + + enableTraceAgent = mkOption { + description = '' + Whether to enable the trace agent. + ''; + default = false; + type = types.bool; + }; + checks = mkOption { description = '' Configuration for all Datadog checks. Keys of this attribute @@ -244,6 +254,16 @@ in { ${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml ''; }); + + datadog-trace-agent = lib.mkIf cfg.enableTraceAgent (makeService { + description = "Datadog Trace Agent"; + path = [ ]; + script = '' + export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) + ${pkgs.datadog-trace-agent}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml + ''; + }); + }; environment.etc = etcfiles; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index c30647f5460b..c0c16a429d89 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.grafana; + opt = options.services.grafana; envOptions = { PATHS_DATA = cfg.dataDir; @@ -41,6 +42,12 @@ let AUTH_ANONYMOUS_ORG_ROLE = cfg.auth.anonymous.org_role; ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable; + + SMTP_ENABLE = boolToString cfg.smtp.enable; + SMTP_HOST = cfg.smtp.host; + SMTP_USER = cfg.smtp.user; + SMTP_PASSWORD = cfg.smtp.password; + SMTP_FROM_ADDRESS = cfg.smtp.fromAddress; } // cfg.extraOptions; in { @@ -134,11 +141,23 @@ in { }; password = mkOption { - description = "Database password."; + description = '' + Database password. + This option is mutual exclusive with the passwordFile option. + ''; default = ""; type = types.str; }; + passwordFile = mkOption { + description = '' + File that containts the database password. + This option is mutual exclusive with the password option. + ''; + default = null; + type = types.nullOr types.path; + }; + path = mkOption { description = "Database path."; default = "${cfg.dataDir}/data/grafana.db"; @@ -163,16 +182,69 @@ in { }; adminPassword = mkOption { - description = "Default admin password."; + description = '' + Default admin password. + This option is mutual exclusive with the adminPasswordFile option. + ''; default = "admin"; type = types.str; }; + adminPasswordFile = mkOption { + description = '' + Default admin password. + This option is mutual exclusive with the <literal>adminPassword</literal> option. + ''; + default = null; + type = types.nullOr types.path; + }; + secretKey = mkOption { description = "Secret key used for signing."; default = "SW2YcwTIb9zpOOhoPsMm"; type = types.str; }; + + secretKeyFile = mkOption { + description = "Secret key used for signing."; + default = null; + type = types.nullOr types.path; + }; + }; + + smtp = { + enable = mkEnableOption "smtp"; + host = mkOption { + description = "Host to connect to"; + default = "localhost:25"; + type = types.str; + }; + user = mkOption { + description = "User used for authentication"; + default = ""; + type = types.str; + }; + password = mkOption { + description = '' + Password used for authentication. + This option is mutual exclusive with the passwordFile option. + ''; + default = ""; + type = types.str; + }; + passwordFile = mkOption { + description = '' + Password used for authentication. + This option is mutual exclusive with the password option. + ''; + default = null; + type = types.nullOr types.path; + }; + fromAddress = mkOption { + description = "Email address used for sending"; + default = "admin@grafana.localhost"; + type = types.str; + }; }; users = { @@ -241,12 +313,31 @@ in { config = mkIf cfg.enable { warnings = optional ( - cfg.database.password != options.services.grafana.database.password.default || - cfg.security.adminPassword != options.services.grafana.security.adminPassword.default + cfg.database.password != opt.database.password.default || + cfg.security.adminPassword != opt.security.adminPassword.default ) "Grafana passwords will be stored as plaintext in the Nix store!"; environment.systemPackages = [ cfg.package ]; + assertions = [ + { + assertion = cfg.database.password != opt.database.password.default -> cfg.database.passwordFile == null; + message = "Cannot set both password and passwordFile"; + } + { + assertion = cfg.security.adminPassword != opt.security.adminPassword.default -> cfg.security.adminPasswordFile == null; + message = "Cannot set both adminPassword and adminPasswordFile"; + } + { + assertion = cfg.security.secretKeyFile != opt.security.secretKeyFile.default -> cfg.security.secretKeyFile == null; + message = "Cannot set both secretKey and secretKeyFile"; + } + { + assertion = cfg.smtp.password != opt.smtp.password.default -> cfg.smtp.passwordFile == null; + message = "Cannot set both password and secretKeyFile"; + } + ]; + systemd.services.grafana = { description = "Grafana Service Daemon"; wantedBy = ["multi-user.target"]; @@ -254,8 +345,22 @@ in { environment = { QT_QPA_PLATFORM = "offscreen"; } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; + script = '' + ${optionalString (cfg.database.passwordFile != null) '' + export GF_DATABASE_PASSWORD="$(cat ${escapeShellArg cfg.database.passwordFile})" + ''} + ${optionalString (cfg.security.adminPasswordFile != null) '' + export GF_SECURITY_ADMIN_PASSWORD="$(cat ${escapeShellArg cfg.security.adminPasswordFile})" + ''} + ${optionalString (cfg.security.secretKeyFile != null) '' + export GF_SECURITY_SECRET_KEY="$(cat ${escapeShellArg cfg.security.secretKeyFile})" + ''} + ${optionalString (cfg.smtp.passwordFile != null) '' + export GF_SMTP_PASSWORD="$(cat ${escapeShellArg cfg.smtp.passwordFile})" + ''} + exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir} + ''; serviceConfig = { - ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}"; WorkingDirectory = cfg.dataDir; User = "grafana"; }; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index ff9604c7dbcd..2b265d5b5a90 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -5,8 +5,8 @@ # TODO: support fastcgi # http://munin-monitoring.org/wiki/CgiHowto2 -# spawn-fcgi -s /var/run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph -# spawn-fcgi -s /var/run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html +# spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph +# spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html # https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum # nginx http://munin.readthedocs.org/en/latest/example/webserver/nginx.html @@ -22,7 +22,7 @@ let dbdir /var/lib/munin htmldir /var/www/munin logdir /var/log/munin - rundir /var/run/munin + rundir /run/munin ${cronCfg.extraGlobalConfig} @@ -170,7 +170,7 @@ in wantedBy = [ "multi-user.target" ]; path = with pkgs; [ munin smartmontools "/run/current-system/sw" "/run/wrappers" ]; environment.MUNIN_LIBDIR = "${pkgs.munin}/lib"; - environment.MUNIN_PLUGSTATE = "/var/run/munin"; + environment.MUNIN_PLUGSTATE = "/run/munin"; environment.MUNIN_LOGDIR = "/var/log/munin"; preStart = '' echo "updating munin plugins..." @@ -188,7 +188,7 @@ in }; # munin_stats plugin breaks as of 2.0.33 when this doesn't exist - systemd.tmpfiles.rules = [ "d /var/run/munin 0755 munin munin -" ]; + systemd.tmpfiles.rules = [ "d /run/munin 0755 munin munin -" ]; }) (mkIf cronCfg.enable { @@ -210,7 +210,7 @@ in }; systemd.tmpfiles.rules = [ - "d /var/run/munin 0755 munin munin -" + "d /run/munin 0755 munin munin -" "d /var/log/munin 0755 munin munin -" "d /var/www/munin 0755 munin munin -" "d /var/lib/munin 0755 munin munin -" diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 9a2e13e9553c..a70967820b32 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -182,9 +182,10 @@ with lib; serviceConfig = rec { DynamicUser = true; RuntimeDirectory = StateDirectory; + RuntimeDirectoryMode = "0750"; StateDirectory = builtins.baseNameOf dataDir; Type = "oneshot"; - ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf"; + ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m660 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf"; ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf"; }; }; diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix new file mode 100644 index 000000000000..be7337ece7e4 --- /dev/null +++ b/nixos/modules/services/networking/eternal-terminal.nix @@ -0,0 +1,89 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.eternal-terminal; + +in + +{ + + ###### interface + + options = { + + services.eternal-terminal = { + + enable = mkEnableOption "Eternal Terminal server"; + + port = mkOption { + default = 2022; + type = types.int; + description = '' + The port the server should listen on. Will use the server's default (2022) if not specified. + ''; + }; + + verbosity = mkOption { + default = 0; + type = types.enum (lib.range 0 9); + description = '' + The verbosity level (0-9). + ''; + }; + + silent = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, disables all logging. + ''; + }; + + logSize = mkOption { + default = 20971520; + type = types.int; + description = '' + The maximum log size. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + # We need to ensure the et package is fully installed because + # the (remote) et client runs the `etterminal` binary when it + # connects. + environment.systemPackages = [ pkgs.eternal-terminal ]; + + systemd.services = { + eternal-terminal = { + description = "Eternal Terminal server."; + wantedBy = [ "multi-user.target" ]; + after = [ "syslog.target" "network.target" ]; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.eternal-terminal}/bin/etserver --daemon --cfgfile=${pkgs.writeText "et.cfg" '' + ; et.cfg : Config file for Eternal Terminal + ; + + [Networking] + port = ${toString cfg.port} + + [Debug] + verbose = ${toString cfg.verbosity} + silent = ${if cfg.silent then "1" else "0"} + logsize = ${toString cfg.logSize} + ''}"; + Restart = "on-failure"; + KillMode = "process"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index b16d299917fe..d4f7e95f859f 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -248,6 +248,14 @@ in { </itemizedlist> ''; + ppk_id = mkOptionalStrParam '' + String identifying the Postquantum Preshared Key (PPK) to be used. + ''; + + ppk_required = mkYesNoParam no '' + Whether a Postquantum Preshared Key (PPK) is required for this connection. + ''; + keyingtries = mkIntParam 1 '' Number of retransmission sequences to perform during initial connect. Instead of giving up initiation after the first retransmission @@ -922,6 +930,36 @@ in { <literal>0xffffffff</literal>. ''; + set_mark_in = mkStrParam "0/0x00000000" '' + Netfilter mark applied to packets after the inbound IPsec SA processed + them. This way it's not necessary to mark packets via Netfilter before + decryption or right afterwards to match policies or process them + differently (e.g. via policy routing). + + An additional mask may be appended to the mark, separated by + <literal>/</literal>. The default mask if omitted is 0xffffffff. The + special value <literal>%same</literal> uses the value (but not the mask) + from <option>mark_in</option> as mark value, which can be fixed, + <literal>%unique</literal> or <literal>%unique-dir</literal>. + + Setting marks in XFRM input requires Linux 4.19 or higher. + ''; + + set_mark_out = mkStrParam "0/0x00000000" '' + Netfilter mark applied to packets after the outbound IPsec SA processed + them. This allows processing ESP packets differently than the original + traffic (e.g. via policy routing). + + An additional mask may be appended to the mark, separated by + <literal>/</literal>. The default mask if omitted is 0xffffffff. The + special value <literal>%same</literal> uses the value (but not the mask) + from <option>mark_out</option> as mark value, which can be fixed, + <literal>%unique_</literal> or <literal>%unique-dir</literal>. + + Setting marks in XFRM output is supported since Linux 4.14. Setting a + mask requires at least Linux 4.19. + ''; + tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 '' Pads ESP packets with additional data to have a consistent ESP packet size for improved Traffic Flow Confidentiality. The padding defines the @@ -946,6 +984,33 @@ in { supported, but the installation does not fail otherwise. ''; + copy_df = mkYesNoParam yes '' + Whether to copy the DF bit to the outer IPv4 header in tunnel mode. This + effectively disables Path MTU discovery (PMTUD). Controlling this + behavior is not supported by all kernel interfaces. + ''; + + copy_ecn = mkYesNoParam yes '' + Whether to copy the ECN (Explicit Congestion Notification) header field + to/from the outer IP header in tunnel mode. Controlling this behavior is + not supported by all kernel interfaces. + ''; + + copy_dscp = mkEnumParam [ "out" "in" "yes" "no" ] "out" '' + Whether to copy the DSCP (Differentiated Services Field Codepoint) + header field to/from the outer IP header in tunnel mode. The value + <literal>out</literal> only copies the field from the inner to the outer + header, the value <literal>in</literal> does the opposite and only + copies the field from the outer to the inner header when decapsulating, + the value <literal>yes</literal> copies the field in both directions, + and the value <literal>no</literal> disables copying the field + altogether. Setting this to <literal>yes</literal> or + <literal>in</literal> could allow an attacker to adversely affect other + traffic at the receiver, which is why the default is + <literal>out</literal>. Controlling this behavior is not supported by + all kernel interfaces. + ''; + start_action = mkEnumParam ["none" "trap" "start"] "none" '' Action to perform after loading the configuration. <itemizedlist> @@ -1060,6 +1125,24 @@ in { defined in a unique section having the <literal>ike</literal> prefix. ''; + ppk = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the PPK. It may either be an ASCII string, a hex encoded string + if it has a <literal>0x</literal> prefix or a Base64 encoded string if + it has a <literal>0s</literal> prefix in its value. Should have at least + 256 bits of entropy for 128-bit security. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + PPK identity the PPK belongs to. Multiple unique identities may be + specified, each having an <literal>id</literal> prefix, if a secret is + shared between multiple peers. + ''; + } '' + Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is + defined in a unique section having the <literal>ppk</literal> prefix. + ''; + private = mkPrefixedAttrsOfParams { file = mkOptionalStrParam '' File name in the private folder for which this passphrase should be used. diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index 5bca15833544..fda864f2c30a 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -53,8 +53,6 @@ in chmod 0700 ${cfg.password} mkdir -p /var/lib/munge -m 0711 chown -R munge:munge /var/lib/munge - mkdir -p /var/log/munge -m 0700 - chown -R munge:munge /var/log/munge mkdir -p /run/munge -m 0755 chown -R munge:munge /run/munge ''; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 9b6d4be9bda8..aca2cf8cdeaa 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -57,6 +57,11 @@ let AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes} ''} '' + # Explicitly disable the SOCKS server if the client is disabled. In + # particular, this makes non-anonymous hidden services possible. + + optionalString (! cfg.client.enable) '' + SOCKSPort 0 + '' # Relay config + optionalString cfg.relay.enable '' ORPort ${toString cfg.relay.port} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index db4c8e1a3d85..c7e97bbeba9a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -70,7 +70,15 @@ in { ''; }; - nginx.enable = mkEnableOption "nginx vhost management"; + nginx.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable nginx virtual host management. + Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.<name></literal>. + See <xref linkend="opt-services.nginx.virtualHosts"/> for further information. + ''; + }; webfinger = mkOption { type = types.bool; @@ -184,7 +192,7 @@ in { type = types.nullOr types.str; default = null; description = '' - Database password. Use <literal>adminpassFile</literal> to avoid this + Admin password. Use <literal>adminpassFile</literal> to avoid this being world-readable in the <literal>/nix/store</literal>. ''; }; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index d92ba72a8336..be54e9255c78 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -121,6 +121,11 @@ in type = types.str; description = "name of the virtualhost"; }; + aliases = mkOption { + type = types.listOf types.str; + description = "aliases of the virtualhost"; + default = []; + }; webapps = mkOption { type = types.listOf types.path; description = '' @@ -220,10 +225,28 @@ in ${if cfg.serverXml != "" then '' cp -f ${pkgs.writeTextDir "server.xml" cfg.serverXml}/* ${cfg.baseDir}/conf/ - '' else '' - # Create a modified server.xml which also includes all virtual hosts - sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\ ${toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\" prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \ - ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml + '' else + let + hostElementForVirtualHost = virtualHost: '' + <Host name="${virtualHost.name}" appBase="virtualhosts/${virtualHost.name}/webapps" + unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> + '' + concatStrings (innerElementsForVirtualHost virtualHost) + '' + </Host> + ''; + innerElementsForVirtualHost = virtualHost: + (map (alias: '' + <Alias>${alias}</Alias> + '') virtualHost.aliases) + ++ (optional cfg.logPerVirtualHost '' + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs/${virtualHost.name}" + prefix="${virtualHost.name}_access_log." pattern="combined" resolveHosts="false"/> + ''); + hostElementsString = concatMapStringsSep "\n" hostElementForVirtualHost cfg.virtualHosts; + hostElementsSedString = replaceStrings ["\n"] ["\\\n"] hostElementsString; + in '' + # Create a modified server.xml which also includes all virtual hosts + sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\\"${escapeShellArg hostElementsSedString} \ + ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml '' } ${optionalString (cfg.logDirs != []) '' diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh deleted file mode 100644 index 36bf15066274..000000000000 --- a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh +++ /dev/null @@ -1,29 +0,0 @@ -#! @bash@/bin/sh -e - -copyForced() { - local src="$1" - local dst="$2" - cp $src $dst.tmp - mv $dst.tmp $dst -} - -# Call the extlinux builder -"@extlinuxConfBuilder@" "$@" - -# Add the firmware files -fwdir=@firmware@/share/raspberrypi/boot/ -copyForced $fwdir/bootcode.bin /boot/bootcode.bin -copyForced $fwdir/fixup.dat /boot/fixup.dat -copyForced $fwdir/fixup_cd.dat /boot/fixup_cd.dat -copyForced $fwdir/fixup_db.dat /boot/fixup_db.dat -copyForced $fwdir/fixup_x.dat /boot/fixup_x.dat -copyForced $fwdir/start.elf /boot/start.elf -copyForced $fwdir/start_cd.elf /boot/start_cd.elf -copyForced $fwdir/start_db.elf /boot/start_db.elf -copyForced $fwdir/start_x.elf /boot/start_x.elf - -# Add the uboot file -copyForced @uboot@/u-boot.bin /boot/u-boot-rpi.bin - -# Add the config.txt -copyForced @configTxt@ /boot/config.txt diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix new file mode 100644 index 000000000000..7eb52e3d021f --- /dev/null +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix @@ -0,0 +1,10 @@ +{ pkgs, configTxt }: + +pkgs.substituteAll { + src = ./raspberrypi-builder.sh; + isExecutable = true; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + firmware = pkgs.raspberrypifw; + inherit configTxt; +} diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh index 8adc8a6a7e11..0fb07de10c04 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh @@ -5,15 +5,25 @@ shopt -s nullglob export PATH=/empty for i in @path@; do PATH=$PATH:$i/bin; done -default=$1 -if test -z "$1"; then - echo "Syntax: builder.sh <DEFAULT-CONFIG>" +usage() { + echo "usage: $0 -c <path-to-default-configuration> [-d <boot-dir>]" >&2 exit 1 -fi +} + +default= # Default configuration +target=/boot # Target directory + +while getopts "c:d:" opt; do + case "$opt" in + c) default="$OPTARG" ;; + d) target="$OPTARG" ;; + \?) usage ;; + esac +done echo "updating the boot generations directory..." -mkdir -p /boot/old +mkdir -p $target/old # Convert a path to a file in the Nix store such as # /nix/store/<hash>-<name>/file to <hash>-<name>-<file>. @@ -22,12 +32,12 @@ cleanName() { echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g' } -# Copy a file from the Nix store to /boot/kernels. +# Copy a file from the Nix store to $target/kernels. declare -A filesCopied copyToKernelsDir() { local src="$1" - local dst="/boot/old/$(cleanName $src)" + local dst="$target/old/$(cleanName $src)" # Don't copy the file if $dst already exists. This means that we # have to create $dst atomically to prevent partially copied # kernels or initrd if this script is ever interrupted. @@ -47,10 +57,10 @@ copyForced() { mv $dst.tmp $dst } -outdir=/boot/old +outdir=$target/old mkdir -p $outdir || true -# Copy its kernel and initrd to /boot/kernels. +# Copy its kernel and initrd to $target/old. addEntry() { local path="$1" local generation="$2" @@ -74,25 +84,21 @@ addEntry() { echo $initrd > $outdir/$generation-initrd echo $kernel > $outdir/$generation-kernel - if test $(readlink -f "$path") = "$default"; then - if [ @version@ -eq 1 ]; then - copyForced $kernel /boot/kernel.img - else - copyForced $kernel /boot/kernel7.img - fi - copyForced $initrd /boot/initrd - for dtb in $dtb_path/bcm*.dtb; do - dst="/boot/$(basename $dtb)" + if test "$generation" = "default"; then + copyForced $kernel $target/kernel.img + copyForced $initrd $target/initrd + for dtb in $dtb_path/{broadcom,}/bcm*.dtb; do + dst="$target/$(basename $dtb)" copyForced $dtb "$dst" filesCopied[$dst]=1 done - cp "$(readlink -f "$path/init")" /boot/nixos-init - echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt - - echo "$2" > /boot/defaultgeneration + cp "$(readlink -f "$path/init")" $target/nixos-init + echo "`cat $path/kernel-params` init=$path/init" >$target/cmdline.txt fi } +addEntry $default default + # Add all generations of the system profile to the menu, in reverse # (most recent to least recent) order. for generation in $( @@ -105,21 +111,21 @@ done # Add the firmware files fwdir=@firmware@/share/raspberrypi/boot/ -copyForced $fwdir/bootcode.bin /boot/bootcode.bin -copyForced $fwdir/fixup.dat /boot/fixup.dat -copyForced $fwdir/fixup_cd.dat /boot/fixup_cd.dat -copyForced $fwdir/fixup_db.dat /boot/fixup_db.dat -copyForced $fwdir/fixup_x.dat /boot/fixup_x.dat -copyForced $fwdir/start.elf /boot/start.elf -copyForced $fwdir/start_cd.elf /boot/start_cd.elf -copyForced $fwdir/start_db.elf /boot/start_db.elf -copyForced $fwdir/start_x.elf /boot/start_x.elf +copyForced $fwdir/bootcode.bin $target/bootcode.bin +copyForced $fwdir/fixup.dat $target/fixup.dat +copyForced $fwdir/fixup_cd.dat $target/fixup_cd.dat +copyForced $fwdir/fixup_db.dat $target/fixup_db.dat +copyForced $fwdir/fixup_x.dat $target/fixup_x.dat +copyForced $fwdir/start.elf $target/start.elf +copyForced $fwdir/start_cd.elf $target/start_cd.elf +copyForced $fwdir/start_db.elf $target/start_db.elf +copyForced $fwdir/start_x.elf $target/start_x.elf # Add the config.txt -copyForced @configTxt@ /boot/config.txt +copyForced @configTxt@ $target/config.txt -# Remove obsolete files from /boot and /boot/old. -for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do +# Remove obsolete files from $target and $target/old. +for fn in $target/old/*linux* $target/old/*initrd-initrd* $target/bcm*.dtb; do if ! test "${filesCopied[$fn]}" = 1; then rm -vf -- "$fn" fi diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 9bec24c53f5b..7e089507ff20 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -5,25 +5,16 @@ with lib; let cfg = config.boot.loader.raspberryPi; - builderGeneric = pkgs.substituteAll { - src = ./builder.sh; - isExecutable = true; - inherit (pkgs) bash; - path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; - firmware = pkgs.raspberrypifw; - version = cfg.version; - inherit configTxt; - }; - inherit (pkgs.stdenv.hostPlatform) platform; - builderUboot = import ./builder_uboot.nix { inherit config; inherit pkgs; inherit configTxt; }; + builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; }; + builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; }; builder = if cfg.uboot.enable then "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c" else - builderGeneric; + "${builderGeneric} -c"; blCfg = config.boot.loader; timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; @@ -43,9 +34,12 @@ let '' + optional isAarch64 '' # Boot in 64-bit mode. arm_control=0x200 - '' + optional cfg.uboot.enable '' + '' + (if cfg.uboot.enable then '' kernel=u-boot-rpi.bin - '' + optional (cfg.firmwareConfig != null) cfg.firmwareConfig); + '' else '' + kernel=kernel.img + initramfs initrd followkernel + '') + optional (cfg.firmwareConfig != null) cfg.firmwareConfig); in @@ -65,7 +59,7 @@ in version = mkOption { default = 2; - type = types.enum [ 1 2 3 ]; + type = types.enum [ 0 1 2 3 ]; description = '' ''; }; diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix index 47f25a9c2b1b..e929c33c6ee3 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix @@ -1,13 +1,14 @@ -{ config, pkgs, configTxt }: +{ pkgs, version, configTxt }: let - cfg = config.boot.loader.raspberryPi; isAarch64 = pkgs.stdenv.isAarch64; uboot = - if cfg.version == 1 then + if version == 0 then + pkgs.ubootRaspberryPiZero + else if version == 1 then pkgs.ubootRaspberryPi - else if cfg.version == 2 then + else if version == 2 then pkgs.ubootRaspberryPi2 else if isAarch64 then @@ -21,7 +22,7 @@ let }; in pkgs.substituteAll { - src = ./builder_uboot.sh; + src = ./uboot-builder.sh; isExecutable = true; inherit (pkgs) bash; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; @@ -29,6 +30,6 @@ pkgs.substituteAll { inherit uboot; inherit configTxt; inherit extlinuxConfBuilder; - version = cfg.version; + inherit version; } diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh new file mode 100644 index 000000000000..ea591427179f --- /dev/null +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh @@ -0,0 +1,38 @@ +#! @bash@/bin/sh -e + +target=/boot # Target directory + +while getopts "t:c:d:g:" opt; do + case "$opt" in + d) target="$OPTARG" ;; + *) ;; + esac +done + +copyForced() { + local src="$1" + local dst="$2" + cp $src $dst.tmp + mv $dst.tmp $dst +} + +# Call the extlinux builder +"@extlinuxConfBuilder@" "$@" + +# Add the firmware files +fwdir=@firmware@/share/raspberrypi/boot/ +copyForced $fwdir/bootcode.bin $target/bootcode.bin +copyForced $fwdir/fixup.dat $target/fixup.dat +copyForced $fwdir/fixup_cd.dat $target/fixup_cd.dat +copyForced $fwdir/fixup_db.dat $target/fixup_db.dat +copyForced $fwdir/fixup_x.dat $target/fixup_x.dat +copyForced $fwdir/start.elf $target/start.elf +copyForced $fwdir/start_cd.elf $target/start_cd.elf +copyForced $fwdir/start_db.elf $target/start_db.elf +copyForced $fwdir/start_x.elf $target/start_x.elf + +# Add the uboot file +copyForced @uboot@/u-boot.bin $target/u-boot-rpi.bin + +# Add the config.txt +copyForced @configTxt@ $target/config.txt diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index 83fef8354360..f4fa09694537 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -112,9 +112,6 @@ in { environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; - systemd.services."systemd-nspawn@" = { - wantedBy = [ "machine.target" ]; - }; }; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a1412bc32904..89f8e8153550 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -387,7 +387,7 @@ let logindHandlerType = types.enum [ "ignore" "poweroff" "reboot" "halt" "kexec" "suspend" - "hibernate" "hybrid-sleep" "lock" + "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" ]; in @@ -587,6 +587,15 @@ in ''; }; + services.journald.forwardToSyslog = mkOption { + default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; + defaultText = "config.services.rsyslogd.enable || config.services.syslog-ng.enable"; + type = types.bool; + description = '' + Whether to forward log messages to syslog. + ''; + }; + services.logind.extraConfig = mkOption { default = ""; type = types.lines; @@ -754,6 +763,9 @@ in ForwardToConsole=yes TTYPath=${config.services.journald.console} ''} + ${optionalString (config.services.journald.forwardToSyslog) '' + ForwardToSyslog=yes + ''} ${config.services.journald.extraConfig} ''; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 60048911658c..037c0d2f0d82 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -12,7 +12,7 @@ in { virtualbox = { baseImageSize = mkOption { type = types.int; - default = 10 * 1024; + default = 50 * 1024; description = '' The size of the VirtualBox base image in MiB. ''; @@ -61,7 +61,7 @@ in { export HOME=$PWD export PATH=${pkgs.virtualbox}/bin:$PATH - echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..." + echo "creating VirtualBox pass-through disk wrapper (no copying involved)..." VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage echo "creating VirtualBox VM..." @@ -72,9 +72,9 @@ in { --memory ${toString cfg.memorySize} --acpi on --vram 32 \ ${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \ --nictype1 virtio --nic1 nat \ - --audiocontroller ac97 --audio alsa \ + --audiocontroller ac97 --audio alsa --audioout on \ --rtcuseutc on \ - --usb on --mouse usbtablet + --usb on --usbehci on --mouse usbtablet VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ --medium disk.vmdk @@ -82,7 +82,7 @@ in { echo "exporting VirtualBox VM..." mkdir -p $out fn="$out/${cfg.vmFileName}" - VBoxManage export "$vmName" --output "$fn" + VBoxManage export "$vmName" --output "$fn" --options manifest rm -v $diskImage diff --git a/nixos/release.nix b/nixos/release.nix index 5412080cca18..46dbe4aa77b2 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -399,6 +399,7 @@ in rec { tests.radicale = callTest tests/radicale.nix {}; tests.redmine = callTest tests/redmine.nix {}; tests.rspamd = callSubTests tests/rspamd.nix {}; + tests.rsyslogd = callSubTests tests/rsyslogd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.rxe = callTest tests/rxe.nix {}; tests.samba = callTest tests/samba.nix {}; diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 4c0cbca21010..4d3479168f70 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -17,11 +17,12 @@ import ./make-test.nix { extraServerArgs = [ "-v" ]; serverConfiguration = '' listen on 0.0.0.0 + action do_relay relay # DO NOT DO THIS IN PRODUCTION! # Setting up authentication requires a certificate which is painful in # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A # WELL-CONTROLLED ENVIRONMENT! - accept from any for any relay + match from any for any action do_relay ''; }; }; @@ -41,8 +42,9 @@ import ./make-test.nix { extraServerArgs = [ "-v" ]; serverConfiguration = '' listen on 0.0.0.0 - accept from any for local deliver to mda \ + action dovecot_deliver mda \ "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + match from any for local action dovecot_deliver ''; }; services.dovecot2 = { diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index eb705536827e..788c8719c8d2 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -26,31 +26,20 @@ import ./make-test.nix ({ pkgs, ...} : services.xserver.displayManager.sddm.theme = "breeze-ocr-theme"; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.default = "plasma5"; + services.xserver.displayManager.sddm.autoLogin = { + enable = true; + user = "alice"; + }; virtualisation.memorySize = 1024; environment.systemPackages = [ sddm_theme ]; - - # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. - nixpkgs.config.packageOverrides = superPkgs: { - fontconfig-penultimate = superPkgs.fontconfig-penultimate.override { - version = "0.3.3"; - sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9"; - }; - }; }; - enableOCR = true; - testScript = { nodes, ... }: let user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; in '' startAll; - # Wait for display manager to start - $machine->waitForText(qr/${user.description}/); - $machine->screenshot("sddm"); - - # Log in - $machine->sendChars("${user.password}\n"); + # wait for log in $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix new file mode 100644 index 000000000000..4836419f0c2f --- /dev/null +++ b/nixos/tests/rsyslogd.nix @@ -0,0 +1,37 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +{ + test1 = makeTest { + name = "rsyslogd-test1"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { services.rsyslogd.enable = true; + services.journald.forwardToSyslog = false; + }; + + # ensure rsyslogd isn't receiving messages from journald if explicitly disabled + testScript = '' + $machine->waitForUnit("default.target"); + $machine->fail("test -f /var/log/messages"); + ''; + }; + + test2 = makeTest { + name = "rsyslogd-test2"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { services.rsyslogd.enable = true; + }; + + # ensure rsyslogd is receiving messages from journald + testScript = '' + $machine->waitForUnit("default.target"); + $machine->succeed("test -f /var/log/messages"); + ''; + }; +} diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index b23f3ad42434..33ac2be18322 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -11,13 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6"; + sha256 = "0vc184qfdkjky1qffa7309k6973k4197bkzwcmffc9r5sdfhrhkp"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 986e476779cb..274233167bd8 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -2,14 +2,14 @@ , gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }: stdenv.mkDerivation rec { - version = "1.0.12-1"; + version = "1.0.12-2"; name = "axoloti-${version}"; src = fetchFromGitHub { owner = "axoloti"; repo = "axoloti"; rev = "${version}"; - sha256 = "13njmv8zac0kaaxgkv4y4zfjcclafn9cw0m8lj2k4926wnwjmf50"; + sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; }; chibi_version = "2.6.9"; @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { <literal>SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"</literal> ''; license = licenses.gpl3; - maintainers = with maintainers; [ TealG ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 2d90599346fb..1f53809e9059 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -1,23 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "caps-${version}"; - version = "0.9.24"; + version = "0.9.26"; src = fetchurl { url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; - sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp"; + sha256 = "1jcq9y51vdnk93q27r566y9qmddvadhr4ddnvkiypaq5rrdnqjg7"; }; - patches = [ - (fetchurl { - url = "https://salsa.debian.org/multimedia-team/caps/raw/9a99c225/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; - sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway"; - }) - (fetchurl { - url = "https://salsa.debian.org/multimedia-team/caps/raw/a411203d/debian/patches/0002-Use-standard-exp10f-instead-of-pow10f.patch"; - sha256 = "18ciklnscabr77l8b89xmbagkk79w4iqfpzr2yhn2ywv2jp8akx9"; - }) - ]; - configurePhase = '' echo "PREFIX = $out" > defines.make ''; diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index b3d9fd580288..fbe987e09cbe 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit, libjack2, libGL, pkgconfig, xorg }: +{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "dragonfly-reverb-${src.rev}"; - src = fetchgit { - url = "https://github.com/michaelwillis/dragonfly-reverb"; - rev = "0.9.1"; - sha256 = "1dbykx044h768bbzabdagl4jh65gqgfsxsrarjrkp07sqnhlnhpd"; + src = fetchFromGitHub { + owner = "michaelwillis"; + repo = "dragonfly-reverb"; + rev = "0.9.4"; + sha256 = "0lc45jybjwg4wrcz4s9lvzpvqawgj825rkqhz2xxvalfbvjazi53"; + fetchSubmodules = true; }; patchPhase = '' diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 27ca539850e2..b3b838c5d470 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "04jlgq1d1hd8r9cnmkl3lgf1fgm7kgy4hh9nfddap41fm1wp121p"; + sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index e999672f4ab3..034d2059283d 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.605"; + version = "0.9.607"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "10d9k7ssh4snrrjy1hb3y39by6175493cmn50aq88xby2mdy3p74"; + sha256 = "04giwp4i7j1qad41fiqlb8s3w03f1ww0p2mhi8n162sajnflr1rd"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 546a47118a03..3649a0a68863 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.27.1"; + version = "3.28.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "00qlvfwfn7kybrx6rlj5h862syw3d5yak4sjqpxvacp7i5n1arsk"; + sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index f7463207045d..a5dae1d05607 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.3.7"; + version = "4.3.9"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1x1jnbpbc9snya9k2xq39gssf0k4lnd1hr4cjrnwscg5rqybxqsk"; + sha256 = "1vir05hy2n0nk0gaqbn680bx53ixcyi2y0hq4grgm73bbb1jzqq6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 3afd73493b05..5730dec6b994 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,49 +1,61 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, asio, alsaLib, avahi, libogg, libvorbis, flac }: +, alsaLib, asio, avahi, flac, libogg, libvorbis }: let - popl = stdenv.mkDerivation rec { - name = "popl-${version}"; - version = "1.1.0"; + dependency = { name, version, sha256 }: + stdenv.mkDerivation { + name = "${name}-${version}"; src = fetchFromGitHub { owner = "badaix"; - repo = "popl"; - rev = "v${version}"; - sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i"; + repo = name; + rev = "v${version}"; + inherit sha256; }; + nativeBuildInputs = [ cmake ]; }; - aixlog = stdenv.mkDerivation rec { - name = "aixlog-${version}"; + aixlog = dependency { + name = "aixlog"; version = "1.2.1"; + sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + }; - src = fetchFromGitHub { - owner = "badaix"; - repo = "aixlog"; - rev = "v${version}"; - sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; - }; - nativeBuildInputs = [ cmake ]; + popl = dependency { + name = "popl"; + version = "1.2.0"; + sha256 = "1z6z7fwffs3d9h56mc2m24d5gp4fc5bi8836zyfb276s6fjyfcai"; }; in stdenv.mkDerivation rec { name = "snapcast-${version}"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { - owner = "badaix"; - repo = "snapcast"; - rev = "v${version}"; - sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6"; + owner = "badaix"; + repo = "snapcast"; + rev = "v${version}"; + sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ]; + # snapcast also supports building against tremor but as we have libogg, that's + # not needed + buildInputs = [ + alsaLib asio avahi flac libogg libvorbis + aixlog popl + ]; + + # Upstream systemd unit files are pretty awful, so we provide our own in a + # NixOS module. It might make sense to get that upstreamed... + postInstall = '' + install -d $out/share/doc/snapcast + cp -r ../doc/* ../*.md $out/share/doc/snapcast + ''; meta = with lib; { description = "Synchronous multi-room audio player"; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 0709917a0442..8534d871c662 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.7"; + name = "snd-18.8"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1d7g043r534shwsq5s4xsywgn5qv96v9wnhdx04j21s9w7fy9ypl"; + sha256 = "16p6cmxl8y58wa19k1z6i66qsqaz7rld4850b0sprbxjjb6cqhf7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/applications/audio/spotify/update.sh index 114245f6d46c..0e19ca1920b4 100755 --- a/pkgs/applications/audio/spotify/update.sh +++ b/pkgs/applications/audio/spotify/update.sh @@ -1,8 +1,31 @@ -channel="stable" # stable/candidate/edge +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq git gnused gnugrep + + +# executing this script without arguments will +# - find the newest stable spotify version avaiable on snapcraft (https://snapcraft.io/spotify) +# - read the current spotify version from the current nix expression +# - update the nix expression if the versions differ +# - try to build the updated version, exit if that fails +# - give instructions for upstreaming + +# Please test the update manually before pushing. There have been errors before +# and because the service is proprietary and a paid account is necessary to do +# anything with spotify automatic testing is not possible. + +# As an optional argument you can specify the snapcraft channel to update to. +# Default is `stable` and only stable updates should be pushed to nixpkgs. For +# testing you may specify `candidate` or `edge`. + + +channel="${1:-stable}" # stable/candidate/edge nixpkgs="$(git rev-parse --show-toplevel)" spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/default.nix" +# +# find the newest stable spotify version avaiable on snapcraft +# # create bash array from snap info snap_info=($( @@ -12,38 +35,62 @@ snap_info=($( '.revision,.download_sha512,.version,.last_updated' )) +# "revision" is the actual version identifier on snapcraft, the "version" is +# just for human consumption. Revision is just an integer that gets increased +# by one every (stable or unstable) release. revision="${snap_info[0]}" sha512="${snap_info[1]}" -version="${snap_info[2]}" +upstream_version="${snap_info[2]}" last_updated="${snap_info[3]}" -# find the last commited version -version_pre=$( - git grep 'version\s*=' HEAD "$spotify_nix" \ +echo "Latest $channel release is $upstream_version from $last_updated." + +# +# read the current spotify version from the currently *committed* nix expression +# + +current_nix_version=$( + grep 'version\s*=' "$spotify_nix" \ | sed -Ene 's/.*"(.*)".*/\1/p' ) -if [[ "$version_pre" = "$version" ]]; then +echo "Current nix version: $current_nix_version" + +# +# update the nix expression if the versions differ +# + +if [[ "$current_nix_version" = "$upstream_version" ]]; then echo "Spotify is already up ot date" exit 0 fi -echo "Updating from ${version_pre} to ${version}, released on ${last_updated}" +echo "Updating from ${current_nix_version} to ${upstream_version}, released on ${last_updated}" -# search-andreplace revision, hash and version +# search-and-replace revision, hash and version sed --regexp-extended \ -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ - -e 's/sha512\s*=\s*".{128}"\s*;/sha512 = "'"${sha512}"'";/' \ - -e 's/version\s*=\s*".*"\s*;/version = "'"${version}"'";/' \ + -e 's/sha512\s*=\s*"[^"]*"\s*;/sha512 = "'"${sha512}"'";/' \ + -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ -i "$spotify_nix" +# +# try to build the updated version +# + if ! nix-build -A spotify "$nixpkgs"; then echo "The updated spotify failed to build." exit 1 fi +# +# give instructions for upstreaming +# + git add "$spotify_nix" -# show diff for review -git diff HEAD -# prepare commit message, but allow edit -git commit --edit --message "spotify: $version_pre -> $version" +# show changes for review +git status +echo 'Please review and test the changes (./result/bin/spotify).' +echo 'Then stage the changes with `git add` and commit with:' +# prepare commit message +echo "git commit -m 'spotify: $current_nix_version -> $upstream_version'" diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 1097e7b8fd7e..fa5845c260be 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -6,7 +6,7 @@ python2.pkgs.buildPythonApplication rec { version = "0.7.0"; src = fetchFromGitHub { - owner = "JoeLametta"; + owner = "whipper-team"; repo = "whipper"; rev = "v${version}"; sha256 = "04m8s0s9dcnly9l6id8vv99n9kbjrjid79bss52ay9yvwng0frmj"; @@ -39,7 +39,7 @@ python2.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/JoeLametta/whipper; + homepage = https://github.com/whipper-team/whipper; description = "A CD ripper aiming for accuracy over speed"; maintainers = with maintainers; [ rycee jgeerds ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index c9fd4f9c4ab9..3de4067f55d5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.17.0"; + version = "0.18.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -13,12 +13,11 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; + sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; }; patches = [ ./sddm-ignore-config-mtime.patch - ./qt511.patch ]; postPatch = diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch deleted file mode 100644 index 6430e60ed417..000000000000 --- a/pkgs/applications/display-managers/sddm/qt511.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 005c9ad..71b46d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ find_package(XCB REQUIRED) - find_package(XKB REQUIRED) - - # Qt 5 --find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools) -+find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test) - - # find qt5 imports dir - get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index c9d935a..bb85ddd 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE) - - include_directories(../src/common) - -- - set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp) - add_executable(ConfigurationTest ${ConfigurationTest_SRCS}) - add_test(NAME Configuration COMMAND ConfigurationTest) - --qt5_use_modules(ConfigurationTest Test) -+target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 6cfba39ed4b3..a6525804ee0b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,6 +1,19 @@ { stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }: let + versions = { + atom = { + version = "1.32.0"; + sha256 = "0dha8zi4gshxj993ns7ybi7q86pfqwzsasrk3a7b5xrdqbrcm5md"; + }; + + atom-beta = { + version = "1.33.0"; + beta = 0; + sha256 = "1x4s12zvfd2gjy7mimndbhs6x9k37jq4dyy6r1mzhwfysix74val"; + }; + }; + common = pname: {version, sha256, beta ? null}: let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}"; name = "${pname}-${fullVersion}"; @@ -71,15 +84,4 @@ let platforms = platforms.x86_64; }; }; -in stdenv.lib.mapAttrs common { - atom = { - version = "1.31.2"; - sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0"; - }; - - atom-beta = { - version = "1.32.0"; - beta = 0; - sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm"; - }; -} +in stdenv.lib.mapAttrs common versions diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index fa83975b8d97..cbc30588434a 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -555,12 +555,12 @@ rec { spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.6"; + version = "3.1.8"; src = fetchzip { stripRoot = false; url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; - sha256 = "1qsams12n64slp00nfc9v943sy9bzffzm7anqqaz2hjw64iia7fh"; + sha256 = "0086shivxx745f69226f59xcv7l9xliwyr9kxm6zyn753c888js3"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix new file mode 100644 index 000000000000..dbdc13ece2a8 --- /dev/null +++ b/pkgs/applications/editors/featherpad/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, qt5, fetchFromGitHub }: + +with qt5; + +stdenv.mkDerivation rec { + version = "0.9.1"; + name = "featherpad-${version}"; + src = fetchFromGitHub { + owner = "tsujan"; + repo = "FeatherPad"; + rev = "V${version}"; + sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla"; + }; + nativeBuildInputs = [ qmake pkgconfig qttools ]; + buildInputs = [ qtbase qtsvg qtx11extras ]; + meta = with stdenv.lib; { + description = "Lightweight Qt5 Plain-Text Editor for Linux"; + homepage = https://github.com/tsujan/FeatherPad; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 23ecfb0c19d3..f5fbf1b5f03d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */ + sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */ + sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 259c319c70ff..494ad686ee3b 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,6 +1,6 @@ { mkDerivation , lib -, fetchgit +, fetchurl , extra-cmake-modules , kdoctools , wrapGAppsHook @@ -22,13 +22,11 @@ }: mkDerivation rec { - name = "kile-${version}"; - version = "2017-02-09"; + name = "kile-2.9.92"; - src = fetchgit { - url = git://anongit.kde.org/kile.git; - rev = "f77f6e627487c152f111e307ad6dc71699ade746"; - sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; + src = fetchurl { + url = "mirror://sourceforge/kile/${name}.tar.bz2"; + sha256 = "177372dc25b1d109e037a7dbfc64b5dab2efe538320c87f4a8ceada21e9097f2"; }; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index b0c834934f9c..8e99005bbf6c 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { pname = "neovim-remote"; - version = "2.0.5"; + version = "2.1.0"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw"; + sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc"; }; propagatedBuildInputs = with pythonPackages; [ neovim psutil ]; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index cccf59f3e7bb..ba68a5420a88 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.0.1"; + version = "3.0.5"; src = fetchFromBitbucket { owner = "plas"; repo = pname; - rev = "f66bd266deda11534561a01ede53cf1b71d2c3c0"; - sha256 = "0mjskb0gyddybvlbhm10ch1rwzvmci95b018x67bh67bybdl4hm7"; + rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03"; + sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index dcec9fdfef95..6d92c0471574 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.0450"; + version = "8.1.0490"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1zhggpn4i704apfqn2kqr717kz9dvkjwnbmc3ydza621zjyrnxb2"; + sha256 = "0gmlz2w066pcrn0jzpv3gk1qwx148f33gvgf5nkfy4nl1ljki81r"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6ed6326f16e5..3517351090d7 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.2"; + version = "0.8.3"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats qtsensors clipper zlib proj doxygen cups]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59"; + sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9"; }; cmakeFlags = diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 4032e2e3fee3..51156dea4a17 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -15,5 +15,11 @@ stdenv.mkDerivation { homepage = https://xmlgraphics.apache.org/batik; license = licenses.asl20; platforms = platforms.unix; + knownVulnerabilities = [ + # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html: + "CVE-2018-8013" + "CVE-2017-5662" + "CVE-2015-0250" + ]; }; } diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 9aa80fc789c9..ce2bdcbd298c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx"; + sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index ea140cad5ee5..b02e29e33513 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -14,4 +14,7 @@ mkDerivation { qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts knewstuff gpsd ]; + preConfigure = '' + cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include" + ''; } diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 18f47b7652f8..3e5bf8df4a7b 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -6,51 +6,20 @@ }: let libPath = lib.makeLibraryPath [ - alsaLib - atk - cairo - cups - curl - dbus - expat - ffmpeg - fontconfig - freetype - gdk_pixbuf - glib - glibc - gnome2.GConf - gtk2 - libopus - nspr - nss - pango - stdenv.cc.cc - udev - x264 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libpulseaudio - libxcb + alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk_pixbuf + glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264 + libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXtst libpulseaudio libxcb ]; in stdenv.mkDerivation rec { pname = "airtame"; - version = "3.1.1"; + version = "3.3.0"; name = "${pname}-${version}"; longName = "${pname}-application"; src = fetchurl { url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz"; - sha256 = "1am1qz280r5g9i0vwwx5lr24fpdl5lazhpr2bhb34nlr5d8rsmzr"; + sha256 = "16ca1vcxpka26jcrfbxpq74kcizgrm138j94bby6kzqp2swhrl76"; }; nativeBuildInputs = [ makeWrapper ]; @@ -77,15 +46,26 @@ in stdenv.mkDerivation rec { ln -s "$opt/icon.png" "$out/share/icons/airtame.png" # Flags and rpath are copied from launch-airtame.sh. - interp="$(< $NIX_CC/nix-support/dynamic-linker)" - vendorlib="$opt/resources/app.asar.unpacked/streamer/vendor/airtame-core/lib" - rpath="${libPath}:$opt:$vendorlib:$opt/resources/app.asar.unpacked/encryption/out/lib" - rm $vendorlib/libcurl.so* + vendorlib="\ + $opt/resources/app.asar.unpacked/modules/streamer/dist/deps/airtame-modules:\ + $opt/resources/app.asar.unpacked/encryption/out/lib:\ + $opt/resources/deps/airtame-core/lib:\ + $opt/resources/deps/airtame-encryption/lib" + + echo $vendorlib + + rpath="${libPath}:$opt:$vendorlib" + find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \ -exec patchelf --set-rpath "$rpath" {} \; + # The main binary also needs libudev which was removed by --shrink-rpath. + interp="$(< $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter "$interp" $opt/${longName} - wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals" + + wrapProgram $opt/${longName} \ + --prefix LD_LIBRARY_PATH=$rpath \ + --add-flags "--disable-gpu --enable-transparent-visuals" ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix new file mode 100644 index 000000000000..20c6ff57b241 --- /dev/null +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub +, libusb1, systemd }: + +stdenv.mkDerivation rec { + name = "dmrconfig-${version}"; + version = "2018-10-20"; + + src = fetchFromGitHub { + owner = "sergev"; + repo = "dmrconfig"; + rev = "a4c5f893d2749727493427320c7f01768966ba51"; + sha256 = "0h7hv6fv6v5g922nvgrb0w7hsqbhaw7xmdc6vydh2p3l7sp31vg2"; + }; + + buildInputs = [ + libusb1 systemd + ]; + + preConfigure = '' + substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Configuration utility for DMR radios"; + longDescription = '' + DMRconfig is a utility for programming digital radios via USB programming cable. + ''; + homepage = https://github.com/sergev/dmrconfig; + license = licenses.asl20; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 537627a10d2d..843257a74e55 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1"; + sha256 = "139kzapas1l61w1in9f7c6ybricid4fzryfnvsrfhpaqh83ydn2c"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 8d095b78cdbf..9ea8210e67e7 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -103,5 +103,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; + knownVulnerabilities = [ + "CVE-2015-1032" + ]; }; } diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 314f8bcece10..4fd86a5a4f52 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - automake autoconf intltool pkgconfig + automake autoconf intltool pkgconfig wrapGAppsHook libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix new file mode 100644 index 000000000000..3950e4945cf1 --- /dev/null +++ b/pkgs/applications/misc/mako/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, systemd, pango, cairo +, wayland, wayland-protocols }: + +stdenv.mkDerivation rec { + name = "mako-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = "mako"; + rev = "v${version}"; + sha256 = "18krsyp9g6f689024dn1mq8dyj4yg8c3kcy5s88q1gm8py6c4493"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + buildInputs = [ systemd pango cairo wayland wayland-protocols ]; + + meta = with stdenv.lib; { + description = "A lightweight Wayland notification daemon"; + homepage = https://wayland.emersion.fr/mako/; + license = licenses.mit; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 7068d8aedd37..daeb8b159f7a 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -13,12 +13,12 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.12"; + version = "8.0.13"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82"; + sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj"; }; patches = [ diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d97f2d2c0489..051e7139a23d 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.9"; + version = "2.0"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg"; + sha256 = "16c6fimr1ayb2x3mvli70x2va3nz106jdfyqn53bhss7zjqvszxl"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 89b4e33a927b..24f4cbfe8eff 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -4,7 +4,7 @@ let - version = "0.6.2"; + version = "0.6.3"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "0j5z3z34jc1acclmlkjpv7fcs4f2gf0bcfnvcpn3zdzw9fzj0sw7"; + sha256 = "14a0i9y003m4pvdfp4ax7jfxvyzvyfg45zhln44rm08rfngb0f7k"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 7df4007cf403..cc9133257a0c 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.41.0"; + version = "1.41.1"; enableParallelBuilding = true; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d"; + sha256 = "0068wwsjwmnxql7653vy3labcyslzf17kr8xdr4lg2jplm022hvy"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix index 6230f2f6f6a6..90639fc57056 100644 --- a/pkgs/applications/misc/soapysdr/default.nix +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -6,7 +6,7 @@ } : let - version = "0.6.1"; + version = "0.7.0"; in stdenv.mkDerivation { name = "soapysdr-${version}"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9"; + sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix new file mode 100644 index 000000000000..52e39b98a3b6 --- /dev/null +++ b/pkgs/applications/misc/tabula/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchzip, jre, makeWrapper }: + + +stdenv.mkDerivation rec { + name = "tabula-${version}"; + version = "1.2.1"; + + + src = fetchzip { + url = "https://github.com/tabulapdf/tabula/releases/download/v${version}/tabula-jar-${version}.zip"; + sha256 = "0lkpv8hkji81fanyxm7ph8421fr9a6phqc3pbhw2bc4gljg7sgxi"; + }; + + + buildInputs = [ makeWrapper ]; + + + installPhase = '' + mkdir -pv $out/share/tabula + cp -v * $out/share/tabula + + makeWrapper ${jre}/bin/java $out/bin/tabula --add-flags "-jar $out/share/tabula/tabula.jar" + ''; + + + meta = with stdenv.lib; { + description = "A tool for liberating data tables locked inside PDF files"; + longDescription = '' + If you’ve ever tried to do anything with data provided to you in PDFs, you + know how painful it is — there's no easy way to copy-and-paste rows of data + out of PDF files. Tabula allows you to extract that data into a CSV or + Microsoft Excel spreadsheet using a simple, easy-to-use interface. + ''; + homepage = https://tabula.technology/; + license = licenses.mit; + maintainers = [ maintainers.dpaetzel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index dba492ca8dd1..2d370113873e 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.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz"; + sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix new file mode 100644 index 000000000000..dd95b231bd13 --- /dev/null +++ b/pkgs/applications/misc/visidata/default.nix @@ -0,0 +1,29 @@ +{ buildPythonApplication, lib, fetchFromGitHub +, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp +}: +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "visidata"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "saulpw"; + repo = "visidata"; + rev = "v${version}"; + sha256 = "1d5sx1kfil1vjkynaac5sjsnn9azxxw834gwbh9plzd5fwxg4dz2"; + }; + + propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools + lxml pandas pyshp ]; + + doCheck = false; + + meta = { + inherit version; + description = "Interactive terminal multitool for tabular data"; + license = lib.licenses.gpl3 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; + homepage = "http://visidata.org/"; + }; +} diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 877a25fe662e..ed90689da1ea 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl"; + sha256 = "0n042vxrr52k6x86h06f298flmxghsfh2a3kqnc41r7p7qybgjj8"; }; NIX_CFLAGS_COMPILE = "-O3"; @@ -40,6 +40,6 @@ stdenv'.mkDerivation rec { description = "Unified All-in-one Monero miner"; homepage = "https://github.com/fireice-uk/xmr-stak"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz bfortz ]; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix new file mode 100644 index 000000000000..d097e0b448ca --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -0,0 +1,108 @@ +{ stdenv, lib, fetchurl, + dpkg, + alsaLib, + at-spi2-atk, + atk, + cairo, + cups, + dbus, + expat, + fontconfig, + freetype, + gdk_pixbuf, + glib, + gnome2, + gtk3, + libuuid, + libX11, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXrandr, + libXrender, + libXScrnSaver, + libXtst, + nspr, + nss, + pango, + udev, + xorg, + zlib +}: + +let rpath = lib.makeLibraryPath [ + alsaLib + at-spi2-atk + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gtk3 + libuuid + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXScrnSaver + libXtst + nspr + nss + pango + udev + xorg.libxcb + zlib +]; + + +in stdenv.mkDerivation rec { + name = "brave"; + version = "0.25.2"; + + src = fetchurl { + url = "https://github.com/brave/browser-laptop/releases/download/v${version}dev/brave_${version}_amd64.deb"; + sha256 = "1r3rsa6szps7mvvpqyw0mg16zn36x451dxq4nmn2l5ds5cp1f017"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + nativeBuildInputs = [ dpkg ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p $out + + cp -R usr/* $out + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $out/bin/brave + ''; + + meta = with stdenv.lib; { + homepage = "https://brave.com/"; + description = "Privacy-oriented browser for Desktop and Laptop computers"; + longDescription = '' + Brave browser blocks the ads and trackers that slow you down, + chew up your bandwidth, and invade your privacy. Brave lets you + contribute to your favorite creators automatically. + ''; + license = licenses.mpl20; + maintainers = [ maintainers.uskudnik ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c18f77f8f996..a011d0a892e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar +{ stdenv, llvmPackages, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -92,11 +92,6 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; - freetype_source = fetchurl { - url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz; - sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77"; - }; - versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; @@ -132,22 +127,28 @@ let ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "71") at-spi2-core; - patches = [ - # As major versions are added, you can trawl the gentoo and arch repos at - # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ - # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium - # for updated patches and hints about build flags - # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") - ./patches/fix-freetype.patch + patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch - ] ++ optional enableWideVine ./patches/widevine.patch - ++ optional ((versionRange "69" "70") && stdenv.isAarch64) - (fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch; - sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7"; - }) - ++ optional stdenv.isAarch64 + + # Unfortunately, chromium regularly breaks on major updates and + # then needs various patches backported in order to be compiled with GCC. + # Good sources for such patches and other hints: + # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ + # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium + # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits + # + # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (!stdenv.cc.isClang && (versionRange "70" "71")) [ + ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" ) + ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" ) + ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" ) + ( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" ) + ( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" ) + ( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" ) + ( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" ) + ( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" ) + ] ++ optional stdenv.isAarch64 (if (versionOlder version "71") then fetchpatch { url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; @@ -160,7 +161,7 @@ let sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; } ); - + postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -193,11 +194,6 @@ let mkdir -p third_party/node/linux/node-linux-x64/bin ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node - # use patched freetype - # FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733 - # FIXME http://savannah.nongnu.org/bugs/?51156 - tar -xJf ${freetype_source} - # remove unused third-party # in third_party/crashpad third_party/zlib contains just a header-adapter for lib in ${toString gnSystemLibraries}; do @@ -213,10 +209,16 @@ let '' + optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString stdenv.cc.isClang '' + mkdir -p third_party/llvm-build/Release+Asserts/bin + ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang + ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ + ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar ''; gnFlags = mkGnFlags ({ linux_use_bundled_binutils = false; + use_lld = false; use_gold = true; gold_path = "${stdenv.cc}/bin"; is_debug = false; @@ -230,7 +232,7 @@ let use_cups = cupsSupport; treat_warnings_as_errors = false; - is_clang = false; + is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; remove_webcore_debug_symbols = true; enable_swiftshader = false; @@ -243,8 +245,6 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; google_default_client_id = "404761575300.apps.googleusercontent.com"; google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - } // optionalAttrs (versionRange "60" "70") { - use_gtk3 = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 686e8fadec34..88b0a89db4b1 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, makeWrapper, makeDesktopItem, ed +{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas # package customization @@ -14,12 +14,13 @@ , commandLineArgs ? "" }: +assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv); let callPackage = newScope chromium; chromium = { - inherit stdenv; - + inherit stdenv llvmPackages; + upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch deleted file mode 100644 index cc380a55abe0..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/third_party/freetype/BUILD.gn -+++ b/third_party/freetype/BUILD.gn -@@ -63,10 +63,12 @@ source_set("freetype_source") { - "src/src/base/ftbase.c", - "src/src/base/ftbbox.c", - "src/src/base/ftbitmap.c", -+ "src/src/base/ftfntfmt.c", - "src/src/base/ftfstype.c", - "src/src/base/ftgasp.c", - "src/src/base/ftglyph.c", - "src/src/base/ftinit.c", -+ "src/src/base/ftlcdfil.c", - "src/src/base/ftmm.c", - "src/src/base/ftstroke.c", - "src/src/base/fttype1.c", diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch index 3c80dbcec004..da6a4c92b460 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch @@ -50,15 +50,6 @@ index f4e119d..d9775bd 100644 return false; cur = cur.Append(kPepperFlashBaseDirectory); break; -@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; @@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.DirName(); } diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c5622f0c63cb..ed3a58f62dbd 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, gcc , jshon , glib , nspr @@ -69,7 +69,7 @@ let ! find -iname '*.so' -exec ldd {} + | grep 'not found' ''; - PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ]; + PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; patchPhase = '' chmod +x libwidevinecdm.so libwidevinecdmadapter.so @@ -110,7 +110,7 @@ let patchPhase = '' chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so ''; doCheck = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index a26c8b8ddded..8162f43776da 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp"; - sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5"; - version = "70.0.3538.35"; + sha256 = "0kkdfp5f3gmzngfj1nfw023bpyvm47h94k9rpwml2kxlijswd1gl"; + sha256bin64 = "13ghx5ysl8f2iphdvjh698q4jksh765ljjrd74m6x0ih6qm0ksaq"; + version = "71.0.3578.20"; }; dev = { - sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv"; - sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968"; - version = "71.0.3559.6"; + sha256 = "1d7q8hbqbxy2izdvv4d9126ljiglsfc3w7wns3zbbbiyqa2rj00y"; + sha256bin64 = "0v6yahsvsgxcqg6k84lgr589rnx9af1r2axn7cggyn1a2lk63jck"; + version = "72.0.3590.0"; }; stable = { - sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3"; - sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q"; - version = "69.0.3497.100"; + sha256 = "0j84556r3m4igigqsx9zvw4kvbn4psfsi7m8xhcvfxc39ingh569"; + sha256bin64 = "082cf9d1wm36w4i09ai4xnprvxfqdar6cbgsxz5q5srd41mqdy6p"; + version = "70.0.3538.77"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 6633c6d22d93..8c3d7dc7a4a3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b14"; + version = "64.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "23bf5d5195c7678ec4bdcb1c4caa46e2681031213cce0239509e4999c81ad196c8c3cc77720f83154ff4f60ac161c01d0f8fb0c22655777325f67ee7cf31b4a1"; + sha512 = "6780c222879e7199a430102865afeb7959a98ff05d5dd0b153fb545d0870bbc3fbd51fb51d6a88e18d57ab71e157dc15d2631754437dc8b4d4826d4c57b5ac6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7e8983fd49deae14281a400ad15146ab27abd9e2f7b3cb060734f2538519541bfe0c20411df35baa836f62a176955edc005755b4359eb66a661e73c75e72a04f"; + sha512 = "e209850c490e90d64e715b0725bee788d3e10a727253dfdd344ff100893f3e407b10c684a4783be369f35d96c632d0f4809c353370d093daf855dbf7b0486fc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3542bceed63d08bb955cb089fc29c3d49b0f60ee5dcaed70bee27f1b340b3e34706e64079a5496c4c11cd99ff8ade790a7105b22f9a13a2aad8a0dfca80690b8"; + sha512 = "b79953646a31876e4db9636ff5a87eef3e84722b33bab3c146a68b64c4e04f02d2b0b58b4c51f5480573d77cfa859415e1b8257d5082c7c01ca8380715a44bec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "010a259bc60e823417411ac9cfc35597fc7a5ba997ae30d2f5359194720e7dafacac152def59cb755ea658d581d2a19e434c5863cc837c43d478454837910811"; + sha512 = "fa511dec672dd61a10d57963da29b83847a5b791b37f386675ef6e7bf86ac7c57aa74114c8b67421650f743d4b0bd44cc9be9ab5bd0cb5fa90403c60eeac00db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a78ded1af77b7ef20c319022d94275a8843995bbb279b3570f7d389692287af5f7e50f1a5bc3da46ab60300f5f9fe43396d577170c7bdf950bb38e2433a97b1d"; + sha512 = "f42e5366a7dedf5a113911f1dcfcf8736ff1a0b037059b47f4b0e6021e4a3dd3dfbf1f3afd9873382bdaa1cd8cc535b07a97d5e34eaa3838a98a8bb57f8e8279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "97891240277fb80a206c5bea6e9e2edf98adae043bd68b421ff92339c8857084a5261b91bb672485fdda4ccea31a5b37230a94d760fe35390dc9736e8dff4163"; + sha512 = "0bf6c6fc480a1d7bf71f2eefeddcfe1fd8ae2c6b40b369e42e18487075f3744b98dadf61a94a10989b9b606256292bf4d016acc2089014ac71ae160028351df0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "fb31a2b02c901f1b52b8a46b80c6118a2689fb4567f64c9ce963dbca2c106983a1e1fe56bd428e3aec381f85136f4914e1c57692bd4a021a5204059232bb74e3"; + sha512 = "a287d058701dad9c8f9dcd7b2e9a473471126fab1e1cc0c64eab5dd34025a4d10d74c63d1894f04ce55513c26c1effc3b8078b3d59fd85cb3be9a2b78fe76ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "2efdeae4f09e12b99528f6370e3486630224e0d5baf19df62e79a890f03c2d512c81dc60963d537c128f3749d7d9fa73f2bd44e65563261f4c3850e75a7f3eee"; + sha512 = "84c511d0fb20709cbb32a51c2e488102899a73f6c7bf17a8367ceda6dcb838a3052c3e6c92f6cb86b5f881c83398e23ff21aeb4abc6e658ad855809dde1fd5e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "066ea34c198e13ed78c4b48c6b4d751c3fda1d42d9470a7295982d9510e23d17ec0a937a49b5403bdfcfe8bcddde16438dba0879759ec362f26a4583b435b448"; + sha512 = "2905bfc56034a2f6329e8247cdaebe212cec97be86806d95f22eb0fa07e4a3ac94652b52a1e0dae4e725d9941a008f7f923dffd5679bf747ddbd645724100286"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3d25f71604d83984c0c86eb9fa27fa3bfc35631087cac1bae4ba2a773b6c870ed2bf81167633757108b631a18506255a0bc8e9dd4160b8cb35960efd987c9bb1"; + sha512 = "917f7821a7ba71a8dde46e53468b4e3a9d4a5315c9b4ae9af2ae0bdce56b5a0333c12ba44604dd7159c4ecb61a7d5087fe60d83a3c8e7734cd1a90c4aa29b259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "be90418ef58e6005086919dc89ba6168654a6bfde2dc87001a8092174e2b38d8695a70d7d1afdd75307db332785b5248e4b2d38facb6f9a7884d6483c8ab6c2e"; + sha512 = "12b515b616cb55dae73bbda075a141dbc96a38a1b2d2ad50b56a48fa58bc3c802251098c61a08105f00affcfc79b71615f18c11d57da92d78d66eb737f8a3c46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b8dfee8bafd5b1ae7edb061c04b66ba63cd2421da54780499b947b4cf13721cc8cf7ed1ea06409a6a30dc831bedbbc648ac3a123d994ad676061edd10e7e1478"; + sha512 = "c6fadf68795b0ceaa5e162ab145da5eb26006e481a9e85923bcb37ef3ea6e6d83a0333d76954f4865c4900b015806a3a3c350839eaca5d6ce56ebb3f5170d97b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "402898f9b309d56ffba067d7cf607b56b01d7df80fc8eb60fd04f6d659e4e473b3c2553238bc63a4372059d7841eded51f4f80de602104a6a52ec34cd2a6eedc"; + sha512 = "05f3ec07875e53afae59ca9ddbf9873529f2350f1a19a2adf29f205c165afcf13a54a54f2420944665a702aa9d8f738c22519ff9172720d09de6e720dd2db0e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "233640ecd9dc6847ee9a538563fb3668a851aad7ac0216c09a31c62151c31cd6afa3ce84c36558aea39ead48a85d4270f0a4bc64701d699ead668f687c0e8e28"; + sha512 = "696d279a802ee758eda15bda7b0b10b11a6f65f5ab5b8068df294a986552211c27437ee825ba7533650b5174a4525510b96cdc39fe244008de0c8c757a95744e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e326c1e011f9a58b40a026853c2d1d34ef45090a2f86d69aab46d358c2e3a42367424bba49d4c93fe92cf27c8bcc4d802084b28432b550b3c1e3098f37b72fd2"; + sha512 = "828f577737e9c767b349c0413e9fb9db6a271a97121fa1960da885592c29bed060e15cf53ab29f9c181b220a4682814879b2848ff6ccae7d5ecad5626884475b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "efc79e7384761d996a9ac636dccfcab32f4d14cdff218eb3c0161957b8a659ced0ebddd2ed0bc9dcc915ebb863ee8054b1f8bc6f16666f42421e4982682f97d5"; + sha512 = "61503f4dc11c4d8026939cb5808a2a9ff6d74e2aa8cc474425f6704608dfcf5f8794885bfab2bb9e4aa589ca8c7ba327040f0668ec3436a0be39cee60db9cc71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "89d06350b5fe8c83bc23b69620c7b6707d2e35981031783ad41cec728e41b842f990d7acfe2ba9e0298f0955f11f54d7c6551752e9f51e5b563a553001fc27fe"; + sha512 = "45cb13ac3ecd45144d898d501a3bd29dd3bbe2de22edc9bc15453321a787b594b1b3a10bd5c4c1586998dbb0b6dbb60916673c062eaefd2224c035ff23f8c9c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "103c34d736307f91e4e4343ad0b5f3ebbcc1efbca660782768ca20bc7a2cdada2fa40382f46ee57d70499529819f000eebc3e5d62c53ee5bd5f15437a18be6ea"; + sha512 = "0e5ab638cea0ee3203215777c92c519f04290a29a9b893c527ba5b8562776f252cca57ae6618267427a70e08c832ce017f2c2f25cfbac2575779fa1a946e4c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6a5e6e92fcc85846b3c92d34694e30672399d9a2821a9107f5a00942bd90e0e351ac6de435709149647cf94943c5f07fad834f7925682f0c0668f4c29b4644e4"; + sha512 = "eacbbd4eb3c962c54eb892b156d60cd4911367788c3ef8d142037ba1c9603f3f2dce63482c614a1547414fb5a2b19fbc0027c64ecd78f4661c52096a033d1b23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "bbe625995bf300b561fe55210f396d4131bbcadc33c707051b226115cde5982f52520cd815a857542535e5787df210d612493deef50df5e361108db27ee86478"; + sha512 = "36aa46f73092120b7581b894bcfec8f5ebb53a0169a5136e6758db452f5be174056a61c0c367e9701575c63477249dcb65c0666ce9b97b86d36b2287220cdf05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6b5ea1e59bca7b531728c70ecb644969a33955fa1975b7c9d03b550389f8fcb24de45d041df59e44d5a4cd66c8caa98725d2349d5b6c45da8f9cba917528d1a8"; + sha512 = "b9ed6e9f45f97df8347b708ec0ddc41fdf684da431b7d97956aa8464010ea9d4cb83ed81f2f97b71d32224bd0b8f2d6dd02bee0b74fe6c7251b8c6749f852299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ffbf1ea4c01004c435d12ae5b0309f3a60df116df371255d53e252cc3d3e220b154b9f32fc81c6868dd20108ac9d35cb79e4b2402cb62948408288d9cff774a4"; + sha512 = "4a608528c847cb4a9e37cece45fca3f88b4367a835c49bacc646b06ab89f13498f7f5d8eed2d1bab12da7e9dd416e231aa664c44ef85c0519028283a7c8d1908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "7649d91b6d454992d457a3152f066c8c76375bca41ed6101fb5f2dc700f5c5a9adb0c560b5abc5a8e21135e5d2abe577d286e64e77a11fc4d14f0a95a367e371"; + sha512 = "bbd2b19f8b9a1df28af1afccb1e115e89be0d8bc3686c23dad6c0792c647de93f896e13e87110c91006aa6dc5fd84ffd4583d3fbdd4a4abb1bb13220ab6f14b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "068297ed38ee0ebe823069a823a46a3b871528b36815324a7ef514967e2e640f9277373cf1841df5ee64a24d3909bf317ab6d6e70670c4067a2d1a8caaa4f0ea"; + sha512 = "77f3ed6ba0b07b38fb46b79913040cc37225d56909afbdda49e227fefffad70a783db16dd4f23d89f68d4c7ddb7531298e36f97d18cbbeb5288497d054409ebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "5f50d62bc6fba7dc71169e5f7c2dd66c0a654c150d29b51a33333147e536eba671b0778ed66e08ef49d8399f3b77a34f31b90cc5ff47e8d6a779bad29d402974"; + sha512 = "df6ded2a54a5df53df36fe1e81289d26ddc958ecf6a8a40a14b00d5a4c1383e7bdc77658a410eb4d906a69b926d2f30be4e60b30eee384194c5641b37d29ba89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "341bdf9ec2185e353c27e8037dfeb427c189214964766b4191e1b2b85cfd713a8ec7cd000d2f52d347a605fd41608a574a56f1334ceb8c1cf11fb51ab2e4c7c0"; + sha512 = "cf2c73fd2dc14e38ea9add2f5438fb03bf5380bd8fd49ed0ac9dbd50855bf01579e9473d4ae1b116b7069d7d58e67c61bec2b4eed53f583ba9557b318f3ca126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "6c92fc52e6b63e9fc14161d20e90d58551f7b062682fc12fb40491fead1c042f21bb0e4cd241f6bbc63df865bc28b60177508275b46f340d9438707431c74a74"; + sha512 = "f9e6cf029b1d883aab0c3550dad4f94b63afc35eafa68e0f426fba1a7e555ee4419845e7c1f1d6811586201d13c81c51a9f1dc79ff33aba41660229497abe9d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "85ab9fbf84396f15c7d3fa350b9da367aa3e13550a4f936f6578333216c828913635c18f19eda04c31ff8ecd511330aaa9b3499aa86c5113981e91de5ce3ffa3"; + sha512 = "49674a7c3aff83eb3b667ccfd9d0e58522d9732534cec334db7595a58c44dd916127e36fce51d356e12c2ecec4dd635bafa1b3b015f6f21569d0041556ce7289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "78fb7a9d8bba35aeb3ca6c4a28ee92cebefdbcf84a1d169bcdde659d9dcbf4f7770e0a0a5f448b38a9cfa4f8dbe780fd324ccb904d0a16bd44ce82ce1c51942b"; + sha512 = "1cc2f6e9c0cd7b4a4f5df8ee18b4b7e70875d3ee39e8c865f445fbbf085e63111239f56dee645f03fa0c26dc096c0cd2d955aa2c2b7fcb0f7be4c3a20863b5c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e354e8cb44f9ca53df613d40b3c80f3e1c29900d3a1b7c72ffe886d4160e76c7b692ba9e047616e1526aadae8e72050752b4bf310d73f19beebf6533a2f3a160"; + sha512 = "621dc1088af68c755bec9bedbc9ca8bc31fb8bc3278faf082389e3eb367461d02619ac78900eaf9809c1025b6fb9316d2b65f3d789789c6862fc6d5a7c91680e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "68ba92cc0e8d26177884f921239dcbfb43642cf145a8445b22e3f2d0d8b34a2755c68bfd00ba3a05763b9606d27b4a13b8bcd91553e4f6aebf3920bb64eb5a59"; + sha512 = "dc7f53c0344dcd02736555447750e31fd95c89142e3a2f0ee9c462adc417a2578d22bca743ed4ef73f2f1432c3a7a4c42a6e3d22fe815b05a6bf1f2005de8ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d140d0fdae10e801203e490b4ad6816393e88a55f1caa1b4e76e11cfa4eb48360f43331ff7c544061a24d9c9f0df91a3ddb39c0926eabd8a2a85a16aa95ca8bf"; + sha512 = "da7da58bd15cb3ea17c972977c609fcdcd959fd33d28fce3bb1d78e1510ba613203b48cb549532aceee6b3c2a7e2724be355e9347801e32e789ce27c544bf2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f9895dafc082cb31f74f6f467b59be3e161ebab65a191cd2bd8432e67615280c9d37db3b57d949290c3abf1d50911370d12fb40ac77f1f178608124f1d298071"; + sha512 = "28e7343dca8bdfe8b6e91095eb3de6efa6a8c573a2482e2ecc60e2ddecafe1a96bc0aac555bb7b7eaca681bdc28a24a04ffe6033b99910ff4169811338d87bd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "051ea2a565519497f481f2270290eddbd4f698e6bb9a9777ba49bc751b3069b04961ed67314512727404bcb23d8411be967261b3be54b2f8be2a2f4379688ef9"; + sha512 = "cf7ff3db94d78802ac6dfee4ab9fc07283d7da3a87ff46d14aec26c4a50ab66ad6fda68a867c17c23094396aaa302a3736ac416de5418c139a69422f03abe3a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "813c556ebe83639558f2af959cece13e3940ddd51826fdc0afaf7ce4142f78d07e6454dffe76d57e78dbf7e0479a64024b3720529eb032260509e51f72ac4372"; + sha512 = "68806d9504c1abf1174dce455910d9e7b06cba0b9531bbe703faa38334531a1194447cb57254e71008696a3a056d575a3280752d3317cf99ab620e8bbb9de976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b63c2db2f5c115aaf2dc4f784d0ee194ab5647e493e64f315557023241d93c7228e4a94f8a7ab9521956a1ad8d811c5b8b7adcb34bf241a0eb2ff28e87472700"; + sha512 = "6d08c8b11f7baee9895b81fc44fcce77f9ad71f45b96e268dd112735a267ee0ba2cc3a3624e66c95fc675aa01e4fb1b0b6cdfc6e67956206d14168c67adf9a9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "eef5fa19a954138a97c7f14371bf53b66eecab4e932b559cb241d885414db578d90ddbb835450589cde6ac97937c9946c7abfe37f2808c7141b46730f899980a"; + sha512 = "25d5e8f252c3c8d4068f6bf73a083ca19679debb1019c797c075f0a7d56ed50056a66c6da23a2ffa164b13043c1e8ea4fe8c569968f2d4b1dd471d6b8710d158"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "5e5ba8b843dcf7d9beb2f27482bc7269d4b3488aadfae0f55fb2cb88d78ef11734255b557699539fa91a772c44c27366faf5d004221b523636d101d6c11a6be6"; + sha512 = "f3d93d6606404befcdd8cda5c979c9ec22a0de3ed089574f902ef906622e19a88fd27200c8a2e8574336fefed1df6c656c557a29d81f9c4a25b88f3765a18f77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f69b169d9e1fc361ef762c2c6e23e6974e525b984d05d61364aaa1e08d7f71ecec333bed1e5f6e923ed19e6f733add637b6915ba28d6751273f75bea02f6a285"; + sha512 = "a781c22454cc205e33c4b3632cbcac4494676b92676889dec2cfb4b3f9a39f7d805694ed4fabde77b20d1851f6931c4fcae145941fa0a433d1d373ae264ee501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "dabbd994076fffa9e4b265724dd43123e58dbed9f2bf6875e3cee296361be6e90d293e03d7a7dc36a0c7b5e06358970d0d2da9ce59445e6dd8cba853cc7d6625"; + sha512 = "ec991b1c98d6250635440c659ffffa04365cae760576b60d7bd8600915fdce8ecb58598edf676f4736e55c0025e236121f9e8f0e9d02b2051cc636555bcb9d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "daad08e31d848a8944e36de81e01bc2d25614033ff89dfc7e9a4124e2c7c9193752c4be08240778c05a317c27e2c7b924f45c91b20de46e54ce28d030b4aeb96"; + sha512 = "a86ce563657c7870df74aa8ab176f6bc0526355f1fd3237126cd5444edc934524b008052f5df78a24f35a4220ac074a425effb586b29a00fb25989c145677191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e7f674c1588c1674f28e7f76f8a413f20b8f50a290297f045f24db0a0911e65f7069ca53a985aeabe86fb69ee8ff26e8897eaca6a36de47adb42ebcc36a8a4f1"; + sha512 = "6b30fa7cb8d6cc5e91ff936aa323874551fc5736f991d49d790e2934d9c75d2edd91a427abf269878f6d9aa1153215195ba30442bb9f19030f22ddb669cb1a88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "236f84d6ad9588d3ef8accbde3361cf89bc27e72d16bd5702925f929a7da46108671e2ec15a4daac553868433e3758d280dac5bd6e4c60676f55a22575114a01"; + sha512 = "eea36cec7a878a26fef05de7d8a8e45836478d889da001f3393b8a6c1f9e6a961a980c4f6794eaf190a89d28b56a8fb7ccfa76f810e8526cb8ff2b70d07a2aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a8865c86b1a86fe1c60ddd42ec848b1be92f686571777fbf7b874902cc07458bf5e0e5739e6afbe399b499baa38e92414653d469e9d64b26dab15fcab89ae2fb"; + sha512 = "732f1317aa98ce67a809952071d0a03b7c195aa327072a33a5976b64b2d6ba1695b1ae5a6ec9d7def16402f8f198c12a8cc313c99455a1c23c019dc492c776d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0a55d784b892c4d7704da36e8d4d173d96b594fb452e61c7b090b4d1634d4f32be21490501bad131b98bcb3648d36a08f1e6a944e6ea20f606136b4bd8b063b1"; + sha512 = "ed11cec198299d11af3d58209cb43eea08c4d16ccce56a6e938f57a998ddedbf37267251b05e983bd929cb72649d60f724c60c1c1eef45d993ddd41c57e49886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "74a645a86ad9af1a9dcb9fd8c98970deb1f5cb435e3a648f420e66d85235a7348f392f34c0f1a6467965c877b1a12e0bf67dab6e979bb1df82057d059fdeff21"; + sha512 = "1ee3ad7982470d337865782a00528f2edde41c62f693ca667cc6ff0a1bc72601b4a4e289398c2235ac14d1ed3a82bf2ed2ee0d532a0415c2bb76a1419a0159d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b4f6ec7eb9fbf8da6e1f9bd99c54c84557c29596fab6f9f75211d72632ce644cf2a103c02a4ee67196e161a2ec9127c569ed0fd47bf7d037c01c301c91bc14e9"; + sha512 = "9b159bb5b48838baeef8fd623e19eb2e801c952dd825f838e2e9c70aa9045c69bc7814763127380d77535e9dfb2256a3f0aac5f8d34b287bc90ecb9aa258a91f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8c8e175aa2f2ae57f525d4b1391eb919b847598019b1e1f2dbe27da40512293075bd87574df5490fbbbd13bcaf5bda5017d980d815475a82b3c0df4dbcc28301"; + sha512 = "c2e76476e2e5e555f706f9fafbcc034675754eb2c46da5243ad142bac1f71b3e0a116c74aa8582f7c3ee346ce936fda5d6e0f274acb485736bbec1b7e00b9e2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "9ab9458e038d48871f6c978e50ba419dd94be472f06aa42fd781b8a75a28be20d365c7828aaa674bd818b32198dfd5a075f2481caa5a7e201e7e94a10e7d2763"; + sha512 = "06c5903dde7b5a2c0290002fab190654d262f3d6c582cd60834b767dfd5987ab7c3f74c07b4b0527615cd689692b0c1e33ac4e726e6f5512c318ac229cc8dce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "0f0ba70673b6aa030d4fe415097822c3259ff7e76a0a4163fada661886a7a422ade8defb6d47ff8c49833892ea0ed224af2c2d0a95ba6bb3a25a89a990b39ce7"; + sha512 = "31579b18b37b183f5f26e60e391b9255bd4a2d7c573351a54e07aac89f91d81aed13f9998332ecbc746bd2abf40ca98e10c28845b0b9ede004ec24d488f48505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ef5065a080d382ed3046e0f2c3f5dc09ae88fbb295d457ac659eb506f5ee171a0f6554ea83e486e98f41e3e4fab0a2e47247e9d72d67636ace34844262446330"; + sha512 = "f22dc2c3fd59768eeb538b85f0a7843a1dfc974cff5f31d0589a0ffacedd227da6c249507de38c41ab9c51a3b03c37ec110344e5423c7e5b7e4709916558def3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ff46ec69b6778e9f17e0829d007e11d8e9f33dc83469beaaf0c7d99b4157d612f4c749ba0b4080c1f6384b0b0e56d2ee10df6a6e9e220935009a3c09a65ec570"; + sha512 = "35aef32e732264f1489db1cd031f672b91aff12c02ac7ea4ecd5c8583a27c8e30b6a18a572177dbef466b7c2b6fefbaaa064b8b3206d5d6df25d54391544a7e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f1df613339e61bacd632f986511f0b933857e7a24207aebcdb068d2290f52f1224907347263fb2aa121d14894a0f49bcb3b87e8737338c95a701dac5a4c858a2"; + sha512 = "d00a6a1dfe229e137e84a7becb1743e2189319052867fadbc62ab5808c8873dc3a72fbcef47f236929a6e1a2c131332dae206dff006ceb7f502073a209a09ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "94c378806ac9b3c80801f344323efa0a3680f9f7319193d176032b36f36a879c9528fcb010168ac8e7b2f2c72a78e7f30eb9f0d88c2db4d9d4e57b99219e48d8"; + sha512 = "8c4f89cbb4a5cb026c633da5f2a562b5f43bb9e0e3144d22cc56d7828fcd186031566bf7f0bb48f233c34dd92296f9059731cc92373c0d42fa296ea2294b672f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cc69f5fda4840fb6e23bca315eac82614e0987aedbd54c01cd685cb09a9737eabf75b2074457cfa44880283701b0f178c903922be948ee94638b88c1102ad11d"; + sha512 = "1de0080e0cdbd54f066d213d6a09bf1e727b410b71bcd789bd192815f88d0749e1abae41e82b6bba65759004d5f30a8c34da96d1b54a6878fedd7abb098cd703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "20d3d3a2fa0ac8a8226e242076a431072324fd9cbab2a0e15901d6f2bee3532878e8453a2460e6ce1b0d211ce409c9659098a2b02c303ca171a1857fb8469395"; + sha512 = "2936b54d148ab79f45ba11606632c607ee0d0a9dedc4b48d4ae0db97cb88f6c6167e0547fdb4f67dfc89894c4d4ec4cf53d3b71176dac7e48793e762d4f7aef7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "1ab989e25b9bd016b65b45c3361f7bb3cbabfd3246ae9395101b1316a77123a09d07c780355279f79219dfd42e3b053f88ef3a33596eea07e6eec0ea3306a886"; + sha512 = "71d3e28b8698debb941ccfa4e046124c2d80fa8e0b8293b3a710bc35612fd1cd49c5b63ea656421901bad7875c7bfc980a9a9b9f0b0e4f1d6c9277d4bb60768f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "a8cbc0b97e8c5ddba7ea34cdd2d23b4251fff3196b8709c22a0f4627709d63827db36119d707b5e1b985a5efe3ca157365e29e090fab971b5b399f5c65cb1059"; + sha512 = "43e5d3080e96fd95823400c8ae274a168c3b4e5103bedbe2359264f22ec2308ddbced05fa91ae2fdfd68c22ea0c1fa0cb7e5d4cc39d38f47d3834e4e024bb414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f1a81822c8e4b2881bbe149e709450084be843d71f4397584e1c4c1c665752a1e5f1928e4e7c1562b6c9a7a4a2f394376753c61d8ed71c65e2d9acbbe3817f4d"; + sha512 = "3b824a6b06b1ca896ddbe640b7664beaa5ec1a2eeaa17d34e0f516a1b5aaaaf6f633c34f563eebd9065ebcb0d740dc58dc262217472b8b0c91b113ab55dd6983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e8e4743ec730f999a5944a0ce33244a38d4721a9993fa37bbd2544e7d1599c4005e79bbeeee4f3cbed5385c5fcc40db14db7b07d0e68816b85b0a5d7e64feedb"; + sha512 = "c311738217edd99ffb79ddf7a75c6295972116d7e7feba29a221c256705cb9e280c7d590fb1bad0ff0b9dc8fe098b1bb8c4ce653e70d170d90cc350bc83c3378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c32ca1a2394dcb6d022319f204101803292cad9bd8210bef6c55210c4b52fd7bda257172e751554a652b6c904d53675f0927c0e10a05d0ed13eb2e1bf41d66eb"; + sha512 = "ff7823346bd78ef5ca874c43d62c19ab1fb99398507ab9784f7bf6485acaf90e794bb878ea2801de2a5b07806bb8b4b3e96fc4acb2e73f9d99607f43ada1d987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "79c2414ffd2b386bdc232adde3f79de6b3163833b91b42e6a2cb5698536378ced2fb2c87d74af7b5bb00767076a66e8cd7b994dd014a0aade07d4a635a038692"; + sha512 = "652ccc4cffdfa2f9e3dc13162647c96aed6af18d40380e8f9fd484ef80244716d5052718d49f4e0b806d8f953d30f7732b06cdf4055ec2c37d1a99e9c68cf3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0c5ae8842de2fdbec65204d409cb64e96264865b06931c0d83e3d7ea17892b68ae19344807510a660db0f7508c4a12cc846156cf07c19ff99579fdfbdbbc3789"; + sha512 = "673b77ffc28ec487aa87ac8c6d1940d0804ad47d8cb9a74e32b0068304456dad2c0ed814d126fdfd8433090c843e901de5e0ed0dcdd8161644a3802c4f9576f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "5d4dea8c824a27f9a1c4611f4d147d3ad6dcf58ff855239609dcd3b0f5b63dbec68127b6d9004b956db9992768ae9f18c4162ffea37c430342de010de3f9720e"; + sha512 = "52fcafde72f01cc41bbc1de6985b044dfc66a421aef6c2fe09f89c10d8d1472b69208c2a7b9c4b9dc8fe091dd337bca89577d5bd32198d1867d794985c952340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "69dadd70e72b441ca0d769de082e5d8bdb30728c0ec94fd173e9cdd18207a06cb819a3e0fc5a473878debc223d7c61a6cea4b9fb05c1e430d9c3335e7643ef18"; + sha512 = "b8592d02931efc5c1a2e1a8c0df73353051a69e94b5205c620893b9ceace0730f63466d9cacae9e8b451e79ae2f7e73334fc5ae35133e2df99d7ff3f227fadbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "4192cc3e34c83e4af33851de30ec113af55fdd3c68e7808a14e506861ccfca63909eb550c263a6b5297d37518ad82741e9ff36d155d27e0eb2189e7215c22492"; + sha512 = "d4a831c25b20d6ea93938003d68366e34e52b01b87d5e740f89a20ec70b142be52d624345e1779244c9c254d66557b7299edcb3ea24867b12e6fd8d47eb90138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "11bab8f2f33f277e5720dbf298a22c6f175645c3f4f8452e62eff8614fdb0959a25f5069db208521f2878cd3222744c81c6aa33dda0da883bd4b938b9a3fda78"; + sha512 = "a71249aa2fdc1d22a1e223f58d004fd18e0436e7578d2d01a82480b53212059653babeee0fe1620c2a455d854ca3e68a98e8e9a211862f599d1b3f50323ca230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3ef85a1a63026f878cf75ad2d48f1008495cc24d52a884eaacabdb13039c5f212c9b0c2fd28c8dc5bd48102bdadd98aec7c975e53f8abc028747c6c90dafeeee"; + sha512 = "175f5dcbf66405e9f80c9f62de3e2b972ac9ecacafc82fbbc1409e0bc26e87838ab8a193f6c50a497742ce2c334be24f200a6085e8a256838920087ef2ba873a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "b91108f3e30085becf9bac0e743d5e84129f8713f31a3fddefdb05433b269b16b05db3d4751928010f135ca975d4979e6ae0c8a2ab465be09908987ad79fff63"; + sha512 = "e2e16db2580e030239018fa34a3c50695fe8f6c94e8017193d6a9e2127567ecbcfa1d87040550619e894edf3ed698e9789fd506a0f386352fddcd31314b0a9f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "dfe613dc9a749805202c762de75de6d16571e37a9f74594bd3011c8c62388cae10b4556031094e8e3dfe7cc6773cdaa03532e99da80499b24ffb4d98a3bc6ee0"; + sha512 = "e659cdbd3a9cc2f9bf8ee18a5a952e30cf1216097d4f016d86d3dc1a0adae29189d52ecc3acad78333ae213216f5b6a4f76dc407ab53364271e3e7b570050da2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "cbc5dd229cc5f33350625fbf6667354a21c8ac63b2afb0c256b7c507a2ecd9a089e577e28280f34a91416d1dad3aa5b2b787b104e26703e8db947e9c05e7e6c0"; + sha512 = "bc58308f98f8bd3290103db79bb37f3a15ed9c1133c6da59648ea6fb587235d2b79ee7374968064dfabb1dc88827e27fa7a8cae39e43c5429bf43c096f0e081f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "827b51031897e41a796f212c9377d8119b9d1d0da9b7974170ada0d7ee27111bd55223797dcbbe272ef576780c6b80e8b8057d4bb461f1679f487a24baf3ba54"; + sha512 = "c3fe7d0ea818c1dae682fa9c35899ddcc7b878e2b12625cabb76a001ac0808875315752fa8bae0a83d455c902a88a86e44acafea26cd4d85cb531a5cc8aad8f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "6ad998087dac027dc02b0157fe11b4b7ce9d2f2f3c923853cd1181557417e91e43e499b83730a5201060b31e30c996fdbd8a3b7c29b263f68c377c34662e8783"; + sha512 = "35bb0b6f5a5a3f6d217dc215cfb737eb2366b12399884d1f1998e4418ea951ffd7d39d5fc6970dbee883b8440c4b965e013e361fefef3b298bbba303c1ee3481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "8da84ebe54eba9df2b4754bbae8911570f0dff51d41e07b331ff4c0cb6929ec7835c166f0d0dbad1987ee0692d88dd41d3fc86b749b5b5144b52b2530b822379"; + sha512 = "f0e4befffe8ca8ea9a420d891d9dbbab4ebc8eb538158d621576e46e6b05a47c2aca815af06c2b44036fdb2f5db3d0cb0d8afad964a8beb809ff1d9c1b6d5c05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6ddf92d42e02778060e3ad6c9faf08187ddd0926fc85f8904f10b5d20bc57a243b61db0ae42c57d264c345d1b5bee51c7e6e62e207c8bd8edc170d84d673e87b"; + sha512 = "bac1a1d713f34aecf4565c937ebb90a8f226aaf6cd12c1682560634ea6bbc53462832ffb08fa5fe65215014b9efd52eaf5608dd47f30dd13e5bf56beb00a51c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "aa7ea0983b12ecff3ba235615ff2df5323fa979b02486506af9de83cb4eee679c90751ad43ba60d71ef8d30c39882e69793f266e79d45070157b097d7d12db1a"; + sha512 = "5b08de1128c10a5408d699d68512f72e54124ccb6b43b3e6ffa49bab90e47c823fe6044b85b58c7880c942b23bdab1ee24d8219ca54d9fdeee6772b546a825c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e28af3020417ef5d42b1f48b18310fb78c6ea33332ad2714c69d8979b4269327b76e1c7e9c55534800d8a3c4937bddf95273097ddcd4270e67bb23366b641584"; + sha512 = "f4cfd768a38c12e3ed45a36835ec2ea9674b726553cae8755e45e8a0ad20d46b55463de8fdff493068895983b7a816b5213977638d61bb5e57f4acddbf1c2ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "efae38a659b0d15fe1b1af9fb4d860df2796705df3c11aa51369c6844fcf24aaa342ff5a897b5d2f3be36a929f3fa748646e99db6bff70876e43387f45769b14"; + sha512 = "3dad284cba4bd414c88d96e1ad5e8a62ff985f1a5dd4408462fef3c9f08fe5855c85298dfe1105d99fd812b6193200444f15dc217d62b300e052018cdae213fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "1b382086b6e2acab4298ebd6f80cc2585878c30f48a264e9501dfe4bb503818ed84d87e4e520f646a727ebe6180ca3a639267297ee4b463d5661cc61294f91e2"; + sha512 = "c2c783cb59688602c7788cd17dd5b04901806bf341280f7368aff672005f1bf1e2cbdb81f22fdc02f4eb41cbe9d4b76c47bbdc5585fc97caee4b5119ca5c0dfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "6eff37c77266ac61e9fd28bfdc7a674bd9ca26e30c1cc4697e0e48946e788b632291891fabe11d602727db931af1fdb56467f20c362aab555afd6ca9cb9eb690"; + sha512 = "68d8225e5873d7328c0d368c0d03a8b3a219ba40c80d74f724e50ac3a1f513842576d14a2af44f10cfc209d782aca94ed17114f97e9c7c495b61a2d239a6ab93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "bac168bc68b214100078b88d66c2c88de66e23f0e456bbddeaa371a5a64a44c831281f4443edcbba49af34c6a1a5677e43d8a5c56d69ebe63614d8b3badd9799"; + sha512 = "91119b5aa441e79969eea5438295e2c9565f96512c834787976d29a2bd8c619d243a500ac065ea64073bfda845382e20e8fb117972ffb9167c927db232343849"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "2a0c42e62eaf8e23ea423fbd9f8995fd4c42c8c65141a537c51c8157861a8d9ad38912ca864824d52f961e752695739610bc626862153b091b9bbb1e83086265"; + sha512 = "5c4404793e0df7286eb529f6a1e110708dfd2eaa0cdc08bd0166dbc8b7cd467e708a6fe4c2ebca03facf5d18f4d6ecf0d0113e7f9745a77b46cb8cebed4aa5aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5839b61e1bb4a74340d3068c13111ada01f38d60fedd9e64e78770ac92340f025f1cc92e562686a12b65fe1f17ba170ed925ea2e53cd4b70e0d2f5a1253623da"; + sha512 = "c4b3f9ace0755c3b19edabfce85a2bc281797cba9d00d5bea3151f40d196615b2d6e978b77071fbccbca1841632d149f946a486e02b8552811fa339375ee1ea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2787536b263be9b7e0fa9f9bd91286b544d83468bc7cbab64ebb6c3c4e3d8ac7018e7ffa877c8a6b35718cffe190dd9ca96c3e3855029eec636dccf25636d3b9"; + sha512 = "2a1b4dc094025c95ac5f817f7915b5bde481e7d0d98a68af7a232725ffd0cdfe6f999b601d94d09ce85de3f0c60f9f9282fd9ecbd873996dfe77801ae3b5decd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "835bc4e3710394916c23ad066969364cb3ede5bd671ec2d96cbeaa448158f0048d4a33d54a98add87a0471253932f1dfa2cae05094d04bcd859846e6027903d5"; + sha512 = "24b5fd14fdcfcd1ef1388d9630985c09b42e633eff9a2201e5b07f8d5d95a0845d09323d52d9596d23a3e3f54696a1c33a038445522a3c96d333df7c57a0eb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "ec44a791fd197df0f878e69592aa00eb8425515e072628ae857ac15101d08620023dba0f30eeda14baa8c6bfacf343c22e3e8c344576b413e32cca218d6e1001"; + sha512 = "260978083ead7ce3e07ab02b324ff1437850a327ad0a270b3f905c975516e676e949f616fe3ea4ce324de2d33e14b6cf442bf7d22611ca4e29cf1226f5c2bbeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6913e130cbc2e982a39e88656e15793e2583ef4686132588e5b1b101af1e4aab53124732b64b46eac2d2df43376b2a65fac961c6120d05158a44e3217c315805"; + sha512 = "bbaa90b245f24cba9a829adec7e057458cf830fe29879ef5be31b44be602eb4899eccae2b8b7fd32ed58bbef371440747ac9777803c806ddcaa1723c314882ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8469bbbe04052d1fc120a2748997376f397359bafdad36690bd7c498c401c4934b278e1d1e57d39c1869fbd4f3a195247aa6a339f49e8b17f9399c21253901b1"; + sha512 = "8a143bc41243c7a79c6001d1f9fed8890226ee111433a6fbd1d96170b8e31ee09b589eb36e6eb4a2895b94b020fbbedce01fdde68a1cdcd849911fe5b176423e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "048dec7d7c0e2959176ac19f215cf585b12168d7a83f117a35fdc82afe8d001b7df7f84da628976d1e43dae2e6f28fed06701bd1c9a44b0fffe9c2d893f64d52"; + sha512 = "aaaab23021c7ceedcd6aa5b2f8ff43c0ba1ac8bc998c632554de0022536d42ed6c99759706ecdcb0660657a79c1f640e9474da4fadb74735c7af09da8eb9b8dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "63bcefa4ef757bde099b7661e21d241b2ee88a9b8632567b8f2e8150f70ccbe21b89c4fb6d59a7488ebb372130bc93406408b33ff8bbb54c555538cd77744c9c"; + sha512 = "4ae162266445d1a7d573368ef4f4bbd8ad87487ad1c0a94ed22430b5eee6a9e190b93ee9789fad6b91470fa575e248a9f4da2152a80145c4c1810a36a588f473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ce360ddefbaa522c5f4bfecb7e5deb61c342b0adc59a69d1fffd953dde013ab999430b9f0dbfb7ceae94e9684896d83c9222bd3460a5eb7afba9eba26447dc0a"; + sha512 = "3c4cbaf05a942e8afe7b1c95cb0a049f6aed502cbe6e1fa537aeb4835ec9d06032f9e473a15af83dead5a6a143686796f6d98c1458d33f227eac8feda696e011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "eb0c148b071a7d654ffabf62ecb1236f9294421bff913648c95fb729547f6388be2f8f0c8f771e5dbec2c446dc4b6c1db962a5abb46019c2cc0f8eb8a775b402"; + sha512 = "10d0437d731eb6afcc857a957c194e74b892bfca0502527b19fbf7eeec4ee34d45024eba3911ef1ff66575d6c48bba00e42e057558a1e085385e574d37e9ab3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a0023efdb0ff31515f51b4150ee35ae834d6f0ae976d0209ee23c93dfcd70db58c5c94ebb8f8e319690701d2364ab5fd5db03ed7a151fd33875787c0478e5eb9"; + sha512 = "49f10d817d5bbcbcafde66b341bffd230d4dc63e1a0addbf12785e1a0526880fba6d371247eb51e224cb58039276c05a698a8b348ceea2cd5be4c63e9ae29931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b850af8723d3d32fde0b938fb4f7a8734cbddbbae34881deef09bd537d27275d553c107bde3aa97c3123324f8bd0f63e7dadacb9f85b38859bd30a5085bb1511"; + sha512 = "4c2b3ecfc85526a754cfc8ea3be9efd13b4cac14e4ed66c3b35c353862c2f2b4df17c9c2a00d1f670d0aec382e4132dcfdbe71d65734f2b34ec964f8d5623ee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "57bf9bf93df74d3b8549aa706604d9c49c3157ebe9f23fc4fc0a221f9c00d2e60570055135fe4534ad5f364529e6918110997d5ff2872bd7e8a78021a0df32da"; + sha512 = "7546c56c5e1a20c2e0b9d615cb8a8b084036a6522510a97882c2e6464b7265c4852f813961a821a6fa5eff244db7cdbda8ff49fbdc91c7a8928e20f969b7f351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "067ce92c82925b7b5e9bb74aa98d59b4d7828e47780790634941f6e08334822bbd0751d783d7ae4a0ab1058f33676ef94fe15db7626e4b0aff6c514e972689a8"; + sha512 = "a0a4fa36cc1804f786463e681bb1474f94921611d277d8f24cc2cf20e98b24244d897f7db59e81e645ea35c7dcdbc57efe12c78ef14242c99b9fb5cde0b05989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "cc6b9af7acf4d5d075cd53f1bbcf433a379fcaa3326f483a88ba7c44022aab53d4c53a2620b94189b2034c5009d2cc93c1fce2e0143c0d3ca0469bc00edbe8a1"; + sha512 = "eff49b74691e348768d489e5913adb8916bec7533d28623181983972f77844384819eacaa4d8e6083001c693b180a95957854a0a547d5b41517c4fd392bec9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "20d87043704c605855962db40da5b66514a0920b396f815e4ea091769c6564e9226f6ea016415f1f99ec914450a9b364741c32bdc84a12976902451e41b16463"; + sha512 = "64acdd41eb15cf6d25f09c21f1059ce42effed27e09907439397e8da27c9ef123901c9185651f2ac89e6b4c026e6a7ac08c4a8c363766b49a5a44132275b975b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "d868cf388f5748e282eb6f276d318babf7e44ce8540fe6a13aedc04a7cee8adc85597e5b95f72780fbcf17ef54cd3b3127742e18ded91f0d6b08a4b9491c3d19"; + sha512 = "e0181679697f610f5af5f096e6872b9ca4c4f814e1dac6f045913a83be681376d5019988c721ca0bb57b86d288cf7bf1e19847b4179a1781f957891ce452ae49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1d874e55ca2994701c7a52807ec518e46cfbf16626b174e0f3e6cbe8827a885e3517ff709db5fc66c98c3859384d87cf839f7e72655a0d8d769f4db9cc39e666"; + sha512 = "f64e8886f5adc2e40d0325bc45f86b81b475cc29fcde180e07bd0343ce88e199adcce00bfdc661f185afbc3f3b40d4518abc0f6787a446fd189abc27991728ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "91d5d2a53d8d85e59e9ad4ca9dc0eaa931091f6f267506aad095c77b71be59826cba00de1814d2e78eb95c869ff0c8bda02676aef290b4a8332df0d066fe94a6"; + sha512 = "1f260f205c63558d31a4de81e51428b93c389d374d8591f2152c301bac623d27fa1fa56a10754e54b372b6d389c24c04805dafd99f1508210662b71024349d8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3abfce359bfe5cd385417d2fc30a4af9bd705602b3d902d51030a12ca6ee9086ee7b741a07def056a0e37c767a5e38f293f0d52a48c8f6f60458e74ee73cd300"; + sha512 = "58d824350995bfdd4152d5f1080f4d0fb99b0976c717dde29cce6b3830f1ad1a1ff7631946febd7ab56ece00dbb4b6e6f73751503d64e7c600b63fe6ecc85d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d79566a5c6889421e66f189c86dab9e32c377270b2fd70e1e128810dd391c651cd66283045c8b0888520f7f42f4d98f03274fc06dda0a1dde23c3e3f50ad91e8"; + sha512 = "9e27cc3e2a55c1f03e019f26f8dac0400a86b81993260fedcf612d0e731d721c3d4b0a152d81e0499efa14007fd6b6823f3c28fc97aaa07c3a7db11dbeed2c45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "6bb45e54027839ceb0f8ece8a5a3d49ced35bd4f391385a69f5c26f191e87e9f06f9f59c2471ec156aa38a23cae38dc3996967946d12e88bd98743e15d888edd"; + sha512 = "ffbe4274423cfbd1fc4bcd44548d83c92556fc358475c1057fd16ac2e693a344f910aa4190eb8edceb05768fb634e3ed3838be40745100a66bfc8ed0322b9046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3707d12351e2c7f1d4c793593ae2773625c4342d53a5bb32fd1a1f52d85c504eb662beb995894a5b2eca67753d1db1988a247317cb60252b95dc1262618582e9"; + sha512 = "af21bba6a92856bc028cdfc4c2ea8e6225e73f5c3311bc4c20db8f0a84f93e84dfa6b4c24d5155d0e43dd664241047654353761e7c46cb659315b63c60ae43e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d18c2cde2cf0964d8a52a68a3f4e2c9ee8c6239ea7c642ec2ef12bf2024dbc15c125a9ce2c49223c826114714c22a27bb831b3f5dcef0680646212cdae6849f9"; + sha512 = "01a2c32b5fe56d81157020fb1c48808f29bab23a8782f69e5f06e530f92b2a33d3ec1e4130df9ba8ab0fe61ef9f13f6d6cf30540af40b5ce104fa488168afb1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2085451b2deee6741ea6e724ffcfd373118dc309018e66efec6364eda48b05d06836819d86a23d623ed584de547e9c55bdc11ce5a2c4e1d44d64c442d3bef929"; + sha512 = "c921b35e3f6c6419dc1b8a1168caef3e466e7f5937c10ba8c3eb2568423b6bf358c61b97b9500fc9422e566404bfa9d4897b8dfd040a081b2e2921aef468036a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2736a45bb91407cf262973337afbf8d2612890b82dba65f1d9c83007550809464a60d3b74bc33cde23a23afba0e2cad905ee96123dbe791d14cb4ada7f87e1de"; + sha512 = "89bac25afc4458983ccbdf3fd13052fc014be74815e943d1c5c3b30bcdd30cf81acaf63025a6dd8ec0daa9bcb5009826df516fbf65a4245e94b4bb746f1dc10c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "7ba928225062999981206972559f6c52f9367d714d38ea0d7fa086e2f1d9d990b336ebfd0b7d1b08fc06cbb386f89dc5c95d8e136a393c7568a0b9198c0fa6df"; + sha512 = "79a8dc595dfa333f98e3fb33b1a1534f535876808469ce4534b27a68a804e61e120afb40e171c6a5874f3aa46abbb38278008eb453daee0fd1d1d8f17d076b44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "92c33e5139b130fd9e3e83614443ccc2a189b19cb61949a381e259dcaf0dabd66b3b127446abd1117079cbf4c584c1de0398dacb1612285db56f5a4f0072cc90"; + sha512 = "4e20c698168c888863445abb7f3cbc1b57b69a1a80b5fcafcc5cb8efa2a7a3dcdfad6dce2969ddc1ba62beec2ad3aeb784132ab8ef79e41505af733615a8a19c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "bc34bde0506218c0e4251b22b1849d05b9d49ccbdaa8df650f56ebf87f04172b8adbf2204709f182b286212bdce08ef9448e8818dd2622bccc3cd9496c48e111"; + sha512 = "8e973f0694a10f1330d2652339d1acf1e6853939596eca8ba87f337f9ae3bcc1bf34f24771b73cef634eb3ad62e68471d818c55140fcfa90be61ec445df735db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "8fdf9e385f94357aa7a08147585d02e7d293d7c6155afff3da92ee37475afee222439f4d93198bd24c02d7f8109bd6842426c65725f19aedec9b38c8aa088627"; + sha512 = "ac017ee280d1167771878aabed612a42a58390339f954351d9972594203a966eedd10a17699b0f04a6651a0ff3996f5407a341f3643d99dca8cdfbf9f47781c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "f95d32c4dd652b35102cea1f9791713a4dbf40cf985c33268ed35f3e5abec87a46d304cebb961f8a80d97e4e26ee907266502f9e6d1f72741a018a29e48544f8"; + sha512 = "03ee3a07f0efb6c6adbc1224c9b1872f68b2099e51852028302f5a6904c264033cb0642d530fa6368e15b8b108af49346ea82a46b4376c7adffb2890a353cddb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b4909593c8c99530b791dd40381e891f4ee61c0473a0fcf44e0c5e5ed76e4424930747ac7f479b21d977e245b0b53b2e692a43931a5d72ad16b65f37f8726967"; + sha512 = "ad7a6cd81affa6d5009468ca1e301b05396b335346833225948e2f64a32993f7360f190a13aca4bcea8889658c56ce7fe1f84d9b9af7eebb7c2b79769a159742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "43f40720b91f6de7323fcf866b032ebbfa34640ae9786198f87f0e662c1e33d7910812e3c4bf45fcf929d9e2d669f7ec4d8f10cfe47d1fc82c5654b4bf2b40b4"; + sha512 = "14780191d373277f51e6ce9c06327df17c4bd324e5c12b4760a43de38bb3d36f733d92b5f83f01bc4633f11ce7a51b0bc8babb1214fe36d61c7611ea7b50d516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "a9905e192147a4bde8b97f26a63f08d982fbb05fce96482084ffad7ef8aa54355cb79859ec8e095ce49497e2c24ada38fadbd77e0e31ac70a5fb6632bc7d31de"; + sha512 = "8bf6c014c6710e3a096238bb76eb862b579dff7a798c2a4aa8a3232a93efe92741330580769bd16e17366746fc1dfafd24152260f996851a45f9cd684c848d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d1275cac1c2c1e98df38d745b6d1673b341198d87db6bd767ea8e2fb4f525df874b3dcf9c000e4ebe196bbd2a0707af6ac3fbf28f4b21dedab78cdb89d6342da"; + sha512 = "e1719cbcf4c532ab484c5aaf3a766d27e4a409aa38d9ceaf2dd52bd183beaca2954e392e8faa66a747e02e21813a4b8e3f9a5c6d7bd81ce321df7811fd529842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d40af9cc9212d83a260d42e1c4e9dc1102253cea3090f8aa232ffcf97b5fe417252b1360f126c97c44d9f333187b896883cc3a8de77ced1020805d7bcf1980db"; + sha512 = "1f9ef9906988924c254a44c796a935ce5ea8cc40dc033bcaf28b50dcec8e90451ae09f039586d1ecc72b5e839f1cf42517a01d0c9e8e9b7c81f365597a8d6dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2e2dd4c1f5c2f53f3df2510f88a1e73f320025871b3b1e4e08f3553c51a1f41b8974f17754d705c2939d84442af4b4e6e0f2f09b35674bad0fe14dd57415d191"; + sha512 = "946334d8ddd8f7c82226db0d7cf838e2b6208cdcceba251beebcb9b625b6f3f684c6b9479c23e743a7a1eafefbb54eb4e63685256f0ef5d482e76fff55691e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6fa7e9d22e7c379325de750725b25e31ccf814bf391dc4f7ec30c226d64345c52d07542d05d4d096f1feb6d75da37fcb3028a5cefce7a4a7bcb72cdfe940cc1b"; + sha512 = "f8664b184607f5a655a96b60bc2a97f641c15dd299448d94cc8b630ccec7009d7c51b5e0d4245b1c0eec4477f2217ad54c1453ed516dfdf9fb1b519169c313a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "0887354d8e3a990cb3a2a1267b6e6e60084aec7bea75f4839a41834023f327077f36164dae5317da47fd333223488b903c77258d73fc1077bf411e1eca860b67"; + sha512 = "67339f09f046a4f72bd5a2e79dd5b53876521f5761eb7e9963a1af0acdda507ecc372fdf8e7ccfea96c3ef5324fc06faeb5510060d3840467db03d1f229c07ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "53ce519552bfaeba90c00e108a7af36bbffa8f6ca1f580abadbf441ee29a40bd93d31ac65ba3c875e04299646237ed4a51736653552d607436ae177d5682c84a"; + sha512 = "1138722e998c0d09b5e6bc404833e652302e7f4774ae024238679f22fcfc4a7acaf6e3bb88c5b04f331c457ef18b70451e485eda79377acab668ad2369ec0e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1c23a2e28c7c14da5f2c0fd30525ec38c1169e8433991123c8bc97145354c8d1ecbbf6df0430b89e981222011e27b0c5b723af093ce640c8881e0b9e5b231939"; + sha512 = "eda0706887013a73e7e310268cfc327be64efab22764357dde8ca8c7ccb26c388a20cc18fcd4f5de284f76541894f2b67454e188d30958fa7f2cc541af14917d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "9439499f577858237dbc39c6cdc20a87276cda77d45e14ba5ea7f090cabe6813d7fdd8b77a32dee6a98fb880f421562a861e98aefa619fc44b0c4aab8b522b4e"; + sha512 = "8da5ef93bbf2f7d51b11276b8d3fbde8cbe4b02e9db5f95d5158c0aee0a20438dfcc3e36485c61410011eab6ad119729c6ec4e4aa3565176255d39e71434741d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a04051d0bf181a02a04e2c36b8f05b38d7f3eb6188c5977ed965776120a692d8fbb1d3d2ceb38da8768d201f27c1b36995f68b002a9261fce8786d34aa2265e5"; + sha512 = "b375d409c35829aada3e66b6e610f4bc2fa0e3907416dbb18f924dab4eeaf40db65d9d5c470cc63c84b9e73f901e15fea0160f0e63b6b2cb469152519e50e863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "2230ee909e8cdcc10d40939eb6eaeb5c8289c697e2d0a5e4a25a9b1345fc6b49c9528e974212ca3a5aea3e54c8c8948ae56a2232bf0d207e82658ca2dfdd82c2"; + sha512 = "68bd243d3bd388f4556bb66595a2323d5ca1b4c8045121734d40bac6250dc3e83c40cffbcf28f3af439c0b43d082a8e90ff3b680dff4bee1f3ddf6e3bd59ffb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "26e7a24204190fb43a972038c1036e93e2fcfb68be804a8189b0006ef8a15094e152659206b1fa9b7f0cb5f9409aa4dd769fd675fbebbc90f323d28b0f3d58d4"; + sha512 = "7b8c047120da9174585d8ecacebf155d02a3e6bf560b3ff87ed32e718f253a566bcc73439560ed3d922e410fcbb094e5c34d766d8a665ac1da8251a2e836c83c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "9a86d804c199c530dd7d41d4ae0d72604f85061a594c5cbbe1de2daf4860c4e36831efe00ccdfb6b5440c88575a6d4bc2d786396f13999453729861ee723cc9b"; + sha512 = "c2d1f066d5b65049961d8c9ee9e12b8f0ddad1e76f83b2a13f670c56763db4b7e06a5dc7712e457e5c08d135113a3ef97b90efa8ca377a66eb9ddd2c3515a670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "181c0a83a5bd7d7fc2e80948704f2a466057518c5a748a54e43bbbc0fb8aab37bd7a1c83892af60ee359243633fb8317c42552121b4e0ee476c5bc7fe115c0d8"; + sha512 = "fc54a4647c81fab54f6c28d59d51b9303eeec2cc7c78bb20a76f1b9fbdfcca10a51a42735a93600b390dfd5592121edb8a10bf359fcf90190c93470f5393bd6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6734e4572f50cc7cef74dcf63994ac5ac2d17cb0c2a2110a99cf0d5c38cb3075f72fa21561ed9ec98dd860c39262bf282c3a82083e436d1b160a3d15dfce3a51"; + sha512 = "45dc3b8b87cc6b2fbeca18a685e3e07d676af25d2d9e2987b92040b0f055bb29388fec3689e670b6764e7df0c6945f331af9555898179119f4b3c0516f0fd773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "85382c13dc0a828155142805b83543371487162821c1677e5411d8570dc8e1393479116a0e7bb62abcd6e0abe477f0671ba2c2c600bbf855ed32ed86f1aa744b"; + sha512 = "e7b955cd2b6cfb30aad321af5d0bfad7740abfc0f7935800f3fcb780d107c15976526a25cf3e1a6d567b18dd360af09362f89e87cbcc94982c3b46a93e57291c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a2c071e374c3dea2da8dfb4e1d7a001ee30bc33c3702d5e352427596dc03b36b734767fd3bd72fc4e3323f99ff88b475a1d7deaa8d14c47921986b4e3b6e9454"; + sha512 = "d302e756531cb2cb9116d3266c4a7ddca9875c7d8e92f10d94046059805f8babc18e50d68156f4a4a9b637af4a06ef80d351a70e46781fea7eac3cecec537d34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3f92ae32d51baa4dcdc13322aef8653da33fa0bfb970c3a58e5cb4297d90f8162f2020902b3f3bc566b7e5a07a317c8eb51a7f9c737a27bf043e56cee258d523"; + sha512 = "354f803dce5f9565c582f11357c2436b4ad2fc795ede74aea5d38c9f7a3d446876b4a71467fcabf1808fef488ad391cc3b063506cc696539c4af61aa70b00dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "eaec68e83af4a68e8dd1e7ac63097811c4c1a84fc577ec8c4ed9cdce72785fd2d99e4e534257f34a4ad53254e81a6c56711cca9f85cabf1fa8eddcd26ed0946d"; + sha512 = "4f18d88beab0208a85da71d4812fdd01bb3006d9230c1dbceca2756ea0b27242ea97a76f12b3c99daa51af03b1fd3866351b0cab621a4bec369c16ee8bb87ecb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b0264932f94862f6b4629f1c853e6207120234dc030a298f7d5dd975f9fdcc357cd9b8bf38f46221e090b1f63aa7092c3c5005b3f569a937e8d6ac69a941d4bd"; + sha512 = "04268d69d544b5bb4d5ec48b8debfd09a83f3a0faab08da16b6b1c643c1451c89e8c67c3f02a05100d21319cbc27feb09531dc87ec3a1e5cc7ed2a7ec8e77aa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "a557244b523d64db01ff42209e48fc5ca21f603916339e61fbadbd74a59477b9adff021a0f47759d5104eded00a12f4b008644279c19cab7a45cfa9a9a3494d4"; + sha512 = "76dd116eabbe4aa6c7d0b4e0dfbc45f4b057f86a06d95e56cfb9000ea38fe1d88b55d2b2fd885a88027083d930195fd8917fd20da2f54d7461dae707ddcae6bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "11619898aa4163d6ee42e178e58b3d25ef8c9263312a1c62cb9e2c0b9516150ef9990a971594f8b1f1421231c4a03c3337d2aadc292150d384c085a1c012cb96"; + sha512 = "6a9e40802e1574175fe1b062205bacdd0e3ebddd04987ff690d8991178911d74ac7d638f19857bb2180545689d8ca641f073458df7dc83311499c176b1102f7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "642ac490b5171afa96f3363919e6b5bf4e16ec65671b36fcc543f7e160bb0d595bf271606b25ebf1bcfdda5fc3b3ec5a088a766d52fc6b72b72a1bc5d107ebb9"; + sha512 = "58fd25bf8319cd2ca6b46ccb3f6aa8e5e9416a6cb229755f111a8e7304a806aa2aac3789bb666ab4ea2d63658eab79a50c3c11431e87f2e105ea3de584de9fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bad1ba5729895d622c0a452af5a0b34b24fd332a386cf27d71505ce1e9a0cd164671b0ed6b4c4c7befb1aeaef75f3142f73ade1dd384580dc71a3eb382f221a2"; + sha512 = "781d7c01208190351350fa601424132eac394c6e6ba0f0a55e799b59a91d4e743dec4bae8a973e384977b76d3e064b62a2162b6b0a025b05b7635cbd424b18a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d8b89350f75d4cd6f33e2eaae4c3098462ae319f4a7df6674239992bebfbc961b9e60a2cebec99488e1391fe68b218663822e8c1b773f63c6fccf36fd57fea46"; + sha512 = "a3287a85a1549015c8f1c5c125bb3296da2da07505a961425ea0b5c755f6c6709c26a384109f700992f4d50746b441d4470c39dee9c78be1255f031d63dd73f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "835550054ecad1bd4aef10f18b805d9bf1726cf7ccbdeca04696c73a684777cc51defb1e9ff7fc67a1f37ee99a0b5adb553078cc7a83e95ad6d87ce338c9bef3"; + sha512 = "033e88246db1c1f1768e032d58c8b24f30ffa541a86e1922e9cfe0cac8706da67da3951d596844f1ae6eb9d0ba8de4e6d787c1d1e918c38a0c57989c48327d48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "cb6836604f5159d13f883678287c340ef01118980014ba9e72ad4c17d86e10349a5b44be1ad0c0ec14e789a1b24e47580236e0d298d816a2fec0c5c02ca0f19c"; + sha512 = "436cdbe1d1da1f54e3e48b5f439b73014aca425984e4ceac7834ec22754d07b3d3f1449df640cfaad75c09d658df5b209e77fe830411c0be560abe74e00b6148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "119ae4627c1945b00acfbf03b43e97b1b94ba4d80ce71e277a6e23ef5953bf775e575236cb16ce4d4e298007f02fbb1676fc0526ae44564c87c8212769811587"; + sha512 = "f6a50c0b04f7ecaec138947a2cc6f942230482ed7f3ffe353cb4a5298f4161042aa0a99b1445ae7dffcaea1807d0705f93949748ffa8342778d8a8bba8319b48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "aae23b11eea3a49054c0ce4e9e9ea9c1200d9414599a6e9e993912a3b64b5c94c2819f1f9f4b65d6ac8bdd2cfc0ff125047cdceae286324db33174c3d6e7bedd"; + sha512 = "bcc4d9fb87d255aab901d322ef3f05242d3899c7146a34cb36e9f7e49091ed48cf81f7a1388ffe2a3ff55465121932b9bd3fbecc9eb1a032c9dbf535b95ed236"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "aa88612f31e96a0babbd08ca4c43db75a869cfac1020176bcdf00125a7dddd0736935a453e277b6408a59d3b21636a3c60cd9e40bbe9098c2da31aae54d790bd"; + sha512 = "7e3ac04497b122a18e78f144423bb7244c91cfe3cb0c1bfef98885f779d6032e1f71ac9a36eaff66889e043c8b28e51c2a47117ca573e426abe15815b3e068e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "25668686e42ca15bdd7dbe95380c95b907262ae72c3758fb0993e077326c183e1af79af4bc9d33b7e7d8dfb142d92618b1ead67a834d01e9cbb3fb346f139b8f"; + sha512 = "383e4442f5f78e8e5e0d4d4dcdc302d92dc8e95957393ae77eb88a93278cd68c0df61fefa1255f75bbaa53ac47fbb336dcce6aea455750b50c210b8919c24686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9beb520fc3da468a73d0df7fb8ea937f05107191167fff8ffff2242d4db6677d4ad1d4d248170ab55a6b31365b5bf965b17e0a52d4c3c748cb0fe62f7eec85e5"; + sha512 = "50e3b0c10c6b9c02e58649c29844f78c202de2de0bbbaa8ec3d7df9a802f365fa01d9ff99c3baf5ad58f64f0388ca9cbe8c49d4443f2971697e6eda10bdd054e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "14f5bc56ea03912ce445cdbfea2840fac886bf048587db3230bb03e2f6999050e532b27011c1d83995e74885fc0cf870990773df564fa3232337a13b4951d1a8"; + sha512 = "6b213d33cc2f66f6e40dc12aeedaf5fc2b102a810324abb0053dbef3af230b5241ac76edc0048b01b29f108bfc7c40e77f6317b0b3dcbadf6eb3cacfdb7d9709"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "57816fefb3fb9024473723c1e53dd769356d08f7cee6fd18f3a618707d7c474b71ece7e0da9b61f9dfc8d870db046d29a6905330248cf4021e538cfd93684761"; + sha512 = "f4111d085f8fd354e8c85b6e92987bfdcd71f778282b7bfa8c6d74f59786a3f2bd7a9bcb9c358c5fc905702d94800ace03d2126c964b8cd2fd2f421713935c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8ba70aab5a6407a5c4d4ee301b0f5d91c02cc446b1543abfc9ada2063a53d6c9335b6523c6a35abe45cea142cbce92c86f0100a036ffe69932b587cb16caefbb"; + sha512 = "0af27d25809a5e28100d0b65b66964edda6fbb7799b7d7c5954b513d0ef58d4800965459a8740908c6b184a6c70493f8adbc8f258e9c5a1b5ae6c38c0d56d71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ce9cae447999f616bdedc37c45ab1bba851ba8f983a4b8b9b1670d080521172fbec753377c7577818144fe297c9a7f81b9ac3cff5f42a216b089d40b035a9cbf"; + sha512 = "1ecf18b33ed2ea28828882a0a6a876c0489555e1f6430625a56a81f76a81be96c1b3ace5f3c4a55cf1555e9d3e0c3a0e76f680f0f08605302c9a4125401eeea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0792d7a73fa37b69be10f65e99184c6bfb7de72c493a06d2a808583dc091f414c686b9274335b532d6e371024c069d20200d0454dbb4c4568e46cf6c0fba2bf4"; + sha512 = "1eac9b077a7f121631d4378cf00fe9c131ace2fe7eee7b864c32bda99ccd07b415401a14470cc00d466f5c280ebe430ed1d3bc46fe2130ff4d5819124855d137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "59fc959730efd2e78399984a3d0ed18d653e92bc2edf8a37b055ff715e66672d8f938b128fcb9f5a5c932ea8d265a509f1c16cbed7f054449a4f4f2fd51c42ab"; + sha512 = "c5386dc11f5e5fa756e0b13d5e2dbcbb2dc8d99494586494932c3b6ed8ab920cf56ddc1062b18106e58a83013108851b64704756b8c3a5d9f4a04ba1fa279a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "575d9b2e082d5729f09587434965b383049375771029c188f0476e34bd21e10fdfa20d766cb934c567602f6f38d883c848c8110f6a42f9f62ad258c478ec0f5d"; + sha512 = "0c77ff888ce71d4da366f552d5e6a586e73a31eee53054b9c25663c8602c353cdbfc09f0b4a0c0b9a91b042eae5a31a8bbae0227efd5d6b1bffa200c515ff6f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "712438e519188f19bb9786c72a795c030214dfe02995419934e58276a4b5b22413daf0ed0c21da4849c347c222f7d22b3bd9a95e9cf9aee6b5e94e7b950ce801"; + sha512 = "52ce683a996853aca8d0a503b1407b88daaeee86fdff15da2f67bf0b7040768916f92eec1afcbe306ad1966e1a0f126207a5db9a0fbef2b3883c5d809cf105f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "8bf978cd1d226dfb74e9da959da105d6cf995c1028c1cd2bbcdf09c93ee300de6eb58eadfea690fb629ac93bd49f85cbf81b9bd49390af6c6e54048e0191b8be"; + sha512 = "d1055d1018ee47db02d85eaa72c1106d2d87bfa05f424b1ce01b9d59b30705835eb41a256548039728063427ddfaf7afbc82bc0b6881d1c4b594ecf03b79568f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "47c20810081469552659ae2d845c292db2dc447c1974dd768544f2444020127df85d3320d7cb25225b8dbedb4e3015009de9eb7b5aaa1e7a4298302f527db32b"; + sha512 = "893a073304d6efbd5c1827a95f64e8b2f55987ea22c598c68f75dc4d30ba71d056270cd83cb35545994c084d6766f9fd6b02bf5c377e7aaa4f8eb14a08e3bfb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4c4feff0c959291112f30b952232d50fa78e4d05e715fcd6c34e26d26ee7629545ae46791d04a8672aab3bdb19024295c94a6fbf2b8b818346107378016cb72b"; + sha512 = "0d17f3d3c482f434f848e91dd0e0fca1073245187ce736d6518c709ff9193f37a9c8febc3d03ae770775d3f39838d25d6ac8070cb3421c86b42a280b0c650276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "980910788cd4d38db52374cc399e90315b0829e741c211ce0d225289c8e763bd45df45b09ef4ee0228484a7a33c3ccc9d05015ede42eb427b2336ce09747649f"; + sha512 = "b19010fcb1f5c0bc078e662299a06a75c7a99076cd7d4100bb3c313a452e4b96ed3c795dfb46bf33182c59030c28d9f3eb75c031f0349431d559e7720da9904e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cd2f42c3ac9daf3fa4ea83467926ba9b08f718847eb22847be933d561c485791f1befbe04600a87bf0c5bc9016864c46c85add776f5e6c0a1586437fb57a9532"; + sha512 = "35e3599b5264895d470c546a3a91dc416bf1707dbb6f7d4b1b1c13ce98864ab432136b768eb273edf606085e026f3de1bb7b2348c1c908a197febaee8a9d2682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6f1f8fc6aeb632a9b64b86c38ca38ed1baff443ca2594506e7b899c422a9bb38d02ede49bfbde255ef2ff6d0bec55d4f42d05693459b4391521a2bb5971ed6de"; + sha512 = "b67447ee34562d2f0b6d1c6b5f5eaa10b22797acf29ac0c5d55799511db34a2d1ef24130c7a0ab7dd846cf0eabc2cf5838b21afbdf5ca0689ad012e52e97a4cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f44f549ac0119c680fcc345bcca64f5cfc6211184ba4cd02970268bcb26a9ba574fd402b4f6c0f979d0585ab53b63997adee54b3ad681637323abfeb13c5b0cf"; + sha512 = "10c8c19b45550d2c6b7129afc72988cd803308433fdeb6f97d36cafe31cdbd69989caae92f14353de6dedb56ac0b78529c8859cfe12651677213ca9fa5780ad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b1b2b02937e7eb609dacc7fa5328028b91ada27ed0402354db6e9824afc6d0a51fbc54a65ef9e779ee202b6f900950393ec057c1486036a6976894f35d0a79ca"; + sha512 = "7da68387e0b8451dd97c8565b9728249bd05ca162bc8da52f3ba8cc7d5bff944b7da7ea2fe5a15d13a38180708a510d3f8011ece96bdcbeafbd14713953de437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "04446201bddec281e7f47512490aeec2f408c73f6f075a0ca354c012266bb96f5b5bd1d226e75cae470229b4b2b3ab6aa2b2fe48040a10d576f6a4647dd0ba45"; + sha512 = "0fcd853afefceb8cc81f32187f8bcc81e499ffca12b33eaf5f6dacc1c4f3e1af7ade7880431da60606eb382f7ba85a6721e1f29691d77c3880fd216d8f2cf545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "09099db984cc27c86a0c86a0d45edaf6e4028cb5d946fac90022e65e18736e1d048137e3728338ddcd465075ae77a863e39648c08a173da366071168aa35bff8"; + sha512 = "27ae7b43d97ae119ab383e85d95b325897542dfc207b868fad098cd98a0a61cf55020801f6a64bc72086ad685a204dc058f77bbcdc821cdb823552beecd30474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0bdfd73251227b87ce233bb482d2b690cf462ff0ace68533a1c69689894c109500e8fbf76e51a20ce086d59a0cdd717b0605bfdf906fb964abf9d2c2d4ec1d96"; + sha512 = "690e5c12da34c29a39289f2c863d0f1e36da16f730c832f09d7b52fabcbb940077f906981d2ee1ce854fccba708e23badc13ccebcecf36fa72ab17c56cbc011a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "a6c55d4c646fe6579901b29eef484c5584c4f35115d3820280ef45d5d45a2e95e6f9dd5167663df2cea9276eaa4d3bbd05cb9550cfa3e9b3d3f1741cb1e3796b"; + sha512 = "60bd5d1489326bc6cee765a34acce16206b111abc400677d8cc25a5000422fead636ec71f4848752713e861726ab80a53f9310b8148f834b6c2a839fcd48eb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "934276a4b149df5d511652c8a0e159a5f9bfb1d903e09d6ea171e89463d00fab344944b90751d28f4352ec09147f6ba02fa018311e4d0bf47994f3be2ea4fe87"; + sha512 = "4168ce2d6dc32fb8f013a4fde2924dcf26ea7aa3c06ba40a90356715f55d2201e78a7b04295c328972070af26d2f2fac856de5b8f613f483d0ac4cbb86e9849b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "8e1cdc427310c5f8e26d321f4b741908e3413461fe7ad54b7a18ca9e3d93800fed87a907e0e4c5f689c4becdba3066ce22f03269cd668e98ed30efe577d9f3f3"; + sha512 = "00ac6ab02669dbe2792fd8b75756b1a1436b8282fd7c0b5ff8ad4d64108b516003bfe893033e4c862c5f2071f9a580abd18b17fe9f100ab8b75d3829880d860c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "de83fd739c30a7cd23eafb0ca2e0abfd55c1ba84d0fad159f99489d948205b4cf5cbc71f929b4e1ce1caa03f70b67465564986fdac1c0ab0e0a21df99849c5f9"; + sha512 = "ed7299ad0b5717aa4cc1c3e615ef66bfcfa20a2c5e840b1055ca40b39643a37aef624f68c3cfcde2d3fb8ceacbfb18be771970e669dddd755a877a16bd09bbc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "588be3d59eeb3413f18b642c392af4431141597598ad8e9d9625231c0831f62b06d591a997a68711d042715f939d57ef4bb7df481f3b512dbaac0e29ad46d55b"; + sha512 = "34438a89adb22ad924771fff06bd4440f7ea35d7c34bca1366104739d8fff1f1c00e5de2b4ba29004b3ef946a747a2a60787e8af2b35c20c5cef36c908a45136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "c261aaedfcb393c76ea74b0c0ad69a8df90530f9f39d49e69d6639cad3d9255090180880fc70e650b5301d7d1480517aaf630502fb6a750fe9fef23d4e25fefd"; + sha512 = "c7aaf7265f7322d5648eeaea7a58bb6dc89f09b2b0fce5d03f3996c01792642941e6b3116f1deba5d300874a44af06a3b1eb062857ffc85f5a6d87a983cbee74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "bf743378ace07a33ce50752ae804a4fededaef212d38d102f3374f53a7ff794a777397f50e202e952dafd04aef88b0175f34af69b1265b347aac8c48f923dc54"; + sha512 = "d1024ae51c997c8da657a94556e130955e0a133f41ae6d81b34626646781134c9024d03f6be5ef6d53233c0fbfd00fe9fb3aba25b7aee0edf7f583a8f01a66fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "61dfa74084c99644a38ccbb81ee0ea634fc067a27c6ddcfccf57d9b29ddbb0315e48dd17305417ad580f3864cb3be65e57776e34b7771d21f55510104e5d58ca"; + sha512 = "44b00d71bc8330cdb028cd00c8bf33957353e4f728fb7d36d27bc7685f963a047d39c2fe42d2817fc8094e00696cfdf65140324a53a7b867a11bcf4ceeebdba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "43fc4a57484f67ee3e93373c0bf67a6b2c1989fd3f366d98970d68f94c1ec6514a45cab77e06c54f61a31a6ae0d629ab37157373cc56bae1752158db4e4bc648"; + sha512 = "39406db62c4c94bb2f4b9a5ce594c93846aaf3110af3ed754a2b90d4f357444235686560e6bf413edb5c7c65d008d66a00c4f8d03f8477014899bc25f1c28176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "303dcbe422e52be5276d98e062e4a9b46eae0ba36797f9ed1566899ef5c2dace22244b5449ceb042aaa75f72138d19e3f8c0b920541f36fd5df7aeb52d0bace5"; + sha512 = "ff4b51f5213ae9f861602536db0118bea6ae7f2a7bd9ffb997e22993b09420ef3c1598f489eac28f126d3c270bbf1b7af62f30dec9b30ac93d889e887ea15fad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "75e73332122afd1e86060c57d0c0987fcebce290d0591b5661571514523d746dbfb43a55ba1ea95f66c91f3c045f7b944e14f8d65a372104a9390e334ff900cc"; + sha512 = "2a90179db419253b37c1d46c65f86dfe06ff2c226daf7f1a889e9b8de705d705de18fa63966305841ecd28b81c1a5b7d39a7a7451c325e3b79f0e376fe5a0664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2b6f03107cb7e1724a48854e88536809b7e235e04e7cbd7454ca8f2c952b83ed2a004e25f637f22690f4c9c73eb12fcb35980fc1e7cf4f53aaa061ff8a6066b7"; + sha512 = "5822fe796a8f790919ef2d7435426b75e755989ae5f99dc765ce018898fb7f3ce3ab8c26b76db8d6eca5358936748dd46c1d74073246389c9b3101f03d5f9c61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "aa6e8cc7181ebfc77c5ead071871dc0fcaec2a64bdc2aed4ef22ad43ad81b18aebc4acd600aca7ac83f5acfe1fab07154a9f15bd4e189bc787935d3d0777c291"; + sha512 = "f58ddfec45aeca8af38f539e3a5dce572b3fd7347d7221b964cdc15882ee8a6d2df17d4673639c126b9b7d4db823e5f8e2c12ddd3bdb5f1ad07de37e407e738a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c48abdd9531a39d3f63f8db2d3bd6aaf85c0f4d22d0297aa16734eb67d81d653aa6862ec7d48557e29c768f0431fed57ed2a83577719d8411dd0410d4465d35d"; + sha512 = "87a098da5a149af265424a6f43d8f992269c92caf2beec002077c0a0a51487ef7cfc1e766b0f4b50c3955d9a47530df51dbf7fca6983c103092e58c035a2f97d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "7d2c1faf418662c762a227c04b3b23bf0e7614001c94535a8bbc75d2b95e540de8f1ed059aafc224118550fca350d459cb74d398b0cbded1aaa5a46ac6198bb0"; + sha512 = "b9f742a394ccdee8c5bd1c4e9ad9e78719a27a4296f7ce8e634e9a8d2123a6d8f36b4aba3b4a1d812740bdf19cc93d08b89623e3566543f8da392b124a53ee89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d63443f220ba1c099385410e458033a0132110f26b511fa1b9d5f157dede1aadbd958019cc25e47f70cd0b30f7c6f0482427a5591a8b0c714efc46851f787091"; + sha512 = "1f6a53e855aaae8eba829915de95aac53fa43d5ad3058c41e099a87c233dceee3ec8f730ae0b7fd0d8c06ef6539cd7bb82890e202c6a5a13a46da3d95f3f361a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c52dd6462fd950c0a120cdfb721234300b84812b10fde3436f35c583728e5a6d05153eb30f9bd55722b48fc047fe096f8a2e63870a33b25c67e73477355b7c40"; + sha512 = "08113daa78aab30e470a3b388a9756e794277aa10d5ff8b91842122b76506d2b5a72e87b32462ac84c7286723dfc997b9768eeea3395ee38db7afc9c99a66795"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "4a4a4a26e17f8d49eff0192d25afb02b11573dd4970a1b7ed6033695f4ff92ea7d0b417cbdea8e8677b8572c23d84878d52752b603ae3abec23a87436b13b9ec"; + sha512 = "834f193d8fb2a4552bb95e8d2e6aa0e6713f2f5450f19f28a247c544cf86e7d3490b405e1355a956d33611e2d387020a16d040f127e401f57b5cefcafec054c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c663e5c4cabdb0328fff7847e510081c8800ea4f05228874cfc97dec3d88bdb539eb0998bd355cc5e229c8763819c3611d207c2f1dbaecb2be8d4f418f9b2f9a"; + sha512 = "313fe1fa9118476fcc417da6191706657c4aa1c2bd8a9058c0b8a908dd99093bd340516aecc400a485abc098ef8b6af4768875bf2901ac7d7c56cd140bc023db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bc19998a6e0f25d9cf96b22dd4ad8d131cb230d578a46b255478d658af83fe5ed5d2199adbe8118f18059734e644fe3658313df08978c25a785c0c61087e3344"; + sha512 = "297b6f0c048c3c7c5754ce0be1f2e166818480b3d3c3c50f568f18e1416b7df5039b726060a11973adfd21c7fb1402dbc82599c2daa177207982e5529ce4031e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "317fb7ad0a8974b691a713a37a7a4d9acb9e22a9f0d542afe64cfe9ab5ddf5f584b8607af5deefbb46d5c8fe1161124fa73f02aa8df1fb8b77080b36d5aa6393"; + sha512 = "08855eb50d2db6753b42085fa948cc146df27404ce98b33d529066d37c7f6e74e14deaf05a654360d0e47bf78927d3a40df57b8839f0503c18ee93d71d45e971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "8a65324441eba950e4312eb9850d0033f3c9add390804141791a2ff39c43fcc042f2fc97073ed20dcd2223e67360c7bbcceb105f8999bd79c1b857c71f3288b9"; + sha512 = "bb8a13b790d97c321a1d8ba17e89ecba580c0a170226ee1c3a9181ede94ab9b974fd4b10f63627c4a0cea854aefa99d6288678a2d0685e39d806bc3ac4d11e69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "665a95603538b594c4fe6d7b3607a83184e69720400022605215e229b4f103766b02083499f4c0c3c0d30255f478db81c4d0bc6ed93c0991cb7ead7a102c8dd6"; + sha512 = "ae66f62349163cd5a506117e6e823b75ccc55d80cb3227284d5d42a76e7b190b6057a693b98751f5ec7897afca220795e4a74711363173b92c389ca7f4132dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ad7aa47085404415b7bf99142480c5a4d2b2688a98b2d9ba904e383da0e25138f9e8992787a4cfdbe3830ba2f7ef777676e0700d4611a6e17bf0be76c8991bed"; + sha512 = "4d652e220438babe1695ff144008eab854dfb529c7fdf6ac2381411dbbe3a926801d0919ceaac50ce30b5141835edebab846ffb2bd44ecb0c735a386bc49adab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4c777f58eec33a68e1c10088250be80d018f54ca47d22d16db37f6e26a294e4bc7ba6551b1674468df2e8db4bc0f4c531b19efb8faa254782a2a34d606e59297"; + sha512 = "65fc1a5e20e0fcf0c2440df4627e0a79600380fc8aa3638922a7ad10e6d3e0a50bd60d99ec69b4d3040fdb37869cb2141594bef5e052949ae01330166bc8b901"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bc7801da3a0d7374dcc11a44c967d8752027bf8f8c921dd6ce1c52bbd6a198ac0fcc61f7fe23985ab7088bd2b7fa4218e3ddbe0e2429a35f7492a788fe9c299e"; + sha512 = "38702b51bbde6c4d73c78991eff55a3228db540fd3e6f524a1bdfaa7c8092012ebb9cc7621d933dd4fa0bf054edbceca2e7b642bec8e223c8f8dc611f26257b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "6e6e0d4ccab43555b769942e26f9a60509270e7f90350997237cd00d717219f41b5993dfb1b7a55ef1a0c3bf5e4dea1e25336ce604482f19d1fcdcf0a07eeca8"; + sha512 = "ba13c463bc1b966d7b3d12f1c18eec4fbc6dc9d17a618f5b973afa116950f324c9c224f4807c36e79e5bf27428b47c886ae9c0e86ec57c8f6e48846c51ee9ecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "f25f9f16af30b9301319de38659f2d046c5a03d7d9c027a9aab5477d5a65fe46218721deff5d635023ba87bd4c493bdbc3002707c120e0879abe72c87a9f08fb"; + sha512 = "8458f27bef11639229dace0403d3750fbeccd8c7232b42aefd0aac5a9bbe8fb9541523072c6274795637210f889e9b1f86dacb94c3622e62d890a27c4b24e8d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "8a8bb70b56db334606dba006ca4863f7c09d9ba546ceec2e5fafa5eeb6944e66e795ef4837933be871a4f5b5d63f8c2f918136667b955eeadab11163aaaab6a2"; + sha512 = "54dd9d15abbdf9ff1d0f48cc1a3dcf4d977e044471066d8bd1dabe953dd150b16b132a5c09378defc1dc179aebb43cd1eed8fee8130ffd1f92fb686c8d78389c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "3cbf6c26c1831f8e7926bae33c380f84f278c1717516e08bb2cac98805d5c4bfcc67d8cd37ce2116224b010d1f6198063e4741c4ad82b9526e4c042ac40b1941"; + sha512 = "7c52cc72839ed80704e89a0cf6b35c090c18bfe0bd5f55e5a562bf13163f2f6920cc3d4aa6bfd218c7d264d5b44bdb400570e98747592cedf0e191ad0fd00660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5288f4186b731c82ce1bb3edca0321ccfbca69882f0e2fc728c7d3effed36cc4a4c01f79d51fc52be8cc1509c4d516de9d6cbfa9add416c36a6c90543fab1e67"; + sha512 = "9caf08219db7531732250cd1584d8c914965af4697363c722398e815e1f1fb9c666bb9983d8581b10f84cf03ea7bb215d2560bad653edf1d285a4cb9da29692c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9cd0537802f9e1465a9cb55a5929757631b14c2b61b8ba701b8408a274ba35de95a7df1d1b2af22ee2a3db9ef9d106b93ee6698eb411ff67bb0f7b9a56cfd454"; + sha512 = "a4224c57508466f4d23248e607d53f5b06b5f498a828d7e6bf81b4aa60a74e91237c53343bcf9c6b12c33df23633d85efd4a65fb5fd8b8fd1d624a335f06e17d"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index fcfa88a755f4..5cbc37fbe5bc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b14"; + version = "64.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "baf8a78f63e7fe6b09ac1d5fc4cab9d51b7f43f5dd747c569aa9dc17380745b306a714ce3c166ebaf48f180a62492e15bfc3f1e4d597bbbb766101a9a984a68f"; + sha512 = "39642bce504c68c2ebbc7c5ae42664f1b7b0da218e58a7340d28abf639d8c034b33603146070006c914a19beb9e2659fcc3e2023018db36fc51cd7405620756e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "556958203022beeb2a091f347bb02dc6815cb8480dc05c92021d8b8290f7eec632baca2e697d476d63f52db5ffb62546f52b696ada1163e39abf4afee1d73792"; + sha512 = "8a8f1335e91a510f3e884fc19e2babfbc279135392d4d527dcd634cc3f08a7c914b13ca8439dd3f9a7fedb021b13b4a79355b89c12c38280c09c78e11aaba64c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2ba5e5a9d5a4aa80f3fd30e85d2b94aa024d14d13572433fcf148d3211b9400a08c899cae57359b4ba09b0038d5e867e4266fdecb5da5a45ff14d09a38f864fc"; + sha512 = "f8589a2bbe767c61387239218feafc622c786521d6435c7a25e587e81dec365bfbf8381a46345a5c96ca3ffb3e27eb5085ce3305a95f76c7d1a05a4fbec50600"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "866c25745a7ef818e9293bdf3e5c0d64da71afe6f63157a3fa0ef0712cda2d1ffa6407ca2d9d4e240977f01fd71215fd9446f23a850c012f5ce86eccdbc5e3e6"; + sha512 = "3ce0f917a1dd3c8aa624b1868acc213e45cc0208e5020beb4264d288b017d573f634bf0a98fe9ea9023aec42a3a468fe13876c1a8b5ad17295a17063b38e3623"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "15bc92f11b42ebe01a1e3c908f9567807c8cfc2abb67a29a6bfa90d59f4835b01ff6b36272b9db1f6e5880fa7d38fbec5edbde7a7444ecae74eb8c429e89c8d2"; + sha512 = "5fe875648ba0ded96cc065751e23d687c22da8cf708283ebe96836afaebaa74c38e275dcbfdbb3a9b0959071a682d21714fe313e3d458864d0d6e22414014e8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4e8b4f5543dfa4f73ecb4b18a3ffc10ac1a50cb39e67ce5077d78eb95ce7664f261663051bb29354fbef8e8f0ab0213f1abbbb4aa7a9b6d313baaa787bbdcb7d"; + sha512 = "0b39ba80b1d60a34e762b89ab0639dacd0785af151c11b38666706f4a3e2a9e902b5c7917e31275a93818453dbd32557ffcb71160a9acde09bfe01ff507aa212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "211032b7d21542900298ddcf7157a7d40991a6337ee51e7e646327eec8464b28e054a8ad8a42003c998a5010427c6f7618405ea3b95dfd0e484f73614250936c"; + sha512 = "f02866a3a0881eb2f63677346ab45b6e8b9d7f1d3d15d2e2ee088017bab77ec6632cb73a1983fe17b5ce9e5376d43f836087abd8e277f53baea609872c907245"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "985f1f45357ec1579a7aa84bceb2450f5fd8779e509c9ce8a01138f5c4b840ef18195ed1b7309e3d6d436e9002516c2f76a7a5d1081345b5a1893fcee43bd123"; + sha512 = "c33b9825759f0375bc65d3139b00adcdde6c89fbdc1e2f38b552374042c455a1512d377ff60bcd294848f85ea03631fa0b5cb2278ad5c07dd83be8760d53f09a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "2294ca16c22477953f9bb75c4be3914822c07c19cf7ae776d4108df6c3bc3333bfa72a129645487a5b245cb5c97a3ddfd225079be5380d2a9433e98d165022f9"; + sha512 = "90977c309a39b065425c93005717a97cfabf78734a20c8146e763ea7af49de4a51d49a7b20b061681130d19a911f4d4f9ddbde24f3cbc546b14014a4550619d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "99f1fd21abd3f92d73daaaeab5c9987728c7b852505e6b92a67cf59efad7115aa4586e34d37c77e4f5a3011c5a82bbf927e9a918c723221a2b48d64d650d9d3c"; + sha512 = "25d6703e8c02bf65e3f6aabf6a5a6f31cb375cd22c299ada483e9a0dd075eb57798d40ae4b1bbfe72f6f4fc78989b9849d1c98d540fe5f7de235343ba1e3231f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c1ee3e532fbd6eb047d2de9499ac1010d9ca2d4b4b0c19845b3d248771022d885e4c3fc159d6ae37820186bb4a2031e1049ee8af219fcdcf0873d0b585840258"; + sha512 = "b89cb442136dd3a28cb30cff95f31e24ca43af11ebcb23e16a7e3fec1d2e9f6ddddab9c7a14304a52b52a68a520d0bd6c7ccc34b4835953d2428de84c2cfb3c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7e7b0c3fc861aa4628acd0ea6cc1a4d0b5015ffe2b02b8ef716861f1ec97122f1ea4bb60e7bf3c287ad77cbb91836513b6e073f88f8183800a77afaa2693a833"; + sha512 = "f848cd20d0c550896a5a791ab0746ed7a0f52f065563d42e0fe4489982978cda1ed0be5a1425166e61445dc605db3aa8f052099434d91f81d489c5c3bca6d5b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "6db4e06f0c4ed652f983415009079b7a92b73d715e4b5b629cb4962c533a9080c1cd5129f2d4f1d59dd9118d0d715ed39f76f976a50b0b2235ca220b5483f7fe"; + sha512 = "338e2e595929b2a08e055a268357cb7a3d869c94bb7a2050375a24baea19bad6c0f381564f2c43cbd16091630b8c701987484633682ffd6875adcac480fa5ba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "cfbc585b9404a9a1aa5a94eb2e8bc4cac923c557c9c2b8f22d084c0b118aa8b93cba4f28850b6e3e435e6456e63f0c7a2c029e9269db5a55a66d597a91b05235"; + sha512 = "778e3ab1556e929cd8b3e842024d2f59558066dbb8970516017068139ce8c703f151d2ff735b091492e26e21effa18bc02dd8479819504b679f2ac9a8ee2f657"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "1e96d1e9b91147dad5244514e87c1aabb1f7e17bde43eca2c9044b8085e12228c943adb540eff283dcd5be78b319beddd0161f0397ec4486109401023ab3c29f"; + sha512 = "a3d19ffbb0e4319623de006b97c9d7988cfb3d00ccbb996c3cb12e527fde0c6d39480f00e67c27939935ac44bb8422ca8dca4d91b87a349fdb7e6165062fe3d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "0ee029b5ade528f59cf039cf63c4fb03a25ec79c4c8ddaaf9995a10572f7a26f446461d3948023c54d6fc5124200b11e331233100eccbe74c5b2c819358f0474"; + sha512 = "259e511ad5c253c9015b44e0c0d014f2b618b4c821eb5e5c1d8dac4fcaaef00255c80c401705815a1283cface8209a41550aee0a2d5c17b020a8630be2819d19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6270844c17a7c0f5e25454083acdaeb668bd76fad90b925762aefcfa3bf281116e47ab5946389e3a0791cc3ff43e1faee022e701421156e1991aac863dfd6ca1"; + sha512 = "70fe96e7d36afa26e49bc2e2cce52e30bc41f4e56cda5942364a9cc4a37a4caf8fbda4915cb1857432624826633bd35ebcb732e2db1f07629b8854b59e06fa62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "2d2b84db47b7ef1023f321a001223b30596df58ca322e6e893797fb1806df24647c5c529063b503869e0c34ad9982902a252f5a6e4151bcdeb97ec5015a2b255"; + sha512 = "017e6d0f9ae0ef68cc6ffe5fc9f572c5d7fa9c950ba5f337e992800e703d381e854a0b7379fc89ffd837a1fc2e731dff7feeb078b58cf39481a7d8730db8c4a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "602577b05601b303eebd51d6fc922e60cf1706dde4bd7d9d1a9549a8dbd960e726d58b86ecf0607c3984382fa8ce20d5cf5152a84b01484baf9dde235efe948c"; + sha512 = "9f5116f3e1d6cd87d245b0afb95b8c7d8de55603294f8cd3dc7e841ae74a6cc54cf39200fd0f1765a8e74e7d95b5de975365c26eeb728e90c2797183e26a5bca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e3ada860ad1b25dabe55d7497cabfb495324a57429d7fae70548a40e0bf613b9a8c699f109e2c93faefad774a05fac8ba59e7356f360547f38cb7fe96327f72a"; + sha512 = "0399dfaa14e453c22ca1ad133ba61358c5a88b79e36262d91e1fc2d7981dfd2f0a37266fcc8c737f4cbe84429e6ba0682551c453370f8f40167c4fc1e27921ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "efd92ecf884798196dc04121ad93a1a152187806f4b33829914a4e2034b8a131d5e58d2b2f455ca65f8983cfb39d6993e0c6ecb335c0246a20411da0d132ff0e"; + sha512 = "b5960880be96730ed01b1ad5da7625dd42d44bc9d2256d3daba5c4d8bdc52eb97fa123ab187a88c3e3d17e5affdc302e869793a30cad55080755d330ce8961c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "1933a5c39c8eca1ddad4918fd2f49b820a281d18831b5fed0193dd6a78b6ee3b019c5307d1853fdf14d805c5642b92982e1ef4079a191254c69f8c9c78ec3883"; + sha512 = "ea19403c07d0371a36dc0611a79589807f44eb1f2e238c86de21412dbdc0c29bf99f3df88ae9c5be356c263d5b021e888a786b24d0c11e13bed8ec27e6bf4a72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ccb03d4eb7e81f04dfb700016c0b84be72c2d0fa15d63460f36ef66a619bd2de7e98840f9600e2be0be4bed8f247ec4363b4544ee66a43540ae0ba4f6a00a52e"; + sha512 = "e6ec9b351c0e130ced1fb4caf131fa8b547ac46255b1a63b135b370b8d5b6c855bae8b2ef349a6ee67d77ce69043ca374d40277e6b2befd89e94f7ac404c072a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e533cedecae4c0916b18d14a2045d0bd0acc5b2b812a81adf268280505027b034c29f584c71343e10d88d1b021cc6cd22481d1c36b50ac9a8504014db5741138"; + sha512 = "0304a7916ea7daa22756e484ebee602c6ae7bcd68b853b46f36189dfa1e0ef81ce4293a04dd0694d9c6b2fd3b3ee5ea1199776943d8db54fe0ad2ff6cc1355e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "a2996e9ed146f2ef5da7c837d5341be9c87f65ff8ac42d97a455aea5e00109c702295df393234f19dec6af16d77652d53d94a1822604367530a088e8b3ae6a3f"; + sha512 = "931901f6dbc21cc2dc35a99aea6789a4567c98184e0d79bdaf03087155723e9a0046398ce611a290c554e2f7a832f4423549ed451ae6ebb4e7b21abd1880a076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2fddb89b3da67fd871028c1740887582be7414607f7dbacf7fa05984a593b59eaad7a2e96da6dd28941fc17511db2152a4bfd673a7e5c9e11e2c04d56be21a7e"; + sha512 = "dd6c54b9bbd2817537efbdf0ee1396fd92fc0682c6a864b759664b438afc8b9021b6ef3f602ff7132d5ea1ce2e03135dc708f768496387e219c102076f13b5d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "37cab9ccb5254ca55ba798da4c26617acc75d47a4a8610e8dbcdca3c3494ddc32969a1743a440a2e6935535093b86520df94997bb01bae6185a12ddb041a09c9"; + sha512 = "ff8843659cf29e667d2e2f79e58bf8bb24a766de624c2e99e9ac809357c537527110af39790596689ad8eef0455229e40e5ecd5ed51f41a68c28aae47a9db076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ca661918dea82892d0e44277ac2513f9104485c897ff1239495f63bf976efa04ebb10e32817522f8a237aad7c85e6678661568ee456a8cf5a99a36b7bd6d6478"; + sha512 = "5971ea9c0e8cb49e57fc26b744ccf3e0726dc60575dcf53c63599ab20de6ff84825ebee5a8c37eafc1d442559d92e7e4aad770222991dc34c17fbb4a6c58ec44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d2316270848dca3922e5b18264fae1fc8f791a9234cb234ad3c9a80f56c8e13bedd63e73712542509a68f9b7f9482a46fda56ea61478b44b9571151822bc83cd"; + sha512 = "ce13162b414694992bbe2d49ed66d9b6c2a7c80121a057ba12a473e14a7d5efdcf867e864a0809c219e9c0bbe3995320873162b028510cfb10f0459d9c223315"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "bf032b016c2f9fa2dc79b22fb7ae807ce9c744ae563dcae66f20849f8696d1dbd30404c629acad472e89a4f42a504b6c46750684e45988146747d505c7b81d28"; + sha512 = "25a771fa0f7d36214a5e641bd5f13a8ab5459bdc516fc37541b42e27fb66ba00889001ada3a89c9199ae53293126dd5df86533bc7a9f5760e20ed60db954cd09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1d89153f009e29709d20f2a38a2ac34395bc64ded8021897eab06a31fd573962b2166d8367432e30489ec0e5062e3b526f7077ed08b7177aa4744a50da33286d"; + sha512 = "dcfbfb270fd8265a9e6deeea0f2645d224385e860034568fe38d49547159920bf2d954e4f2c64c9530f8a8468ef7b1a7b626b1702c4fcafbe186d887d826503a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e42f0014a0235b9baf6cc0c15731a70cb2ae6d35b477cc12d989cb383b3714aa827292bfe4943163648194f79ccd542ef03378ad119020c59e8251a8161df60b"; + sha512 = "d58ece9f65f1279930b3860582fe4f430c8dd7cfed2a2b85b7447af6d86935948e6e0d1c3f067c67e9561853149b2807c011317a9d78cc07c619aa6deb21a43a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e6d2cd4a97b45519adab8e0b498e06100556614f9ff783030bd5a06acde8dad508b8f4c312fe7bb97ae837d10f4d0ed00ab0add86c7551b97a6c4101829d036e"; + sha512 = "d0d06deb139f57539631cc44544a773abfa305bacbc81bb4e89a90fade0e9dabd4977934356e00a0cef4117b27d8d66aef8d6b34049759fb911cda580da98fd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b44ad961e626c0964aea65673b54ec2555ad322d0ca25b7b1cd934afec17a2809a1c46ebb15d2a22b4ac597c06f2420e940e7f4c980cbd6aca9badf9c39fee3b"; + sha512 = "602c9e6044cc0aa16cf80ff015fdf03ce48312321fd8a52445db871dfc1c475b05a2cccc36355f5c1681d540fca94e3e1c566b6153b2ed4038a6b69a3356d222"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9b8769687c95f867ccf53184d0012507c7ec6835779563c8ae89556380a44f61532f1d44b2da13e39998cceb4591cc0d57cc7b627ec80467c2ca6b291022255a"; + sha512 = "bcca1c3cc30f78712fea324b6bf4f3c6020b47dcf95abe5013eb0e2f588a7ca5c80261707922443a35e4d355f5f0cdeeea9a094f1c3c00a695a42692f6519cd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "e9d8fb68d4adcd2cdfe0d3849cc59f3aac13ff488f34459e1f391ce896b5bc302cf48a3bd979770db3fa19650b764bd2980be5f62ea2853a7fe247a62734e996"; + sha512 = "14ba146eef2148b5f4617a9ba73499bd783cf030683d87dc9ea75feb31cdec3b52636d8df3ef36001b5304237b39fda42d76d0f70e56283211d49abfa7b2fc8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "52514c4098e6cb2a109e2530b7c59a0d9338c3c7085c5ee99bf9ed1c0400bbc1c846aa7e3303967c7d2eb7bfec691c4875418bba0aef2bd5133e0f7721edb71f"; + sha512 = "70711c19244e034ebd8ab944e71c9604b26704c87e114db8a0daed9048a8ad54c1931c33b7dfac152f737f543cc58fa65262ad7f3d7af20321e3600437826467"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d37863818720ebac9d97f09464aae36b02c38ca82bc6a0eeee5bd38dd4e57ab98a5ca340a6dad4504ea230def09984854ef10ed91a4cbbbe0cb18eff1a4af929"; + sha512 = "3633ae56e5a9d84e81fa5ad6110c5804a56681ab9ec526750aca51f11296b82a6f3f6531c3a2b83d6e86d414df47e6087937fe4ef08eaca36f77afe7d5d3591b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "24baa5cb6a00b40cb6bb53e1981abd0b048ed30c2898f5f7b24c2c3ca41465f5f7fb258b86441bb2a2327a461a2764969f216715a5be4e1744b798501e56c239"; + sha512 = "7d6bf6919815935dbe77ed44832d8fb5b22bc96beb5f3d061ada46d6b4840fa1bd248f1bae7c7c3296e5e10dbf78216a427c1f0c9d76e6f1d9396288ef2b8823"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "7a653d3262c3b433dac0442b03be5c358a357a7905bcb352a7d808c00d68110d4587d1f2155acfc69522374c91b44261b3f2f874ae2f17b06e492f7cd9fb4085"; + sha512 = "eba1485f5942820a30c5d0c176ff6fba83a2af8020c4d83c00242d1266abca53046d2dea6920e38390a2044f25cc8868319c0f94453631140ab91ac68aaf0be7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "54c135c24001d57a79e8da52548b9589d4d1a5864776976fba20fe9be63f6b2429705e07f816aba438e6d6fabb16cfe309a5b267062a5e3a19ae3b946752ad56"; + sha512 = "e0fd4b5235ae9120f32bee6e2a1a04abae9576e7222f201006ba56f66e48f5c7ea98a1b01a777316252a21f807744a7a9393dace8195b96375233c72f31c381a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e86d31256874667c80db2c568c0189dcdb0a5bf4e86390638a49ab8a411b5c4e3d8facd9c6aba181962a61288992d9c5f7506fab168005db93452e7d79533b5b"; + sha512 = "be52a2122ff012ecd2990ef7ef03de4e84ca675ceca9c81d4f8f1fbfc82e911c65d36f83a20d372e765ac3b741924df85043e4585309c8e37ea84dea5e89f192"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1544ce91046c2c5dcce685889cfc6aa17032d3cbb8f6ac59eb8859916567922062c38d566d69e0fdaaac81be19eabebcc35d816c455cbc02e2e439ac7613ae63"; + sha512 = "8c66a38eeab2c15a532bd0170ec70f7a22cdbe49cccf0d0d1baedd30f6e708b1c67eab3c4db2a42826b9e05a7252bb57d5c5a67bc8adfd6c0235c5a4a410c981"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8780464509cbdbcdd7c7a7e21964881dcbc5e2e6b9289ab4cb262b63e264459ba85e78af89ece752432b352ac0c0132bd8f551500180cd6e0886fcad8d71cdc4"; + sha512 = "03d51782a0c80240b84c2240aebe3940c6fec5972e1a39d875717c9d4ef9496cb43dcba5a5009319c4b174dd85d3ba2753d71d60bb64c030f07604e63499f4e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "5221765d6d4781dce88d9c4904e2b0c29b0328ff029672b1a4caa773a556fca3e871b53da5fb580b9878cd0556f5db629065171c79035709bf0a750d3e14f0fe"; + sha512 = "af26fe8a3bc9523e50425aecdb735f6b6dbb4f1285d0eeb97f91e0da6148012c608e33c683d800ab2062bb7fec21045263ccd1263f07dba0ef96323db30668c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c4f61ea2530d279df1f96ff29631c43f3cbf23dc023b93579e8434539921ed9705e64f8d4f0a4fde1980384505b237c926b50a15f17eec5bdf2599c9584b1fc1"; + sha512 = "7437f1108ca22f77ef0b61346e5a18042981d268ebae2465dd7f3699e7ecd99dbc782302e48f8a7a16d4db17ba2c4f6167a6f137f711a713bced7c7ccb3fb19a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "e06a424d115b32bc5225639d6fcb5251904d49730613da9e308d40f681392b992b4aca1d251d2a68921b2bfd270de1506f5647a59d42e9c1f6305347f0fd6328"; + sha512 = "1a430eba889ec39be81a19b747a43be86fc6751281a24cadd421fd2677e0b7b28f5338847213fd9e548c8451a44a5d181b6efa19bd1cd200cba3405f8a1969df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b856071f3cd1a90ae12b06797c2b3eaa8e019a49890599670e5e3d564029052f27b62a7ac6dc80056cd6f1be6b05bfff44a1341a5685514959c69462d5c68e92"; + sha512 = "00ae1aa437e4f145ce89e9081d2c01498201cfe39e48466521c29a678708bd48a3f9931dc7c039d9c313129b851afbfa7b24658087bbfe7e0c0e9bfb37ebc90c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5355629b1db1cacd0fff5b681da7fedb234a19187027925534ec18d59e9e68e84ba2e1f86c0969da5459ead80b2bef14257b6c4fd193e492b7d22c3db7c498bd"; + sha512 = "97b1555eeae73c0b84141f6be1f6555bd91543f6f8fb89b09c3d25bbff5067476ff67a08a6c9e433e6d0059a8ccbdef8ede224ad7eda6e7805e3f15a13279235"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "59741fe39778528934766b321061dfc7b50853a6c2aed9f1316662aa7bced6a2adc6ecb4598bd7d8e4180e5b446d840b917794c017f897f4800b6722ae6e8192"; + sha512 = "14f56d956644d22f58b882bb6cfb941031716ea651009c72ab08e0501ca05ea5ed60658763a19ece7d6ef28a77afb2898fb998a17ef4620690cd527340c5d994"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1c90d23e59f2a499d98715e8f747ef80361130031345aee44a85bd385a802c13cc55a04374cdd18ba85a2796fc68a749e77a23f1c4d402cb0f28c0a70e9d762c"; + sha512 = "000f64b07f9be1b56fa47ef0b2222ef9669355a1c415da73e6b11dfc9efc89a4ae07ca7de6c2367d9f2c19c91dfb3cdfa484e1dfd25fbbce759d4d3bdf09b0ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "fae18f485444ca9db42b44759452ccbb814db34a9f5e95b061ffece9492a9dd06fa0d83b898e76e33882c5fb3dd353b343714ab74a7fcc83314e76cfc248fc70"; + sha512 = "6d1a2184869f746ff413b71bfc0f356ecb00a7f9bf996054a5ce3142482ded733ea3bae76a0e19d07ed2dea8edf3d16f346ceb1f09c4b3477491c8ac428979b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5d034246e87efe01eeab0d3b209f968e861cf2c2d6a45d64be733d944c0e2c9788db274c21d470abb603d2522b3fa5705c5f3990ebfc3cc4c9fa5f641a98c07b"; + sha512 = "1bcaf9dbbffb01cab2f4c84bfde1b98238344d6a44ecb209b61caf9f30ef6a6629c3c702951a4f2405efc72272612edcce98b0979e09131f930995adf94ec60b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1cc70ae6775038225a83595e74113b3f14650ce0cfb7890945387afe638ca2a8a11ffd9084c395ceeda58b36d15f89a6458236964c6e4893764312fbb85f2893"; + sha512 = "0137e1f0148f641748e98ed10554b3c6db319ed2b7e8e382fd80c6fb425a588951d7c78047afa9daacdf0d401790a441cd95bd055a4862e3f3991846499b313d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4df6f0b331410e8669eb450ccf57a959dff94b3b8941baf9e14d033fc43481b62c89351217a65c2e425225b5bc412e29cecc743c75f751e7d4f54817af1bb78a"; + sha512 = "75343d0c3ba1dcb04b87571a376a0d223d38b32b939111d6d3fc3e2ac416980b8e6d0023c07daa6ac1484336a1268ffd6cb47c1d7dddb294257106146ae53ec1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "dc524414f0da850b15327a47b02f7f1852095aa6878a1015da3807103ac9cdb54a7dc1126a44a0dc02e12edf593eedc3db7e11905079fbda1fb6cc3be94b2a27"; + sha512 = "caba86f7350e41b996c5c8e2c3cd5e7b227ac8714aea82eb74ca114c588eed5184f023caf1b4b6586c21c2eba66d3c53070aa6bfefa072113cd2a4a74110fdfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "bb003bb4a67b6ef935ba8c90aedeeac77c813c26bff798927c9056f53fa287fa69bb07fcf998aa1603c78b7f22238ef2dc91442f73c22a2488f7bbc887d315bf"; + sha512 = "572222b72b9853e2d71662f4ecd62af748d872c18f01dba6c0168dee69d383d4c54cbcc2786a66ea09b6c79014923fd9be34d9505c06bcaa4660ea071a9f9a33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "eba80394d9cabf5cd5de8cbbc1a91176df19e9b25604a0291f17fbf0c84b4a6dd6a4139b19a26d6f1e112cd57acfb3b567e7d16c8ddf9854bc6e8d44b9672e62"; + sha512 = "57208fa78265ca4ce0b19a53b455cfaa8d048423f3f1d5626601aba89ff272c3a008a37682e1f706b7e499361cf4f8fe3fab42f43fbc0fd362d4a461b3578e9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "77a6c5a9c18534ff6ba70d52760f9989105aa72266ab7ff830d4a8dd21b028d42d209068c7c023b54098c9b22a1118370093bff0c9fdb3cf779cd4058e6756a6"; + sha512 = "78f372aeb663752c5981ce15a955480317ee40ae29a83e55c53328d51a76ea1800e74fa64a35ac10d94297418a50de1da16f9b2352159ed0d08579a1de46c5ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3e0598765c0e05f233c73a5198bb94fc506dda4f0653a445d2d03968d709b6da875c03bf088efd2dc40e56682f77a33b848b6d29ac5e31e7ff7e5ac5d2824255"; + sha512 = "6f3355264ab1599122f5e9ecf3112d069184ee2b4208d7e6fba6dd97a358bbf4beda43ccacca63fed9837632d5d8f979403e5404aa3513ea21487eaefb4fc519"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ff07d3dd2d594c8abbac8662aaeef6beff0d5465205f84c79e1271d3ed9ee935548444268cf072d26d8574bf48bf69c5b74a3b451c93dfc581e23f7aac5ade1f"; + sha512 = "145963b3e8d88b6cac78d25aa6d34b3991e7432bfdb11e53df86e1cfc6ac5d88a43b535ce64a4225174c41c9aa48065f766c49cb70828a22bfb6791aab83f68d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "235b13b9d3e8c9d8e43265c5af82f7ea0aab3a0113787ab9b5a52aa9707a0a6c443ce6469ea88c34397bbdecceaefc570474ed05c3e9b1efb5576790638bbe71"; + sha512 = "8fd53f1f2fef7bca7a75a8e18a4268d9e2bff0f550b23c8a817b51f9791b2e31061a612dcd8f72a61e5f8dd51b973b6e8d4b86481ef07f973335cd1e7d8af42e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0b9d67be23502e1279f895566e69fbee36452f6848f8dc814fbae23ded7b09a06850bf3b99d42038cb532b4c309f8ce21f7f4bb4f3eb74cdb688278aa23bdc6e"; + sha512 = "ab9910b231e6d395bd9142f6a2d7ac5d565317abe5cc977e602055d5eea83f5520918ff17372e6fedcaebce4509d30dbd0c9a1d89bcc5ec3728c2406ac62bc8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "da8458afd3b0f244d298ce70ea50f22ae7a5b2070078ecafa1f5b7dc5838430e6ffaafe9c333eaf81e21b11da9e65ba4feca23ea5abcebaefaa7e05f0865a7f4"; + sha512 = "a84ff39f063a0aa11490f6d059a2112a1e0e2ae931dd8b3a576ffe2253c4f0a2600c221d9cefa2bdac8c3af87b4aa6bc571caeffeda10d78b7dcea7bab694a1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "4ac011104c0d52f418a712321bff63310575209b4e445e5bd53a047b7d3da2c62389862131ece662b7460b1aca57c51bcdad2a5dff2b692a5e1c40b154da2ffd"; + sha512 = "46db7c4284ad4441877c8a72560c560bd4e46d0669ab4144a5296f1f25c796943253dfb1e55882e9443f1f4bd2f083f83e00dca597e20a35f241e8bd54cf5727"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8d37b246a9b9b527e188e557c496df0f2efcdb92ade95ac3e34788ed5b1d4d9a2a748cd8ccba01360cc9e3273e143f63341fa4b87e50c1b30b07c3da884ecabe"; + sha512 = "5182c8648adc51b04354ef1dc4848b4245800dc57a80d54dd605c56c9a792cc9b3d57085c0c125e27453fbdb0f55523c555c91b84b7f8462df365b7d47d7c1f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5d67846ccd9b1e5550ac51f49528340a31ee5218169af5dd93a37e034feca13deae208610d1e2ecf14b515ad618e40db2857bacc043dac0662f9d9c4e1e86816"; + sha512 = "599f460adbb94ab3adac29bdfa7849dc0e44c975fb2b8d4cca4ba25980bbd36085eecfde7a23dd26c223b0d9917a6800de230ccab738fc4e23f7863dbec21fc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "e55d0d24b8cc6ce22f6d16467631e857ebc7d7bee6bb3ecfefa536927cb7f32af08b5f0b9924286c7a2df8ab48c12d8af2751da9fdb3e012d1c031bea01ad39d"; + sha512 = "86f01c39b760489c33d81b18507af2e365d2269ee33b8149d66447b57d35d41316f65e187d81faa24e5d1f9f045c69beb6e7ccf660f89793bb7d68263c451416"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8820195b803b46b4b01ff27c1f2dfb5182b96b329cc7a0c0a22e25f9507d2f2138528beeb4a2e371f432ae2ab67189c0f066da920d81adfa6790e7735d6fb79f"; + sha512 = "717096bac06b4dc090dfd751352f1dc081f0df04e52e09cc8cc4645c9bf7f95f4e6170e2871bfd86516c24b5feb125a0fb6c6f798f0eaa806299bc225abc0d97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "76f9fa940003a7d1596db4e8c231c2e773207a36dc6c2d3ccaa6667211b6015f8d8d5d7fb799ad86f9731184ac338d0f07e1ffa2220c03710dfee84d12937d7b"; + sha512 = "487cc658fd62dc09ee3b58372dbfc94d8ceab4c2455018ead3eb7cceb2912740d2a63b3d9f2ffbd92de14c538511641028b50e41b03e27b4a741cbdba6b63a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "35c90c990926cec24de48d3748d49285d9238a8a3ec7068c219145619f3370c0f0add66b364fe17f29b0db221b588050c6445399410f568f89bbe8d3d7efa978"; + sha512 = "094fe47b6f3da6b807f951664c4172766281f8b359fbb461a1ae724197931a259a02dc24f6bb47643ad4a14bd6a415e74f3ad4ca12ee66aa6ab0ba727479195b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "d5d851790e746108d98160d96bfa035af08a9ad27134d377e69f1b08f059afe751a6f516e76a512999420662e0c58cc1b1c06572fe596b86975efede5ee28349"; + sha512 = "298fabc34d153c384502b2a218f147c64734f0b5d2db810ad711ae09cea45aedc8d2dc70065845925bc7c79bf6567beee1977786be035f3e3c8955affb412a1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "27f61535766bb7f1008f900147c387d611ed7269b6826af271ddef98fab22b7db73f58c452130bd1d31303ff64f75e663dff4d2bd533589f97d183bc731cd9c2"; + sha512 = "05775a6cf16a7afade486ea6475e5d0de668ed474ff35d22a97dcf7b732fcbc718ce2d83673cf6257e2304e649c1d4535483e88b1c448f1eb8a667a75432e74a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "210d2981e4c48f4b9381558ab77e9f55e9cdfa450adcd23b4348e8b7f554fc844d4de8b48283d14b7588c86843d1a2c41acb49df12d167099e42805fae268980"; + sha512 = "e748661be43563316b621243d5643e1e0d4ef4784dcc0bb6781e2d656d50476f8985826fbf169808793cf0354f206a3192f8d4976a21d3ea9175617682e4a8d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "09f5277ab266b671633f11eaa4389f3ca0e3ac2ae9e8b0c5c4cdc8d3d457a6973c213617f1f450bd4b7e598bedf5cb0820f06ae55846b1d47dbe34cbe4209804"; + sha512 = "c1f497bbba045b5f416c3c471954592e5932300a941b9df27cdbd4c488d2690fa3a4f6f97f566b3dcda9ed21c1f7ac4bef7ea487adbf36f88a6245ac885cb5e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "8f1071a5ef4596355f17e65c1cc06641f224b53486c9be9aa7ad8ba8e240239cef9dbd913c44f1f0136ef27bff152e0def1e3366255bfe555ad87331735a7789"; + sha512 = "2333b1e05501918abe9a47efd061ae946eddb7f6c0ed687cbb6a9e2816af31f956482dfa916c4cee23c61d2a98be21d43c866daa4bc84ce5a1b9b01f4138c742"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "609402cb9f3ae4d94ad33f0189e85681de1d356bb97d73e2b8c682b4e664462ec486a3a757234a7353c08a92ca7b5b3ced349c1c10e40e78950c493c09d3d788"; + sha512 = "f5b63931cb71e6d9a0c483e2b73cae04b38bcd78492082cb56bbe42b95732d450d7956f39edff29d33eeca24678d8db7e85c18cd3b8530123917cae58b685a73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "4d375ce5879b9272396868ab4a70e82e8e1117dcb07d8d1e8780d90d35c77ff6b9c94179ce48233ca9b6e1c559d7c0b339f49066366b15ef2adc563cf358cdd0"; + sha512 = "691b48471848e11fc30388904cf20150eff3ce0cf60de319523153afc13a28179309861957abe0222bd96fa15bdf27f2051f353b9e89c47e4706f2ed8e08181e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "1583dcaca18fbe88ac598449ad2d352a6857ba80bd7e97d07beb282b270b7277ee58992e622ab6a6fd66d9393dca4653c7e3562c8d7c6a006c7637162eca0e73"; + sha512 = "854ae30ccae7a822ca2e33671d3bc900f9f86734fdd625097b6c4c5e4dd83369ce420244395451a5d740032d7024437cf4fc3a492921044a030cdcbc389db620"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "79fb6405d9db8f6fe97dd7612574863636edaae54ed879bff5b2b137bec006664684de98e94c37c0d64f37c8b930b075dd47a47491b8377b8b1cfc351aa4b6ed"; + sha512 = "b2ba3286621fcbc43809dfaa029f5dc7f5a1b7fb7603e570698ee2a9666797e4fbdef147c3a437064502ec7612b951cdb7420a325f1e2eb102ddacc37596c771"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "eb23667f89441c24dc38835e5fb105e24eeb3e7a5d896943e796a92f9bdaacd654b984cef060328d8df6cd659ff6ced32d86bee5c3372c47f3106ce95e5f8898"; + sha512 = "c248bc397970040678d3ae715e6519a2707553417aa1afad5ca2261b1cdd6bafbf01ad21a5209b7ddd0676cf432bbfed2e4ae52302c2df7bb9562f98803934f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e867a968620d23742c78f6798870a3e96c38849247fe66e068fd92f04ea78de434b6f4faea9e5bb01fe7dc0dca18285e39310ed354e24fac12a5c86a6378cb63"; + sha512 = "09ddc10e60db630c40e449c7cf7c85eaf843eed2305361a50de001fced23bc622d6a754dee8a7f5086d570eeabee318da0141c92ba04f242afa172346f54494f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "bbfffdef77d2aaab7c2becf876b28fff518ed6eb3a87d96d9faf2c62dc0861a1a33a9260e34a3f4ad2bfe475361234a3401fa091531d1c90b3179fcb0a946aa6"; + sha512 = "fbdd72fe546d00bb5bbb5879d85107b29286100edcb57f00ceac36a22729e7c33b648af7a064d79287a87bede24077fefee589865ce0e36e34e281391ee2deda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "11101ac18a3f473028407d413057a9801afc76a898126b65b73bab057578e6d8f2eb2e9b29cb6be35a5375ac59a11a3bd6918c54a8fc23fb6caf35ff7e667910"; + sha512 = "725e1d1d1d551be26298224bb1d28ad868a0ff6f186417af95e6687eacd2a43c750c69b7156559019691b43bc71d71b9624cc541f87ed967af2645040c135169"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "be40096b63bcb006c587489fa99abd758fe3a24b5f965f9e53b9e2602bfa37a3f07fe6660f7064fdba6861a8e2bac5f3da5b0616968ba4b88d1868d0955cb0bc"; + sha512 = "5366370c753b5879186bf1bcb288a8bf54e1d6c7615176f90e4bcdb75210472b05b20c5253972dc89d517523f02859c57387ef5dda5c3cdd6ca1feaf087bcfbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "cd6b1f2e826d575865cf51fe78f3872c50571c9bfeb726f4a253dfabe3af3a91ca1fd238d5b5ee73e1a01339c88444fc3dc3a1ba38492d6b99924c597dc96fca"; + sha512 = "33e85039f5a57c4e3c18777cf42096e8025aede9e40286533d3bea42635829d91065ba9d96e3270aaf0347425fafe726f220c3ca2a68ffb8d07f6e97fc38b489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f0cf8e489db3cd8b7fc535a0b3a95c67f6f63fc7c76d5b1882e3fa8d17ec18fc751aa91945dcda984ee09547ce161b8b7965186ce0013819eb45fcc2d72c9391"; + sha512 = "0f2effc9cab91295e5e715853a3d632b42c0236d07438187581a93acf4c5206625f11072828f552988708d6a093bdb165ef95030a2ca42f70613237c4a121d21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "12223fd3031b445d4b413cc48b74131793f3c2d8158e7aa7b2271d6b94645b33956e066b30fd4021dd36fa0e32c08deafd3f5c9c1fcc554b87e364715480a5d7"; + sha512 = "273be614a7da8eeea5b88b12d8e5dae30782af8d70b0fb6eaef0c6f0f32863bf7b36e2b4f6597c67580077e4e0a57361c7016598f421dcf295e2bea3789bac15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "97095e3ca525aa45f7339b5fdd171acc7e0758c401924cb2721e368513c260e8094162bf2e22daf5f34fd680416dd7fdec3f5e3b65b6fd655be1ffd4a1850de2"; + sha512 = "9573f6bb941dc4d82ecc257ca31b5c5112c1a5c8fa489ff4b588ae66eda36963c614f4ed526f863f65f6aa0c4d0d1884a4300ae69359c3a35144b4b6abcd9d2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "739142d798738f12758d335b8556f518dc8b2784b9517586215f82d5653059a3cd98539c5784ec3461529156282f6246d93220a7d06208872d9c90eaf08582f6"; + sha512 = "2280629fa2611033c1c3c614af54ae2ebf76fdb0576670a4e8d8fd5ba3a288ad56cedf6486883c7bf26194910944c73c0e15d14514b91c179510b555cd8b369a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a138503adb1f0ee2197714fb1e0db4b5bfb004b64205835078cfbd51548a99e0b9d920552130d0646c4f16699b084e4fa88eead584846be9650964fd51ef4882"; + sha512 = "4b0b6a910e66bdeba240a5b6580ea7f00e8da8a4aaa932448a8c6050bc2f5e0d2eeb6c87a8c7c093a2060faee2d3f94be7de4934bc4774a7beb3b9cf147444f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ae9f2a6f83816f02a0b0c2240cb8c6eb003b50b3b9cb3c6b959b3c11f6b87effc38f40daf3d4b2b33140fdda3dc99a5f90af582e9d78689ce1cc965f5a88e119"; + sha512 = "a9c5aea78fe892e7351e2fa98afd3ed14a5ebec3011ff015389842f5a42bb791f0a9f52a07cf09c62a3861c918dbaf87b5c571adf4c06e73814e4d070b4f1be4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b0e650c6149a761f202403d0e4e4c75e976657924bce2c10d592c5669b7a055ff9d6a82f1795b5fae2f57c6d49be4cd6923a36da73e300a5b6d287f442be93b2"; + sha512 = "1ee682f1b801e181f6c12380b6a7ca0008893adaaa31b74cde539a316169e96fa67d2c74205d65fdfe1ecc246c3a60265c898ac931b6a153fe991f8669bdf02b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "c7d7c61d810042bee0f5befca5c139550bd73efb67785b87b21a002521fde0d415c4aca753fa47471fb7489bcda0f9248426ccaa8a2bf0967f71f5b1d4329df5"; + sha512 = "0e80e4691add90b17185e8499ec764ce490e6a80e21c0fc1f551073e8809de1ea25ec15ee23fd5b7e4821f35b83c7b9abb6ae7a8592ab575c5cd3b851966bc6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6e79e3635b68ff87d616f8626475684b4c18626c9e8a2bccf99987e96124a31751c6c9638725c8882146acd9368a290c51fd5726a9b9903f1b0e9f1ada42e6e9"; + sha512 = "1bbd37542b7afd25d767512f55b5444b0d3b464da5219d7983f3c816e9dd31bfe3546e51087fa939a92e96dbe89c5edd5e2a01222ab86bfb48cad4b87f71fa14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "d4137788bc763ea1a2663fb0bb4aec3b7af412cf1e38ccb9fd484f9f486b877a19d86d17fe9af19df12104433705053eb374dd65cb76c6b180526871f0d50290"; + sha512 = "8445821da59233ed45571d1378348208c23d0738f4a3361e880f174601a64190d32ba859299e340a906d81da08131ce74cf7aa7e083b66fe117009e97bb1a0f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "614d803676b83df0ded1db004b7f17aa66cef14e6fba2f20504d1629b55ead1daead52fba7eacd66e6519dc41ecd5802f7c1ec49b6ad5b402129528914d0de69"; + sha512 = "46bcd715cd6656a64acfcccb73a04c60f358c64fd227ca6a973e52d285733ab7af81633a931f15b847b4791f42aa6fa4629ca269d71d31c1f51d6f52a6c06e7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "741671e9bc6d102873b899e649d733befa3e4ad26b2429f04e87073eaf445a9c571087602a8c347cad0412a9efee7483b9440f794248a2dbc30962c9e4a599f7"; + sha512 = "498c416d53a7d75657b13ffd98b6f15d7654a59bfe7326bc6ed69137fc4b124bbb8ba746da6b71a5486c802afbee54f291457ce67cb073496a688c815d03d6c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "615ce8b1f44f02aab20407dd090a7f7aabee0b022b616d33e2d7992563ef8703493967a2762df1457c6e520a886a4f03c0477ee79025ec36a4b345a0aa913362"; + sha512 = "dcf126fe240e0eeeb52d402dacb6750a80e2d4b2342da71e7869875d92e0bc1ae60e6204ee7c68b78ad116d5029ba1c0f841dfb9908ba18361df85ce9d2bd8b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "070e6e47174129cfbc530975bf5a59ac055e942a2732379578a30502b109b80c93162d144ead7306a8604c1945723bca0666c26d1250cd17c4404d5164551d06"; + sha512 = "a3db29314db1fdd166bf452bdc2f9633a1aacddfe825220b1c3952190201c407a116d90cfaf356b27039db2c313261ffd8bb450b15f7d5b03a3cfed1002254c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "e808f80625803ef21873fbc52f82569b086e20671011049761ea1e9562c57df677a3bb4baf147442d1c699f7c79e61b89bf3011a47457940dc5497ee03410b91"; + sha512 = "fec2646759f8ab2dc3485c907da2e94cbeb452ecc49863172ba4cbcaaf1efd7d29753a70aded63ba7431bb6d1042bd17ffcece5b47aa1e8caa9ebf9ca836c47e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "45fb2dabfe3bac2bcd78e659a03140d9e75fe9ff9a458037cb35f7bd2eb81b6c33484b1b6766c72e03705020f25cf98ede7a5946e99ffe59963b054d27ce05e4"; + sha512 = "38570642baff4a9e3430e39204c2a06c090127a41465b217bbf33a6b8e131ae649cdb746bc2a7f7af89c8dc3fd6f52c39dff8b88428d35a105e47f82bbbb592d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7bb953deaef6f5d3c09f8a62a7e2abb285e9f23a8b6a47286cab12b2de9ac5fa911dde47c652110b635cfcc3c28312e348113ae8a791a7e7552cc30d9767f3c6"; + sha512 = "472925b60b35d42953b8cfe381de13f6080dd4f378870c27899c53419aa8341be7f713816539477eba34281a2b08b233529305f187f851372ea02e6369ff4d77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "38cba3560bcdf6356c10ee2813743fda65563385510588a5d58703b4ed033d43f6ddf1019f18b29ab803f25cee5cf2263291eb49969d998b26fdd105bcd14312"; + sha512 = "271091d9e6f28849a9d58f5760cc35f1789cd651fef30ff1d9cfcae66c84653e4ec8ef30889a6379ed5427e9abc84433684ced99bb314e380302253afda047fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1d632c4fa3e15145dd58f311bd3f4cb731fab4646f6a54bce4d5d58f53bb58964ddff8aed77cf5c3dcf59a00a9441b0f508bd9a031b79448009fdb37b501e249"; + sha512 = "c4ff0474f6233bf7c93cf031edb629103adeba462c2f28eda3075b41c1ab690ca13adc0875a97bc65ff1c7e3c1102d601a62cc3804fc89262afcf898684977f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "3b4a42141d00480775d96db00376a66b4c65d9702a91fc5390805298f9b94eab260c6433aa8ae9c1c2e79f4706128b2771ed058c1196a40e90dbf1c24be880ab"; + sha512 = "4a8454e339dbaa80024debf6e7c852195dc4be476da263613dc1bc086301f780ab12cdcfff5720d655b0f8d6731efe28f1afd0c0be4cf9ac2698914835cc9988"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "aa4b8a4dbd3721e8162d391108e209c02f50d5d681e31fd2d4877794c9d24c8d2669dcad7720832c6dd6bfefcfce110ea25face288acdd368c5437d77b0e7466"; + sha512 = "2c1fd73725b6a776ca6dcdf1b6a3b7c0493c70ca01e2c90790d963fb7edf6f6a5b826e032cb9378de7b1b86ad08610b683214d8b02d8217df6a3a44676f68afe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b9df5e8149384a09039db582a4548994ffc47344326feb96cd6f6ef228e3a6e222495284ba0cf35f9c130b871ad827dc31022242179c88dbca86c61ff5185aa2"; + sha512 = "88d6cd39c2531b32c57ed2fef3ca0bb2e949be1abdc7b8e1b67411f8a7437bd7d8bcc0f2f6f366122ca08069390d3cf58e1b188cae6ea9be498385e0c03c37e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "a58ab41fb6282e64447021ec4b41ef1653ab7ad11d3b2947ed61d6d711061c476cc19d20320aa70fac30ed106869a0f88e8a22ce0e1184d68795a25bb8b4b4dc"; + sha512 = "426c76c24a0cb7ad7fe8854e4ade3d4b965f44b02e61c1bd83943ea53b68a863c278d751549f84b5aaa8aa2403398d68ecc665e855adc1e898c83a2e47bde3b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5a690010ceeebeeb9130fadcf04eec5eefb087990ba254e11a5c6f67561bea287783656d1cc9ec7fd1945afdefdb56dbe93eb43a7fad6ae130a56aab64652e24"; + sha512 = "9d368244d95642c5ae5059fbce23eef91b91913910f2df69cd0f9133aef194f94307b3db1bc8b54a8c9c74128e0478053380e7c80835ffc0c63b930032f61ccb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "d2be7334cc018260c299879c9c9c64da71f62d44f8f0e0262af6140fa0471faa9354d9289c4146e9152e1e8fb7b9791b8169136f4902fabebdec05c15695e15c"; + sha512 = "ff4a92180da0afcb9b4819d4548fe999ce855db2a7ad23b9bbf63028f48a91e734782b5f72637546c318739006b72e97da4957186989a5565499ab406b66dc9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "9197ed27907f509e1dff0cd4f4fa1d7309ffc1196b937f77ea0623ceb772ba653568b295ef6532ea3599ef7df5a7ce47eee55663df0f811b006ee303bff8ba1c"; + sha512 = "752d225d3a02bc576d586126cbb855a104eb31ded32b878ca48dd75a33497fde68e02625d65155df103dc3e09f52e86e94532f0654c5cc278f543a2f52c2665d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "efa6c11c2137f336576abf75b40b91326fc1593aed79cfe78fe84994b275c4f49c9fde8e6f45379333225bb41e50d8815e64297008816b1fd93367ab849955ce"; + sha512 = "cec7cc4b77318726fb2ceb348bbb888c2b06d43d991ab05f0b55b60a50ddd1878b6518c70cadb0846b722fad9faf753be3efe7130c5ada1b22bc339169418ce3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "465611898bc9bcaa69a6aabcbd214f8f83fac62759d4bf2a64b9f07e258dd6d5f5c4ceb17682ba9c885f97b53536ba65acbd772f692dd6e40bbfe41ef1b0bf4e"; + sha512 = "46c5ef10eababc1478ac40cbb94911061bd75e7b74e3dbcae6a42ca8afaa6f0ce4a60e1fd9cab4739b4862938c8330880e966160cb87c59006df2087a3208e8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e6c2a3f4412946576cc91a1ecc45e4cf18d2e4547c935f45ff776c736faed9513d777ca443033ed7e99f4a4aee11792651617c658d4d8e020d67ec302c457613"; + sha512 = "77fe4977710da8503a9df99e9e2969baea734ccc5634c9d3bf250e336018d99779317569840dfae21445131a534e1817cd7de199266bb144498fc0d361f6e63a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "38136e7cbdf7d6b297ea2e183747bbdc79f61d8bee2372bd6f40c1c407e24eaf2f21dbf92f3b96dfd116437e0212ad20eff53ca512c2fe129c395e2d117e26b2"; + sha512 = "b8e56afce6df77270c3f33ffacf219b6ddfc78a42396caf98fdb88662cc84d477c6cb367d7118b9ec628f498943ab0d3e3711d076c3f01c4c226b8379f85f4f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0ef2e6e928a04d8560286b01ff735647aaba246d1f2d6880644b7750d1cae89e63858ad98332c6cee99edc051a50f3c560edd4d20d836dbf7f4aa01ff281db4f"; + sha512 = "f733b6a7a470b63d450bf842d20ffda14f2e77a8a4da6ed327b0406d1d1627898ee592491a9d3f2b30e6f5ee14616251e31e14bca995459545a69f2629b5059e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0e66e8ba386846eb140cc9f6606b9b0dde49d1827f98345801967b02d87c0f1b6071ed8fe217b41b0412e098b52fdc80751089058f42bcf550a2b5ccd614a6f2"; + sha512 = "85d7c8320e815a8462a0bab7931edd439a726618839501e5201cfc526d6fffa401ee696a0cb3dcb6b07b303d1cca96a87805ab593b6d02a9eadc0b8e9dbf4afb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "d37a0a5ee7f9f03ff3385ea1ffe886949d63ae52b2e8e0bf1c49192edf725686be73f63fa9f528a5d4911401927777488dd1b490be36d21b541b5b71850a05b3"; + sha512 = "9aad72f2f479cb00ed2f862797efe7ee1d0b478aa0fa0c26c22b37c0da1553e62cf16786a7fd285a67fde183a8b01142bf8e80f16ed69ee11162568575aa8a5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8af83b0c3c498dc157986598d5b5559944089bc27e62b832cf16937be1a3aa7888731fd16bc8a4400c49be012cf217404aff865e8cc8996959b594aa55becff9"; + sha512 = "60c271b8d83b4ced29b608b6ae16fa1acaf16c63c6fcc0c779e5fcacf1943e86a12acc9d5ec1cb2b3675d85b633c9a809e244d1172bb9666a80af997b4cd5075"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "7ae083c02e5a98bda3d74c6f3c8269bd668b6985c411b5deda5b1618c34721650c881ed32987ab369d7b730c9ab4db38f0d7047c23ed8f513a0ab9cfa8a1ae41"; + sha512 = "ad63eb42001b165bdb453ac5a0e090ad1e42bb6350c8f600d0a50528fa56ed32c5aa96112f79480e68e9c6cf36965986ec322175ef9f36b6265eba75eab37c73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "281132f7cf22eae25ee953794d6a26f9cf574e8a794d8a9e1e85359fd5e3ea9ce9d74b961babbb0e91bf0bf4dd29bd49cbcc177c5ed80bdbbf8418ef8e837969"; + sha512 = "9ad916313359aa3a31407ee0a31d49c3f80a5fb3aaf5167d55e0f01fda49cb85769a8cb70632d82040823ccecf03bccc3d5b1765d96bc3755eb2da785fec0577"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0ab406c65017d67a05759145305816a05f802c7d71e445abe1b0e91385a1edfdebd2991aec7ed808ab2eb006112c5967dddbcca6e46cd7055caf4b7328d2fb0d"; + sha512 = "4a6e9eae976726c2f3f7652ef82b7787a7d2e173c2894e49317f5d2de8cb546a1ed1f3e9d75c0a610e85883f9009dd2e77045383758565205a3d3d27c05e1e5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "e85ec9f241bd282d9803b3d2bd56f96ee54605c64a0cc458861baf8006080f1e9765069368aa7315e800a3d67ece1a07f0d97d7d8ffa2386de7c6c4f284cf214"; + sha512 = "abc7464bdb8da37f436ae8dc3d32beabfff657b52a257ef934f61b885f876d06f67a35515aab702dce9bf5cac2d10c192c4ea367c77eaed53acee84e1ab0d52e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "208161f8ef28da94564f2ee317dccd8a142770e1656b748737b4d3a474713b683a49c9071515c0ee8de1dd20609a2c72cfbf9ebbadb88aa4a024b74db79479c7"; + sha512 = "5f0d1732271245a380ee0dcd7e0cbb6dcdd7a428796d7421683708ed10962d3706e7e95047753c1d081239aec0d3319dade644e2ed70474f88621ac8e35a5e51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4a847c0e6230a3f48363e327adb8b940a7bbc266cec09dc007ad1357be1a219ea0870dbabe227a3771048396bfbfe41114b9109a3de6a69f52dbbf959bf7d428"; + sha512 = "5cdf81fc39ae3ea414f9ca4b85f273c79001395cc309ff5dbc0e55d29033c476395b1fa952206757c40b8d3189c69ae97a0a4d909a3eda39669bdae5983f5f31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c5a95e4bbec779e250d8cf4ded6623a99fa8088ab67b2d645287249c097e5e645d51524fdf79de408df5c2136efae8718f01c028d15a94991ad87c2ed6469ceb"; + sha512 = "22d5bc6c5ffb9753d27dd5384b38f06abb85e2903b768dc322e449c9281a850b90de4a281a86dd197cddc57ab0f4f2eadf5cdb5a603d1a2848d8e83cace0554f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "2dc7893b667b8c381c242190a55fee072a911f3f4f11c80983de84b5a9533bad67b05bb4e42a2a5ca12de751703ddccb2be22226ec66919b9125f1df05d0bf05"; + sha512 = "2983df2889567e630c0d8b5657e93bfd2898a97a6bc8507f1279c845e5b98bf2993c807009ec6dc8b1870d55810ca0cd1ffce7bcbd3e7eaae17a9bf8948320ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "9c4667dfb88881dac477df7a87d351ff26b6cb4640f0a92332f5c62dd88efeebce6840fa8ac4d931d8ec17ebb75ace57e1129cab5fd06a65d2e84218bf6a5118"; + sha512 = "43297a1ce9fb0a4cce569706563ba7921be9729a732597991bd67a995c89ae40c65b2a8c9849f1a8f7671ad85c424c763462761c8fb7d11ca25c3b8385e96d7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "9b68ddfa1049e6a533a070a07672c160e5199e26552242cdfbb8954f649ded4372396071b302ab359ee6010fd912b590d39e1f1f8971d73c805e6db8ae194952"; + sha512 = "02bbea64ddb822000542412c20f351e4c7debb690ba06d9fd22215ad866eeb0e170b0a109b51c7e4e23741cf87177b75c3ff62cc356b4d2fc58847423ff6d3e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "fab38c25d1c35bba77fcef1caf4cabade57d9735d3c09decd824bc9c9982846c0790d279ef3915a7255df86db2129a41db22a2bdcfe98a55c5589e4554d63d5a"; + sha512 = "424bb950eb0393079654ef652ed5366029567fbad87ef0afa127a26ffd863ba01709ecc037d3e09c59fceac27957c8d88211a17434cfacec6fb4f178db8eb912"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "160940c8771a376e2cb2e22bce0a3a5bd9619328c1b2d8596a222414e5962805d8c8e343bb0b969114eaf0218e4e1830470b813bc68972f814097de2fbba56a6"; + sha512 = "06b05c63f63e3316b3dcee41f5f3296cc88052137cf9bccefd0f1dd51202613c61d9d4e43d5131174a91c38bbeb28450c92aa9e183cbed74ec283ec9c48a72b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "519438cbb8fed811428060f0e94196a276fcf6fd02bdb4359098b4a9c33635f4d0022ccc6557976672ac39d4097425af91c07789a443e978fd84c1237e8b034a"; + sha512 = "226f1e5ad28ae5e43e6475f9fc3deb7d7a602097df2d587919490d6e584b6aeaddc632186180f9d63ab75ecde0afb203cba89ee8749724466a85e7a259813fcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "defcb3c8039228e9c6d64338d9e2c4eb39e87078d0f66b98c229f9f2205516be97fec53b50f18406ab6a14edd06afa6197ba62cc31612b48196b39f5babf99a1"; + sha512 = "484d9c73ef78217ec3f72146507286002eb798a1a3a7089a927969b48c2dbef1804930758c87b116324f5f348efa3d1b1dc3416e55bac7e30da7315c778cfad2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d02c656de8c92f3d8bcbb07ed17308c5753ba08905eca36a4d081fe18fde86443f7a4de939b39feb57def17aca7782756c4a264816ad6fd092252331bab958bf"; + sha512 = "e4d3ee3716acbda8e132cf7f41160c376560bb2c31219014d1e6ded0c330cba43b7c5fa1ff41591a3c2c9e0ddbb0d9d9894b5dadb42e49af4b992440929e3e9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "89f1e0b0f908ca0a6238e76895d4f8e70008d987e20b64accc91efb0a9024de0d739d7bb34d608e4b125324e19e93dd044490992bb26a1a25cad1c83d4ebc19c"; + sha512 = "37ce8e65248aeaa25768eb49aeaf0c0d697c6cc32601090525a7aa9879b631e70587c2059148689de358817926e0937ff056796db4381303ee87c2cd72f9dab7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7d3724d3e824ba80e5342049a1e1cdb2754f25b8c85f2135ae782000dd11caded9afd760533371b46cf2dc30dac0d396fb5c4223100c130c2e390d12ce77fc48"; + sha512 = "f7037a0fff6948e10a3f45c90f115845e7b5d2e6e7db973db361a70ed000e62482eb89f91cad12a939e5df81588f06116b64bdeb72ee247725b042243c53062f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1ad110a807b0e823d3d99350c72a92c0bb81724faf32587d0809f040a29317bb3286139be6652a74efeca4e1e461d98c36d5cba93d18abf98fef9634e7724ec6"; + sha512 = "e3ebec821362effab4eabf1c14a912a3b40e30ca1392cae5c3cf5df844cb5a0b675f046924117c9b414ed7315acd0c23a7259b19fd480d38801c61d45885db7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "cfca9987511af0185cdc5594681807af1a6519443c225942c68b3b53f0424ff0cb6173b0686164b681aca08f8d93f81499f6d15dc18ad729c762d8344dd76c12"; + sha512 = "2681686a797d128b9715835f05fbb9a266150594da19d4c5a4d5135e3301974db8e8db3da2ff27091339e3e6144b81e1726337f6d1fb7abdf2fbf9f567143103"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "28f18f8c402b41e4145988f93939b329efbe447ebc332ee88b32c3071a786a7bd68aa8be8e6f85073026fe1ff56c09d7c366efc9c155b6bb9edd2d84d36467f9"; + sha512 = "21d2c731ffba1abc9929c312852b856b5875261899867d27633024e0d185525b958d6261bfdb12e986bbc3d3ea5d73cf3200386a760858fadacd410898a255c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "a8e45a24c09a0285daf2029a4a483c4d2067acb622aad1be2213a4f5f7ecbe6c1f3ec2095edb15060bd37d3c009cab222fa21e0555a93dc2bd1dd6cfdff54e40"; + sha512 = "cae83ee0284af96069c96841097ec33eece0a9f2cb5f084ae9356f50af03dbb38df156eeb876164281c69553d46f2c0a6f11036faf58e78d49c297748c1b25fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9414106287db53abf4a57a0e3396a6dc03ebb8f4b5655d23cae019ffda804d8121544d843931082a21969846ac8d13f0f726c275c15ccc84fd7cf7e8c5e3fef9"; + sha512 = "2b22318e0b591b4d959a8365dbff5471e8fe4667a8a1f0eeb6810f1f61734edd88f656f36c36bdc56e71667313cafd017a26ccd9b11cdd4d1bd6c7599c1e5013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5b971598c8b2c89150ddd563d9e2001816a4283288f34814abcd8a96520f09c35f9f07068145010f8091496fda33b5200a4ce95be0804d2debd9b34c2ac71a2e"; + sha512 = "5a297a9898c04d3566e9841f67eb62fc3eb01bce2d4d643d10d9c1dfb09c55281a67810581f2391e29a9cdc41e7c9488d965c7f6202e5aadc3c6001d12f5a2d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7d8ce6ee5d6bc6847481c13ddd1f1002dd7cb6464d5669eea629808bd3d1cd1c28dd653119bdbc131c59588d4c92c1172f7d926a07ded78f8aebc28beb8f0053"; + sha512 = "90a98b1f6cca47dee81c4970586a0d791720ccbcc11e1146143324b4afe019aca700824feaa228b773bb5786ce3b173f6675f47ab63127480e8b832601026300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "73d581fcda9b9e8a6a97402f0b9a42245e015b20feea2428000c05fe10a255a7345bbbc8ef6f83097500dd7910e21928175911bccb12a5b841a651ffe0bb77af"; + sha512 = "fb1ff2cad69462b6eb5e6b017af7b9f97c99a7267b7c0d5708d876b3443e3eaf588b7154c19cf0e7afc1ad68b16434812904c5ca0989aad56cbaf47b76ba4bee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3f84f4d13b2f474252de73ea7940a70bc2da1d27e3b560c3f448493e1c5b10277a508848ceff8f2bee0fe11ef2196974033a88242b93cb0cd4c34c16996b653a"; + sha512 = "6c4cd05567597aaacce7903b149778cc55163a64625dd70ea83432b841299c8c46afacf643be84a2322ddc4d5331c0fc2a578e94a1b89cbc53bc5d65c5d1521d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4a667161aebf1b3888b0e78187d5de9030aba10f1fc90c74960104c38eb1d4474e2109b59e1eb2f4a41309833d0fc6c3c6e0dbda5d2c3428875cac6dec7178e8"; + sha512 = "ab3d4dc4b723e425739ade0263a43367b15ab84cce796afdfb392a60aef1789a27a5153632a9c9efc5e2a4c732f300d86b5e35b07790fa83792f6b70c5bdb232"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "a3efa1a6335c7ba1ba7615f90fce09ca508bc1de4e1483cc26f28c0781c215f71dc119a4fa1df0b17cea62c47ada4e75482e45f359bbcafb5d48b11f8acae7e1"; + sha512 = "5e5306c35a3d6834f3beb5e9d102d014cfafe1c2ce9b7da4939af347166c3fb78db1ebafb5699ef206df62fbf99d7b220f5ac205cc50c626c304584145a5e022"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f5186a99d31215c07ec6533956b52f263ee6c50cac8421eba039b9a5ffdc431efc075bc9f7cd0cad950e56b9a574f6ae47ddd79f1135e82b602d8bc2ad43e4d9"; + sha512 = "1377eeb88eca23bdf50925b1e6ba606205994c9bdd55776a8d41bbe99a9f57f4a213a4766005af1daa44c0a20a1f053fdd54195e586536dfdf658daa4e55be48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4c0103edb3041f5b3dd4af8c7a24ef87d372d64cea923f1e911a5ac565c89d734f30d8e17df2a457868e67d470c8609e2e60729974f37fc17c0ffc08ca676c88"; + sha512 = "b92211a08e555606e2b38d400e89a941920eedcb0da593bc3daf4ec37e93a8d796145bc088b4a1f6a3f93c0568c281790db025eb2e21a85e4a72b2bfb9e6f5fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "f00b933c155199ee59639f2e8f790d5995c48b3ff9280f3cfd2a968960e64fedd8bc8a6f90f023898ba966f4a91bd6ef6692e5d66d117f8fb828d08ed4536d4c"; + sha512 = "4faa4d802e59c7cbe684ae07ed499275200dc77f16ef0e262d0fff72ed3b8435e05a9aa710a3640ce94f5f8331c7044d449ec303d301de393ad1defe171e677c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "188e79610192fa583ad20b1db294079187ed8e7ee9bb1e488bb62c3ea3da6a7607876cbfa14158f2f8f39963f18e52d5926b95dd9e0228aa7969e24367b75d9b"; + sha512 = "9532bc0b84dacd779df9ee323e1c2a9f62f178b2972a1cc3936ee6ca4bbb867d217e2d11aaf9a79fbe4f18f9d53dcbfd91f2cb27aa7b45321d44ca6de72fd9fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "e14b97d251e1ba190375e8e6a29483515f123b9527963c7c90df6d54a022bde02b4f1d6df1c8ed77c427d01ce81e13132e6c178b5f5035bd4e7ac9c5f5bea6c3"; + sha512 = "062eb5cd16d0ca7890bad1e250836314758ff8dc5c56d426d24f72f23258af357f4eaee9f58b7991712b60dcf8969863abb9b2f49b7fda3317c48d612a26d0e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7ebe6f342e189dc2ef50e9e0a5672acf30169ea28b080df0106e25fb43ee6916a8bc7cf395f4c16c060672d27e53e551d938eef448adf4d36110a045c0b87094"; + sha512 = "ed1802bd61889dc1627db1bc410713f498fdc3155e8c32b7f210226bef04ad6d6b34555a5578384d427acd092c48ab15f282f870df69f60a9dbe9ea65382c83d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "277c44da1ae25755970483abf6eea4303898feb9f0dda099d5245f6b24ed638a565a616515521fc565153504fe86c4d832a780c1799569d4764c7f9ace9cfcb0"; + sha512 = "83c3cb82272b5e078de1ab71e936ab91e4a386f4ff94c690d62bf546f1d0794daeed53d7b7fdb2334ea378608655cedcd105d90bbcab9a5c9092ab1927a7b534"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "41b351181cc9ca4a77b1ce3d33c27a2e89fdbb8a6132c231cc17959c61b8295503e09e8f828a458f47df49c52166680c07d34a07460daec82b0897b5b6abcbc6"; + sha512 = "7968176245c32c729884550b7c8b2677b7856a086c06683c8808f29f1517872310daf54ad5618630fd3284e9e1eeb88dba14d629487906b696f87feaaf056e40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "40242adb26067a9502876399c2e1b53c170c7f8b0accbe03e85ecc69f9ba9d377f643d54386184e0f7a612417e45586949c5c47c93cf0e192b5f81adcf391ba3"; + sha512 = "93926d6ff2e6b466f21386643f045f65a819fde5b1276ab889d9fc6d7bfbc7b0d979f9da15744c59e1ecc565c4960c7f1e96657db2e4fdd9e04b9a3b46378925"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3880d95e5e5fdc1da8e36c58ce16350f9a3eaee4e6d400370b375c4ed77e1eaec950acd483de560dc66634cf0931bcc83b3454c89575029197402be18976cf2e"; + sha512 = "09c829a2de1727c6b26ccb8810bf2cae48fc2db84011337bbd3afcf6d64e9ddfad7d982816d2acea227ffe6ba94c387f8a8cedf45c390199c078eb8ff42a0886"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6bfa9b6569d188f8544cfcb7d20e17f1a2827e5bf10db63fe2b10e64c1993df2f7026a957fbd9df5815ffda67698a095253ae623d20d2dd0db4e9cee9329dad2"; + sha512 = "3b2b39b158059f223c476635bbf4fc2f8ec352c45a76a750391c425d996bda699d6e7a72aa7abef5ca13d6e62bd2577533b916902775567bb2838b88d975bed5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c8cedf4026472dfe887bdafdd15ef6cf1593bcbb1121ffb8dac5ab5d6ef230c463a8afc36df408ef81f5a3dedcef8367bd8a07deb0c6fb47f34f89f34553affc"; + sha512 = "048ab9de33176583c324428366e2f950de38eb29ae8d72309ab5559768818f6094cb47e6f4092fd05973a5dc21c1ca554e86dfaa254930802dcbb05e895067bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c903182cdf3cfd403304e47dc28603749fdf760e4a1b18b23a7723fee73d3c6835390bc868ecd445abaf3267bb69c188499f52c27942a63147b99068a1ec80da"; + sha512 = "6887e5286c28fa4e26b3b0323533dd3fd6850da62aa2180520200fcc24c7a3ba1ed1fe818f61144b522a268ebf38755650e8bb6f4bdb406418897a2ac978609b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "56b586ba243bf31499504e38f4025b3ca760a409c8b9d6c9edce120ce92eb697fe2b00fb69552dde0937174e8ae90c19d3cb1671bc91a38a0c9a930137c1c954"; + sha512 = "51a4ed003b8bae2971a8f6f58d1c0a2f738e225a7f5bb53f3e0d6f2dc3028cfe4e6b7deb40dd65d67f4cd57b85e0943e495000a47aeab991f7ff08bb211c79d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "9f3e97f154553e6969dce0403e05305da31e3363ce84dddd48bf5156ec2c86e7ee2ff2ceab3400e4c7cf0820318b981cd01383a77402f2856dae44b42138c52e"; + sha512 = "4e430913b1a6bc6206bd2e4fef04c235e2b3ba4bd672692e3d2c37d7dc56fa902bcdfc58a16e6a66c40999fd94c80169c129cdc4618f6dc1f73b2f094a36801a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "ed3c06e17d2ff131b45ba66c66834b69f733356a7c95a1bc6f1c4f8f987dbff1dc1aabc2439bcd01e6d6a27f45919584a09fbd2fe61563008870e90f9dc3d970"; + sha512 = "992693c9e20d6f08815b636c711c8f27bf616133365f2204d78e93c37b2c0f88454af1b562b2aa7879b7ce94621980e90451636cd0db8493e054b69519406895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "2c14e0ce6ffd02722e9d41492b1dbc9a5af909a49199a685733a351b1f3638702a9234c6ce35c5bf25dcb2c3155d7496c10fd6d38b45cdb5ea7fe066176378ac"; + sha512 = "92f040a94ecfbdef4f48813b21050a767ec7dbf71613630b9afaabd6d4bd6821b7baf8b445d2456c29e5f708a0c6d3858b8cd8e3143bdd3abfa5a43dba4e6484"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "23f6e5eae45c273efdf7f4758a56e5883e3063cfb2ee223ca775149a8dffdb9fb614e5ccc22be07e7d6ff3ec83534adcf6511131c6a4b2464ac02c520fe0dcc1"; + sha512 = "2c6bbf0a52b1ae0c9a63480768ece2bc43ca147c38d8288f0845068b29dcd995bc4b8744215258bfae4e2b90cdcd27d64860d9125330ed43fbe9cd3f823af73d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f0589827713b4466ad07dcdb7d289f5b7ffec184b8f259ebf6718deddd242a8269301b13974360c5e10a4dc96eb17bcb3255e1c4f10fabe8e8cbb66e8557d8ae"; + sha512 = "a8dc48cac66e89b7e2f8044f1091cc0e57fa791acd7f9af2dfdf4225e4c9c3b738c88f7a6e5f5683ddfe016b6158d87ead62f0fcf33e5bee48cb69eabe444921"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "de31966866491c5a91be0bfa8fec3f0c5bbf6add028caeafdf1f7479e7e37f20d58e7988facefaf40ff9e524dda554db8f425821a2cc056a0eab1b19e8cc2773"; + sha512 = "d05467ca3e2f4839419fe463a090ec3fd5fa80dda6d2e6b51ace3ea3df793332a1071b1cdc1b1187d73fda996ee59c97f6c2448cd29142fb8b27d4338fa24e4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "1d9c1fbb917315a22a28fc6fbfc9813a6e2cfc66bc774f20128c2b4949c5c96425e74f26f0872ab91858e339af70e5f3c0dea73aa01f2491d757bbab9d5ba434"; + sha512 = "6d2da614f0afe7e40edebdd823f25233050108301cf0dde1df62a336bdd97449fd2d4635e1ec9b9bcc33a9103633995ab92b4a1c691939b5486bf7d49bfc5cd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f3639b1bd361d86f2b134de404319ef6fab9f44d7150e8070a5fa2ea2e8cfea708a7426781ec4e177f4ba4355815f0e7c55479fea2e9e4a7ace4c53cd90005ad"; + sha512 = "b1acb0a977be5af4a539839b01a871aae8cdcd709a3fcef8f8793eb9e56a52fcf39e7459e915ae109387041f8a6c65c55c234bc088823fc790b1c56e68acdbfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4e4a678741561a2268292643563688cdaf15e188190bbf760952ea7c566f410092347800537cb7b80753a474e031e9066365d162d21225e8257440412e99f9ce"; + sha512 = "5d72d260044921cd9108264991fb1158397d2bad147baa15472f4aa7722349694dccde1c60fe7ae593141100bf26d5f09031f36a893e49e902cb3b40c076c76b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "f4525312cbbe3048f1d671517f552739a5ceacb52b672e212848a13ffdbf736ab475adadf1cca02a26068ad0a9edc0dab5e6dba19c1831647be16781a56390b2"; + sha512 = "1c66a63a4ba36dd1ec7883c1cc41db9665b5b141a607ded2dade770461365aac2f8430d7039dfec4de3d1baa5d12fe3fc4b36e7ecf08c706544d443fd7ffca73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "fbcd1297fe658b0743a5a791a05204e4bb7f4951a3250f494e48daf8da31432ba56de05232e68f6d3a0f6cdc4a7cf205a0088d56cb3fe08add03a27b05770a92"; + sha512 = "e2f24ed7e4ae2e2601700f02b7abeca63546c82fbb4c67ece0815474ef13421e6c06b4a14c3886813c28f722a2e7f3b421358bba089d67356448b0a00655a6ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "2dd10ff59acf1f362405842913eb14490d40947bef3ca2a793813ab99fe3d908dcb5cef5dfa2854399b37f11aa4cb3025383a73dad0c95e008122f87d73e5787"; + sha512 = "536d1a61b2849950a44d3a3b4cba9d468876c038cfc109449b9f7f3c24ca7ed1c50ff28e48658f3b90a6b7833c9a1b337ebe1cb63bdf7f8dc7b9c11f03a5885b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "50d5283440925c946088f97e779b84070c7ac4f8710c43aad42ad85879446ef8b9d4e070299cb64b35435421db8b1b4b1848b43e8aa1e3b88be453d4c84c0a9f"; + sha512 = "9c3c2bd596ab937e9757f2c6204f3866e0a6432802dec1019c9878c83f1a85a863df6f3759e992f0641af5135fe917ad9ee5988eed83407a94aaa2b7b24d140b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "51a561e1aff7c3f9d80a8da2343c168d7d12130d94b77c4a4f8ef5daba928082e3668bd87c7502877443d6f5d51e7e03ae8c2a993e91806048ccc40b59e4ef31"; + sha512 = "0a854b735af9ef1a72d90d5508209098d70bec03d93e1590e04ef3e1d0e1ea9577d617c0acba8aaa490090daaa2b9281b6bfd1c8e3af964146c8e7cc182bfcb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "837d627728c6ae2f1f717c379505a5f2d9b709368448c8344d156da6c9e87282f9821655ecbf4d4639d81c310777e29043126c01d4196a31358456d31489714b"; + sha512 = "e7510b5ba67d92be489098e9b79a39ebece92f54ac8d2420629b44d80d9cd3045bb46989ac84b57c6297ace41503ff7cf6738b6aae0e00e6ff16f9478566848b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f783fd68377303a315e8ca4ca971c7a302d4e1c62b7e3a289ded882ed972156131bf2a48ed7b904ebacef64e44f9dd6d14608b9edb90726a4081e241881d301e"; + sha512 = "cc05bcdcb8e0f796b3007132657980f8e61ea392a79b4a06bb0cdce3ac35cfec7b96f0e49bcf0517dd2e74309e58a67db69718a7f003093026bca1126ce1c399"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "df0be20c8dbf5cb352c20ebeef479bc1a9bc4f60bb8b54b4d81bf0e1dbcc83dcbfdfad5cedb42713ebba888860639a8e3669cc2c159254fee3885d07f8cb1625"; + sha512 = "158fd225dece07d6820609846ca1bd12e046dce97f8c20bf7386aa57f4c3f22db7611ec845bf48922f1fcb995d8218970a09b7c6a750f3a056c22a5a9266e3df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "bedb4e28f62ecd75fc93af2c8ccfadec755ec500a5aedd0a8136f69c23e39c5cb64ea509e9b3551453754a3feae7dd123564aadf8dc13e9179c199177b82be5a"; + sha512 = "271455f7bbeb694e932d09e32b9c2c3b898a83178bd38f9880acb087dfff33b7e9cf8558977167be0dd9022e18df0919472e3d5c665a9f107424074c8e4df85f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "02bac6fcb481ae02feff97ae7f83fbadb170e9ae133ee4f557882e004c21707f82e5e4db24ea6d67170f4ed88f7f0a271292eefb98853b0f96b0c894f88abd27"; + sha512 = "7c8b690c348a06c9be6179befd0d7a2700e8aa78a9d1c33c4c10c82553b738339f8cdf1be52c5e4fcf5eb980a6ca4074bde18f1ac3a20e0614cdb9d474b371c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d4669ddfb2675b3cd47a617e122079546ee4a35cb10ffc69ccaea76e3108155f3e209b2654744de356f68d789394a82b12b4a0c1ef54c358441e0887c584911f"; + sha512 = "096084ca8f060031fda50d698e264127309911da0adea44c55c2e64a29fce2fa0553ced2198c65e47c851a99f9a95d07373dbabc13fa05bb5df3552910fe2c5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7e58faa6d6a72d0a750d9a5375931a69b82ddb0ed1ed28c154d93accb3f8db2f0b4416de18352e36b4d5182b634ba1ffabd44fe6a89905f06755288c5c3361c9"; + sha512 = "0d7cd746877b8e275a6c17c7723c43831716ed48c28d0e2498a5ff483324e31926b5e69f4b14aaadac3e3eb126fd369e8ed334f1e1f38ab7e399edf5cbdad4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f4472e1cdc43a1a9d36d06306bd12259f3d63f6282c0ab51787d33af58546554442de80064775f4f55e37a3b492c33a6ca41acadadc85d4036b874d001a9f49d"; + sha512 = "31f13990de570121e4124ae53e450344a8c52e98547eed09434ef716446953bd27466bf550dda4be88b59ba22d0300087a741112fc2cc649bd9d8b97d21a1a52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3e3d4b7eba47980b83e9abaae4d59afbb879273e55c942e8320c22a67fec924744cdec93e679c4d789596fd3227695865d446a8604580f18b3125c88f50f26e5"; + sha512 = "07aa225a0f257fa277a932ea3c069ee13b29d2baa79c376ca73a44e04c3e409fe9ae2d65116bc7c3ffacd77685ee111dc68cfeab16432103044025d2a77707d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4670270b2fb252c9fd75cb22e79c68ece97e6bafcbb042eed842b12fff2d7224042b273c1106390a0f2ec4a246923877cda50c93313be2aa736a54f0ba127c21"; + sha512 = "99f8dc070613334eac983c5da8ec9f3b36cbee42dacb68d3c9b3d9c2f4f0df0652fb1ee1350c08c2376e0000539a3ab64b8ab742cccc4da72868e8cc323b49ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "30e7f709d3c9efd5f559082b00222dc6cb1b3e8376e977239bb5d76d9793092729d49255599e537c86fe615eb0713ca8c3f9a36a78c6d41ab1bc676ba46cc9b9"; + sha512 = "6b11e0b66177ec6bcd30f3c30f9a2d3be0f9b2edfccd1ba1374b12e04f450bba4dbe03760650e596b9bd56c9a21cbd2c4b73140d84cdcdef528fceca5db7464a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "313a8d22b9870ee916a571a9d591517ecc162c8d37fea2d3efce4e839bb0dfd5ba3f960796b3e2279f1c115d68296d31bb05434fdd2335164c0c211dc2a1638d"; + sha512 = "1e5f31e988489825a56ad6ef94d1c1b4df5206cd4548bb7b4d624f9472d591c88ab10dc9233f34b81a1fb421638de33905dc825e73f7df1a2378c87091a157f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "4cf19ea59dd841de4494f4d458075ce42d9d97471215b7ba2f7a84eec79d1258c5cd341ee013ddc422e060f1aef902dc93216aac15aad04c9b28466feaed89af"; + sha512 = "de45851b5a4b0c748405354542273d9489cd852e40dc8c23dddfbed2b5ffe8c988ee9090f098001ff4da9e446384bb65165c7a8f9445adaa8287c57786a34ac8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "cf873be3f9d72655093719937242a69f0b0644396e3332fabec20eb696a1310f88481b2f412ab45835c5ebf40821b298ba2371b20db101621710d7f522e19cfd"; + sha512 = "b0f06d7e3bfbd2d06c2b95cc9afeb1b24f46368daa3f8bf93c9eb5b3d939a5cb20a1ec65310f15a554fbc3640c7495ccd6333e202d01d72b4af667c91da45526"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "598d4308933d01459cecb91e3edd2bd428a70d7f40905f03e04009ab0f890537310b8ad93393340937e7eccce2d78ef15915530ef2f27dff46885f95b23d702a"; + sha512 = "e05572dca0d8c7539f433a72c4958a270d7e81bf74c9eb01b7838d0f52b00d0e3a2f399d69ccebc5fcf7041f9993b2ca18c8e078ba1b84b693dfd013460e4e5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "b5099c35b12c6ce96ee04b49c0b8e38b6304274ecaec1897008cf74af1809fb0a3deb5acd4a5cdfb27d949ba06a669d3eae450b59721afe9441aedb8c6728822"; + sha512 = "67b3484136deee0c48c99177e7efd8f9287f278b750da94483df9f0eea80e5abba6bfff021f6a5713df86e74032d29ffe9c712a0d5df874a9dcd554a18938aa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f1f5435ddc19aa2ea3199982a2eb83cff78f016473837e375ab0ab9b3985ea7f727c9b5a94137a76c08c3c1fe4af0d8f127b479d4bb9778bdc807cb46147dd87"; + sha512 = "9bcf8b221de817429b00d9aa229b49d99a67bab1b39a265adad6f54b543e07d98d715038ad2f17abb4b4c408fc741094f2a05dae3ad77006d683af5b67793854"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "019a84aa64fc11eb0266d33f67e19623f75960f5272a4b46ce9985349a15a4e16be7c84f3bd7293617cd4c778d62ec8d745b99ee707fee30f3a3627717793587"; + sha512 = "46a22299c91c7924ec3020221556ba213accf7459c01b9ed42241f92e18e410943bc26a3cbee0e01e268285d30affa240e690b18c9347557dde3924e2c9c0fd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "32ffe1615af1522970a00608a4689360ca21d51b3003d2ab41cf317a27043c72db483ad427af982925034c40cd84684c973d4faaba81ea503cd28503afb6055e"; + sha512 = "9fd932091d7e24f64cf6f275b28a02c90d2ba5d1fecf81f2d029b3b3891eb7e22da03932d8b96929c229d46bc28e8905147f4cbc7be0676b2caa85bb57ad5ad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bc88e7f0cf213377d77a3d8ba2b7a391a57c69ea1ed8c5253da5191cd0742b97b0de1566c971d5a9870156cd98af9e3c8ad9a1b175e1079e7a023f002a72af20"; + sha512 = "bb06b8a88a6b4086f3efb5a310c8e87e61d549ad5a0b3f192015676c15b720333011d4ed7829a5165c2703d4a49d3454512f18dfcd27496aaee2580283f78d00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1c2c9177fdb47271b7388e9cb445de61e2e21739a558788f0012c3ab8f9da5a64fc5d833ce4f8d8a7326807daa3147420b88d8d78aeecc827a8596adfcd60b0a"; + sha512 = "65a328cd8f87ac7ff2561ea7ce105e1faa33bdd727edc05488a4a5c75f456506373de5fa5d393c5050d7a2a1d600fcf754b80ecf56144f64248e491fed45a194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "5d7066183b5f8dd41f00fe89f5423109d6d1a8df6d51934c49e2c50c627fe3492294ba992a92d1f07b0ca96811a0d27842418b416618d059981a8dff21452391"; + sha512 = "4cc0ec59a111a22a81047bbf68c364629bd2376763bac9c361faf33db781c3dfa5a22b896a0cd3b36baaeb935bdf4340d64357496fe12c01c0256e3bdb95751f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 6c6e05133bdc..54b588fb0979 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0.3"; + version = "63.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ach/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ach/firefox-63.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "bcf519e0080aca1cf232ec327ea65973e71230dd60204bc1fef3284dd94fa123f4a60421b647a3f64352829b1ef3b0e0b689a1fa7a06f6b1848c5acb1d33b917"; + sha512 = "0557937473fe8758371d21ec4b0d983ac2db59e8b9d3d627a318d3adf9a0cd0712f3e9b375f0cd6d9acf3f39b0c42fbcdb31364c5973916c7287f618a5f074ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/af/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/af/firefox-63.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5b145ab068216846169303dd75ad3b5a40e82129234cee35cd7a559cde0dcbc6abb1d6ce50680b9a8180828db82f3c23d62e9dc46015a88b0a3c75eb164c17df"; + sha512 = "4b0d715ba2a7edd648bcc2c396ea764e8a29fce69d526803e6621053f3886df44d758fdbf2c8af8a9e3acd307e10dcdcf3e13eff0e60bce28885b699cf2426d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/an/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/an/firefox-63.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "92a7b8eda43a1d6323e058d285e5b599b14ff8a7275d8e900d9ad8d5dc8160ddbfeb8134b877cbd078b3e3ce9919c2906f4cf7f9224f807f6c0ebf0c6e906be3"; + sha512 = "79665a9586e0fceacb0a49560d0fc2a72a76187799563b0f8ef972043020744dafc971cb94b52b30df6056673aea4e0885f994d55c99c7976f9f7805c30e5796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ar/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ar/firefox-63.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2592b6808abd04054ab6d71b8f44d94eb040c92f53c755b2258e4a10a3c8cd80241dedc2e57924e9410717cc8943947248b27c753c6223aa57352b0a08cd64dd"; + sha512 = "d338b5fdf1dc4bb920bd372ba69934ddf39bdc7e37b725a010fbc9fd71ff487181d898e863c7ce9a21039d51d256c4ec1ca2cdcf0da078788243e867b0bc151f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/as/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/as/firefox-63.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "224c3d09c1122f2444d2bc75833d6db60a7cbdacc819d16d40a3d5e6537e275a5720f1b6d4616ed318868683b99547d03aedc21175781eab0b32ec8c6be87495"; + sha512 = "2022a993455456d0c900ddaf8e6a74a3d5478edec456df0cba627dfa1ad41f0274053c21b9c1ca4ca6b640e26993d60ffcc2f879c68143699f6e31d43f7acc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ast/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ast/firefox-63.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "26b316efd6d4d238726e5a1fef3a6ad00af3f42cd45846598e4562b9c5b2d35af3372e283efd30713464c440715de82ce49ce3d73569ff528d90ec479264110b"; + sha512 = "1eca2ca8385215a886a16de77988d76e41b7257a41fceacd3df18e21ba82c8c67df045aa8201a2b18032f1690997b4b8bfb55a80c47341335aab45cbb15eefd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/az/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/az/firefox-63.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "29935c406c955692a469762a9c53762d6a8f7ccd4555b53c31283f4767db2547a17819f7e55aafd011b3570c30839e350dfe74a52d322047647ddaae58b23919"; + sha512 = "3788f68a69a8605e3185e5e776edf3339a650e010fc4810f574e5c0a62c9aaf30c84151ea169c005c1f381c3eaa4c3a8f6758c336a9423cfeaffb83aef96dc73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/be/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/be/firefox-63.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "e4a438ff8a9100126f0fac456bd6aa7d0713bf2e22e7ce6490c4f3ec5643087b668bb5d8d867c9466a289a964f957ce958dd9545ada53b207bf026f3f8200373"; + sha512 = "f538b9f8d566f7f3c5bc92a24127966d618b47dd368ecbb4fae0e5c90045bb75cb1b921edd865227ca6c34e3e2e037acb81d9f7368cfdee59cbdcf6ff2798ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bg/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bg/firefox-63.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "3b17536b1bd6cbb94548b7b2b0d05ced711ef116acc4687309c3392f77ec0b51cb4814efbeee26ceb51328a4ae5b5ee1c4d8e69e57c2580be8cb1989bb082cba"; + sha512 = "497a95b4309e60093ec3f1b0a72ac05d1b9a47d78799ca33492394c7bf0b81e64e60103218c479b4ff3a3b2acfcf95493f43be23feb89fbdfebe42ec8a124132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-BD/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-BD/firefox-63.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d9969a8d0fda1bc4d108f0c24e934235186420734df1be38db9608e303d7928b45007b40857681d0b29826bc26628b3b86388c81925059ebb23b6ccbeb80f375"; + sha512 = "3c2123b34ebb2e3c6def220c679069b31b3d7a2110ec2eadea88a930b6582fcab0452bce97f0302a39af324ca1b58ec49ed49aa865ade7d814152bf16fd1cadc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-IN/firefox-63.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "7e449679b8bece1eed95ca5e3bfbe1a303d9dfa8bd4b9e53d14f99198e01a4dc4367112de48ad50b61c3cc54eaaba8caf143c36336da3c86c2815828ca5a2a80"; + sha512 = "55fdb9a3efe54db994706fb8345918f5c19f1a24f77107e6819dd1272a09900ef3534897c1d3b38c331c94813446694b2422356ae6ca2356338d6253e15a37e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/br/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/br/firefox-63.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "328deff7045bfa2187c19a66ca03a0c8f25e266eb6ea9c19715c201702245a0c338458254297974aa18466350231dc800f20b72c552f4633d5eea176f45adf80"; + sha512 = "c35e40bfd6b1fb06c8426c6f9f834f8a6d658ced8892c575079d852dbb2e24f09657b1f37bc8af3588cc2c8b9ba1924cf5a85c7be0d6db4334c592f03abeb142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bs/firefox-63.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "20f85e5ca5f7a7be5079778b426e252c98112550849fb6e16e3b0d52a15570e638c8a664976a9252891a2254be59fe436dcda0d65b1f9ad5cdbe0cc5636cb93f"; + sha512 = "ea63659f3a930b4d0a8add69cd8ca1a3d98e015aab1b6bc607c8e0fbd610de8fdc49ac290c61bcd762092d4f56554f70f029a18be4bcf426cafffc6fe9677699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ca/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ca/firefox-63.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7abd7b7220c6a5b1cbb4c8f9ee6c55d15682bba5bc1e1356a038f9b1ae7ec351c57ef4dd19a02f8216f6789342d5d91cf76a00ecf13e71c8fad0f1fbc315e775"; + sha512 = "10993691fe9072706f1c092199dadea2f1ffbcfecede53771326dd03b88387133aa23e75f96bebe7117eb02ea2775e5758c36064c5ddd72f7aab441feca659e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cak/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cak/firefox-63.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2a8070bcd971261d994ae2ded0366b9e07961e1b98aa76c117d1e949a8f9990a22ba461ebda223b76f33c7ca94e1862a888b000642a4f874b8b92d2b5f470736"; + sha512 = "0413afe78e4c8ca1af3edad09c801607c73069366a255d4d1d9e6d4589ba3757c732a2cd691b8f223ab10cc99cdcc322e98d8daca49b3107082a8cb41cd278ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cs/firefox-63.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8beb5c0ee3a0b2a556b455e41887dda126a0892df50aba4e283f0db819c99c4601427370c70c09d176f1a6ee8d629e1ec5f8b803d51b9444237e56c7a273cc0a"; + sha512 = "d4ee0844c1587ed0d65d40a444fd130022f99831749f721523b0f594d4967e723fd8af10c363f53b4fdca91f676962882e93327dd5b1529d3d66c27f17bf29a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cy/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cy/firefox-63.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ec1a4fb0c8f753454aea88fdcfb3a340d0328d9c059653d9390a71841098573d667c2329c0c8dc88a2fc52eedfd8dbc584df2fe44fff273f8aeec8a3f1eaa0f6"; + sha512 = "103177bdcb204d0da7dc8fbfcd82a52bbf3956b13f716de1547252a076d68b21f9bf4684ed63a62aa4635fa39cb776a64942d81333ebf41dfc5f12d6087261af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/da/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/da/firefox-63.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "79532e1cf94447797d9d816cdc342fe0f8c37915494ff000bbc7148c2d42a1adeb7226887d51999774b6068f62d71bbb54b0951bc606003a91df12e9f24e7691"; + sha512 = "38cc06165c713ffdb5a2bcef9b8e6c7f55c2e821c4e4c87d30b613cd78aa6320761e709f3a784a0f55da283dd7088ab67d0e58a16a90bbd182985d29691bd50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/de/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/de/firefox-63.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5f0d10736912f6ad4bd38538601ceb8db10cf97dd414446366218ccb03ae010037114d688409cd724e194126524bdd442f71b1cf646f1f3ac46499afecc082d6"; + sha512 = "076276ef8556922e80bf74aaf3624e6604eb904ec6dda35df7f91edf99c62015d1309ea1a5cc28d84ce96f9924dc908c81f959ecf93f2419156d07bb303fcbd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/dsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/dsb/firefox-63.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "2cafc29c75b055e4c21e12fe2b2ca3c974ad53fed43c8b082e09323bd1854ae7179da13c7d33edf41f783fe0016053d52292bafbccdcff79cc69d8ffedf01ab9"; + sha512 = "979013e2bc62db710891d95d8898857e51bc1a2073e3a56948af57c9676fdbc87b6a9d827177a5a1d7926f71d83e9df706c42ea98bca98fab998815daf50458d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/el/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/el/firefox-63.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b1246b56eb0d61d5ac874383ee279d3c9dfe559127052c4d4403ab0009d702a76711d05f1ebb781f972d9cbe6cee9a6b3c1aea9cb74866e497f2569480a2cbf1"; + sha512 = "1f4e5983ca94ecd9da6d65ec7c39ef7e01296f957cbe3812a20981bafdd9a2c0e07bb5814b5caab781ed1f2f6fb2ce2079557e3b9bbc1422b2fb7d882b921ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-CA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-CA/firefox-63.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "8d344a08fce1be002b5710031250aa0f13d237bd38386cb31d5f6a75cc29ee17dffd01e1375e4a26b1a136d268db6ebaa591fc23789b3fbd7771f42a6bb59979"; + sha512 = "77a9038b33a15a2f12db383039f89d29f1e855aad6354375517726d28c5e1984fe77993cb802f17975488441ef36ac143c1e4e2d29c7104143db511229e9b28a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-GB/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-GB/firefox-63.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "88899808190f9013eba157345adc740fbd1889fd1ac963209cf093e9bd9f1e9b3f35126e85c5d3a1590e02ff1da8c09fa390ec519bc0ab01bab7c37d9b5d4bed"; + sha512 = "62f5374d07b90e80d9f67b04a647f68fc75af267e9b9c04674d754b0d023ed9d78241a693f11504d5b74902328c68414be394923493c17c551a62d06621edf4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-US/firefox-63.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395"; + sha512 = "906376e344b9f01c5eca8a6e24386927a68613a74202062fe52de5bc1b9d1073103e9c59d19f40f33efabf0f5e4852210195691a73f1bd05db790e7c1eac5f28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-ZA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-ZA/firefox-63.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ee679b5bab64492bd069cd9b3b7509db7a5296a019d8712afd12a5b6ffeb1911fc4daaf63483b895b79652f67f9095b66be780a2b0dce3e7b9b57fb5fcda316a"; + sha512 = "895f9dbd5ef281a48e5c3124dcb668b9fe4d6b41a3402850e68e138190b756ab10292bd002c36a1f8391ff3598c48a8623552ac35d18d0948dbe194b28684f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eo/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eo/firefox-63.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "32e54f1a83e4b3cf8f7296fad200abedafb5c7d4bd409c7acd2806944a241b6923794a33a7999754e4d2010f2788ea3a3d08ee72a9354713b6cc2ee1dc73a665"; + sha512 = "defe31badc0ce4c41785abf6aef543584778e5c6f373300c2fc3582c89daaa500cc9aedac55e1a1569abd8eb0de207268e31b9eae61565e76a43eecf41ef774f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-AR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-AR/firefox-63.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ce740d773ecc016eb89e9fe4370e199294f8c51c4f5f74bbe7f09a5ac060b374d23e80fd8a27b63c6149bcaec2b93d58a892ba7f53c08628c141b406838e2d58"; + sha512 = "bfe81fbc669fa156c6741c62b00c9ebcf74fb2f49c92206c5ca79986358e7b8ec29d98d206c4d0e21e81a781ed8216fde5b072f0f1a19604ed7c3784b82829c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-CL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-CL/firefox-63.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9ea5c06200091975c98587627ca371bb492cef91ec200a52409b4b30092aeeda64360913b8950ce56031aef34e66364bea71bb071df5549736dc0900ac54f7f2"; + sha512 = "cd3bc97552a30c9eabf8627ef97db2d4f48f2fbce4c72b5e6b41000a623ab1782f87ee8ac61dde5e3fccc59a91f87b4a3b279b90de3b08e90293329bc85976d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-ES/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-ES/firefox-63.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "df71790d420798b17e64aaeb007f7f8585037d48b7c8933f5760b75385c945ef16e815c84b5872cfef8a2ebafd3293cbb4910befc4844b166f16774947a9b32b"; + sha512 = "1d761d479df22483c576598db8248b3ab6a7b838c518058c6903d7097452c4027b9c38cacd206063816669ce664501c138741044369de04eafcd40087ccc3688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-MX/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-MX/firefox-63.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "02e0948d3f4855a9c9e502627cf5d199364c0f0a7ee7f4314d69c9977f8504e43c3dc1cb8e80c9aa6bb6f4d75609108f6aafa8c9acdac31aedb908b5df26e1a1"; + sha512 = "934aabdcb204dcdc80d9e35cf19aaf83dc235f95d597f5b2a6302635275aa68245932f4b5f1b2725ec84711e8d0f2c830aaa45406ada91efa2d21c8b31995939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/et/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/et/firefox-63.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "776bed6ba54f1ac29836681a99ec673741dd439501b7859a68c1d6645693f566fb3dbaf2e827cb23d3ab993ff4ca290008de7256aa28cc6e29625eda4048db27"; + sha512 = "5b669b4adb7d14eb4550fcbcd05a1e7a1a186954bfba39d491248b177d057662227b672d2902273315c12e9d57bb944ea2df41d7cb35514fa00d79d235c178c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eu/firefox-63.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7e95ac325fd4726def5aed67ee110693dbeb7953aa5672913c18cb1b91f8a884500e6096a5100e89d9266c28ede9d677be91fb00227944d379a946938ffc752e"; + sha512 = "c8555e93e6cc7d4fe179ad68ad1b2fe3f0735134c8a30bb9911b0bf5475e169e07640eee85afa2c7193b27d96c8cebe2227d38e1ff7499b3470b68a04bff2953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fa/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fa/firefox-63.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6cc8d99ddd690f7dac9da19d23666e655aa65a576cf912b195ec3f83ece9b5a6677d656a1d187930897adfc021ee3d16e3113a8d8454fb9b4a9f878c615b49ab"; + sha512 = "c607251f6b855fd86504fec3780ba66d8d451d76a16d0541fe5b96ba5b8d809ecd7d591209f3320bfb044463470b394862a6c0717cd9398048a154d6c2b93bad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ff/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ff/firefox-63.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "026976b48352d2c292d27b0df8f17f75f2bbdc0822d89b722bd1e58d9189ce35c925da6de287f0f89e18ac9f64134a1bf5dbd3b6da609da823686acfcea5b05b"; + sha512 = "d9850e4d78d6bebb9d342898bea876d66a9811ac62ffcd56ab8ca662a4db6bd872a643ac233e02fdebb9dc107349d7f0f258ad790ac11bfdd791a2d8336197a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fi/firefox-63.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8d7621858ba33c340248df277f3822c120b4beea5cfb9811afd61b85fc2b5dfdb100c475d0b291c9bedeffae4ba52bea653d925571af8c68bafae6c997beba74"; + sha512 = "8be60c2bc3c175aedc3a1c062107c5368f503bbea245e87f5f269c9faed3832ff8c93f221815637b3947c474b44be31f3ea09955e7a87d2be67454dbb4d4e9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fr/firefox-63.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "23f73a32cfa388bc21c1e202886d83a36c21a8b4fd83f7001ce72a911be800d9dd2d49e21cdd9d9cf48a82121d4684802dcaa7d97b3bb47b762ec4c95be49011"; + sha512 = "ac559deff6caa20f40bb561e350129e765ba7f63ee8758dc01542fb5f685262c0bd6ec0d13fd65c196aecb352b72b62d10335d121edcca11500684fdb1be8be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fy-NL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fy-NL/firefox-63.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2d3c4d546d1d8f03ab407c2bf481e23bb4bf191b84e9e0da533b2b00a0c8f7cea7c5730fcadd777b909c9515981e61a1fef25fd1037d75bdab15901a877c9fb6"; + sha512 = "c6a19730d2861a20a69ec8a7ded79377849554f21143e3b55ef0b009519b52d9ba2fa0f2e58ef592f3eba00305d0e2dcf44df958ed22043a83a86ed7fa72362a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ga-IE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ga-IE/firefox-63.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "7f52631104ef48631d2d2d5434a50d1f62447b314329e9571915bf16b246c9910a8875500077474303806edc05993d79c72b60a2b6f3a64389446609092320d0"; + sha512 = "28c68d871e4e025eb22f19fc1c4d786185934bd6254f03061b95eea8459776c9c28a903e30edbcd53f6e0cc5b24b6c65e2311a6483e18620b246ca8ce2fc5470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gd/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gd/firefox-63.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "98b9275029ad64dbebebeb697ccfeb1dfd2b0d51e437899a8417292f2a14421a5a83f07164cd4158250aa08d5e45bbe4c97e1fc7ebf3fa02cf42d7dac740aa0d"; + sha512 = "d6e9b226b893050925259a7de5dfc67104b6defc76778272adb8e5b41427a646549ddf6e38d58d9ee4bd27c476406ac9e65244fc57f78a3ef54d7c7bc758df80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gl/firefox-63.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6abd8e3d990983094880056924fa60c14efb6c133f05ef129294c7cd83725df1e32a85bc08ddffc22f3e3d4414744345f67ca5f055af74a93a0eaf8838f38f8e"; + sha512 = "3f73ec82235a8345c2e1e86b521f062a5f45bf0fdb884533c22f1661bff430c1a3c440c5fa5c209474c2eb542d1be25ab2c6a4aa50b872ffe34bb66ef2da6e0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gn/firefox-63.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "043471a8b62dc300f1c719ea33a6c8b3690f38876697cf57625e26bf1d66ec2a4b6f952c836359da19f9b346851c3fc20525fad32596c9e91b9f5b23ca1672d3"; + sha512 = "4be814c72579653264990737b7eefed0ed7f332da1317bbff3a0a1d6f45aecdac12552eb0e6897ac0bae64f261de6b46b36588623a8523a51b880d1bde5d763c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gu-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gu-IN/firefox-63.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ae849a0f9350fd0382e859ae9fde0217d73014c3fb7a7974b635b3bb2f7d62087c7b40c62707ff64eabd37ca700faa0f392e737b1ace15494d44fd6a87599b69"; + sha512 = "00670cb7caec8f841f17e613a86554182512e0aa49ff7c8298c9d3c9d364d7fd391063b890461cc41966e5facde0a8a325ac97e08bd0bd9d25858b32c348fa81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/he/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/he/firefox-63.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "49a350f95858916d73aa71be60bc3f162bee24556c06524ccc5d10eb7658e91affe4c8945d92c7c6958eb7c8bb3879211d6096a1912bc4b50a9e35b465ddd219"; + sha512 = "653538026ba533c7446108a2277dc7f87a2e519583d27c028be2b056c67299ceb9b2296dd83f94c3a043a2bb9fbb05de2260248d408f3279a7c8fc49e0e84416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hi-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hi-IN/firefox-63.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a55d2647fa5ffe06fc479675676700edf460c7d7600fe18ae468fc3e13a8cb3cc025dd64bff244b61724ee213835a64c71e51e2d59a0ac2eaaca0a29a692dfaa"; + sha512 = "a4989edea0edf4f509d4387b225340a4b67805b3f8cd7af67b575b1b3b5a8cc98f9a8d6d2a05ee878e15dd8ac2b0c35f43fae52917a8b667098f1812e361fbef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hr/firefox-63.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6d961a7936c46dbdeb4d66a6ba91414a158593120a58f9f454ae77839cfedd5af2dc9d3dde02bd2d36e21f946b5ff9de0727abf44c2ea78f6e618cb84242892a"; + sha512 = "b762c1bf922e72a9cd8570012962fb63c5658de25fa08ce4532c6c96b7b06c0e13bc71b2306219a6e0219a8ef7aef168a8523cf39b1cc1e6362198fac0696545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hsb/firefox-63.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "eba4e20491a61d9de7a25373bec43fac62b9ac3b461be5e593117ff4d31884acee63c2c6bbb56cc7eeef67bd36b7d3bfc748169fd7fc49877efdf7656813ee5d"; + sha512 = "22ea6afb26555d88680cea7bc1fba6570aa7e0b8517b23f4f5a7d3f2fee285315e29e818954dacd29768642e62a57adea282fa35116a7733c1012d2578647bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hu/firefox-63.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d78c29d57143a3aa443ff79718afcc9c7ddd72b8f9fa3dfebcd6c19279947685a7560fbc4ba2de42589cdf4d9a71de94e335fd6641ce284fc60418e483895b97"; + sha512 = "cbd0d026cfb693c7eda3f58f0954bad41ec260e307b8a4a9d4e774e2277786420f99c8afab9ee0fc9f7cf7f9e4542904c6d1c1b92c1c3bffa62f8dd9aedd8a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hy-AM/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hy-AM/firefox-63.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e7239c2f90870322c16e9af03da9156d8d36b6ef5b71053006f78f94af9da068e81521eb155abfa74195a83a63f7181cafba270c9bda2d4bea63f9cedf9aabef"; + sha512 = "59315b0561ccccfc031b240b699b019c3b6d2769cda6d816bd60c359ca1a4076c4fcd8342bbff6cd4cf66243dc5164e1c0066bc7821275cf5c11caff0e86a6e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ia/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ia/firefox-63.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e614f2a89feb9b2555d2d3de019c1c6b74b6891eb4e9b7d9e055444ec923689442e6c7ec8f2d8605236e0556c79827a031a870989635234439e678eaf1846e39"; + sha512 = "2addd61131770c825227639d5d7790bc0c9f0be430077fa31cb11cf74f6ec191f6dbdd88c4e0b2fc199eeee7ecc39c6dce8c790924224ab0603e0af41e082a63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/id/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/id/firefox-63.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2e5e40dbe997459c14432f80d50075029ef79d1fbcf64fffa527bfffbd5c348ad84a2f2909045ddf98f2b268c26a20b1bec0c00ca753e64782a0e7dda972727a"; + sha512 = "81a68f78f003685e1a06d242ca3c24df27b7a0b28d0a5df2f41cbe9b92e312b32a35608c7e094ca136d6f6356e523c62baded1cc027d19342ba44cf88b479843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/is/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/is/firefox-63.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "77875a40aa36692f594ee0e714ad9cffcca0d036669f10dc31ce8492c1b372a885642b9a3f9cb85ab94833cd7accd425ea673535fbbcb93d3255ae74711b0ccf"; + sha512 = "cabbb8d0f7b5009aa6e889c983046a5c806f1c077c8e27f7cd148b54a25c9cadb5010acb97b2cdbe6480463f205bd7a4edb966fae0a92a8380439082542dd9bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/it/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/it/firefox-63.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6e737a1911bc5a97c6bc3ccdf33d72b5b964b2e155672ae583268393b3d9ec785765d55a0cbbdb0deb4fd4bd8bbd2bdd0849ed27ab782116f3d09293f441f40f"; + sha512 = "8d3eb041fccf54dfe389566cd11b2dad4276fee3b902914bdb4a8cf06c6613a39f4ebe7d00d33a1873bcee32f398b0527d4807d08ee91e0accabb92205eff51f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ja/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ja/firefox-63.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "eb69cae70ef52c96b21f74fcf339ae031c4dde08817b211b4deed493d0ed63c87b28cea1d67123fc2f36ec4ff375f8d8a4f6eb07f0e55be87e1ae74d001dff77"; + sha512 = "facf7aa7f639104956f44dd4f2a6f4064ac4474d3c3bf2e355f1934c68831bb774172b719b2f0685435e3f3cd56ed589980d06a1d2dbb6e405a5f5c32395136f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ka/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ka/firefox-63.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "87c7a6872de8829615834706fc76f1eb093c57f9c7866a45a4a43f2974288f05d7a98a3b563b65b2464e649c8a34972a9d779b6386bd904283db907981064f58"; + sha512 = "c8d5407fd932d83fe6d55fa012c9fab70a4d67fc6043dc4c9e18c6f6e25bd4fb8feb0dba97ec7a8a3f1cccfa37c46cae482b9fab90ac29c34b57a35387742b66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kab/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kab/firefox-63.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c65d155fcc48d9b57590bc09ccea6303b85c1a7bffb8ab6783e39408ea271c341f558ca6800eae145baef263af54ed19b882b0aa39ed75b38bfa8a4f5b3842a7"; + sha512 = "0949d40892060b97c1fdf69d9777893b2456d5c936d29876832aa41492c01c1a07c88665fb669d53b8cb91f23757cd14636f87ecfae7aa112384658288afd4e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kk/firefox-63.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2858283a1721fffac6af65505c26d3c761331df82a7a17d5e107d3b9151cb08e448cf7d80eb3bef29068b9a4d0bc2f268207f86e0afa692a50b8c9e6623bf835"; + sha512 = "30d3e966ebad9eca27d255c20bf11bdc5c6073f0cec8954c568c4abda86f689e5a9c4c2f508cbe09687e0efdd2ea8f5f8ef5de781c3fde399f39bd9b229bd187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/km/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/km/firefox-63.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fb77850dbdbd2078ca6b7933fd630550d52ddc57615a789265756b460840cf6389dbe138be82136612762f48fcc8da2f8aecf94c3ffbf8962b6c1dd6f60cf52f"; + sha512 = "f9514178a460bc3f1a6e56878f951208d6afe92de893ff1861e38ece04909535d9a5de8d59359b6de32f0bf4ad462c6958b0b881c3678da074cddcc5a6ad8150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kn/firefox-63.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "cea7b6c2c1c82b6d5ab14bbcd9345325c826600bb1c736ac898358e9a5d96f0e58eefdbc03190a51d21b4e3ecdc477e6b2e88f493e3a787219dab6970cc3eb40"; + sha512 = "cc229a04e851f479f785d1abc0e2b486f20797ae0269d62cb64aa6bf8a3925958b9271bcbaf0acc3dcd7fe7f39b9077b1a8a7650055d2fceeb2ca6db676240e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ko/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ko/firefox-63.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1f8b2af8a153d1b166ca62cdbb652e255653e8ecca33eb10d81b71007f5f6d3645cb33613f3def21f6384137ddd54697a880f9acf77908ab0b800a88b4420813"; + sha512 = "6d7ccf3e6d062014af2c59abf03b3f9300a1045855cd6f6c37d8a9c9733ec7c2775fb702ce219b96d6c0aea4dc1121188805324e1f65e5b222190c5fe34a9fd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lij/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lij/firefox-63.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "0806dce8a381741d7df769e87061c15df57b6839fe3230be30936be5406939d79502602b02202654d78fa45f284e33aaa88c1d62b4cead4230e7368737105761"; + sha512 = "3ab2e904fd162bada37cb2536c928fb2f5bec09d8023556b42c9b0a77395f1288f65cec792d0bb6def19952e0d49dc6e3ae7a8398697ba2341750d7707c89fef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lt/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lt/firefox-63.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5184b3525d094e80bb16acbacd9e8323f83f25a3a1652d82f0bad6a78f6750081140a6c007a4c2fad8c2955fad2aea07577642341dbef01bde1f7c06947a87c7"; + sha512 = "3e821ba12956af86bedc0d179542cff85631fd20bec53c34c410f5e3315be076634548ea512041241d82c46a88387a830af483fcb35cc6a4d897f09f3fb93be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lv/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lv/firefox-63.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "49f878a62d140a6667a76e89b129f28cef1a56e02212aaadf6eaceed2c776e54f4ad23bbe58c6e013a16c29bf81c06ef942451c726b7372a20391cf75e08b1ae"; + sha512 = "21d5e0fad3bd77c2e414044dae95e8464d33fa41badaa0049294a142b04ccdeb62708f209b5ad8c07d7eb5064479b6f4a58433b0ca7fd0436e62ccbb5ff52786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mai/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mai/firefox-63.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "4b24b433fd5c695960476fff3ad678e094bab5d81f9e7cd2d1c6a3c56075f0bdbd4f24f6c6009e0ac5b5a4a25a7e72b2d566fca0f08e6cbada8131b9b5700be4"; + sha512 = "c3e34de39bf5c77cf1c61d3e691b838ac4a560ce098540d6e58be13d7b1760a670f00aff505bbbb417b37190e494e48426bba73cee3e8e2454a73c15975465ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mk/firefox-63.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2c500c446c3ba9aa6735df3fca9673e056d04b8d8a059ed50bcb4cd7b5819fb224e12fffde3d33d5658adab93eb9f53c296bb422556264eb3bdc08e4a386e238"; + sha512 = "9a26b08ba538caf677e1a2f3f3c98e5c67e51e7dec72e73097036c6f34bbab2d5b77ec9bcc96679bd3ab7ae83c3bd94d2c3307843d82f8b1e9ea95455ec91308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ml/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ml/firefox-63.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "3e743c899e60cea9010c28355f0b1d3f5f34da6c4865f7c284edfa81ae835bb8ba21e378c3aef36310cdecffcb1be3cc0d06b9e7c9ce2ff15482db3bfee93bcc"; + sha512 = "924193b490fb8d65604fc7f61a6f00b79074b61ba437060fc35efdfa117d5014144c285ab149fe7b9dcdb75486ffe516ef1109eb751a6951c88e317d0c3bf222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mr/firefox-63.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "53864ac115e5f84f50b4f33103d549942b4c19286bdb4c236a794239bd9f40bceded9272c43aa808405eabc2a75ad36d2e643caaf30732a57bfa7d2de4c908a4"; + sha512 = "163b3aee29777bef44bdfb56a637c3fd06c435acd05294818f3993f32f8062d0f1ae4fce96c48c05d99a9d97521e58230fa7ee7a9129b63956fd5522722b5c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ms/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ms/firefox-63.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8820b20add1fcfe14f30a4b54428008cf770feb321b0e9aa27a0896c94bfca84aa1b4d3c4c7acaa30ea5a615c94259837bc9539c0b96f6702a3a5b093842dcde"; + sha512 = "7eb5b0f2d0b69e56e01c3aed184a995e3634853a267d30fb5149850269c3f1efcabdda8625a367ffd0b70282d5853158084e5890c1e79078818c19a94630d9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/my/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/my/firefox-63.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6a34963674a7448a2454e2b84cd732cf679b65db568f165d13c699651efaf1ca4804b0602181a9dbb301aad7e5dd39646b19fb3dc73469792d82f02220a7d9c7"; + sha512 = "41eda41795d4db0198bf3b603ce097cafcab58e37bb58678aaef7ffad424fb6b9bf462801052a78c9d02092fef58a845cff5ab5640714efaf7eb94adeae2a669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nb-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nb-NO/firefox-63.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "cffe42d175570493c853044e0bf774155e1b7020d4d26aec7e578a6bc5cbaad057c125d30c7fe92f818bd9b2c982c775f19ac5535f606346b46bab095dd99b18"; + sha512 = "d87d4b281238d8c54468196c3a3ac55a2774fc4d04a4e9939cb47f526c57fbc1366c2ffc590d01767bdb14448edf9a11a21e8e221044529d0b0bb83532476040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ne-NP/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ne-NP/firefox-63.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "72ae1ef7e071b665abb92dd07add0b4023cefb64aeed09638768152a0c15d7370686849199771e7f19272b5df8042f72f76bb02e57f9a304c6dc930d49c2d04b"; + sha512 = "3cb49431e5831d63dd849aec87affb63e170f4feabd6701d520fbebe9ca16aafe448152231b4823c494d0595d23eae81fa79e5b9778a1c1a08d5011e7ad25908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nl/firefox-63.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b290a26a41a6fa0b0d1d89076aa5beec4a250ad2ff053e83c19108164c95c78ccb50ad1fdc6e1091605bfdb1a829d108fdd4528747309682fbe472b1332ab741"; + sha512 = "d29c06e0829eb07930605ac1c438175c65029f9635d0feda571c944e91e93332c99a697c47acd55f27f0adab49f46fae5f81955e783ae70cb1247029b0687de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nn-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nn-NO/firefox-63.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9f4ea82b06102744696c1c842cec65250e4361c6e37607ef5cb8e03abb31bf97ac8032de7120f369362199d4aaae1274563a09f61f04dec07d50aa94358e13b4"; + sha512 = "2f9acb29eeba9aaff86ebec0de7e67a6b17ec48607b5bd1c9c9466d465fba2825d41c86e0ae7492873e093f7ac36ffaaf1c744a5e3ffe0f3b2b5ac468aa43c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/oc/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/oc/firefox-63.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "e75d1a8c0af6424f7cb7575797c70b230919d840086f4bfef850febe36b863d9663d0dd45c6488528794f7f7356e0042c21dbac8e607689989d55b51cc64f3d8"; + sha512 = "bad2f0d5f7a9a7013d74002ead12768d16cf949b7bb5ac3a130c5cfd1a8911a68da27d4682a7cfb31ba20f4d826ece3578aa46258c8773def49449e21d0bdbd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/or/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/or/firefox-63.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "563dc60168a9e686c6058117ec12ab84f55836ff442f606f0a7ae6af663cf73228956c8d12141a0dce0a80d75386623002ede2fdf89c07b6a00379c08d00b544"; + sha512 = "aca0bdc501ca0d4de6f8036b3aa3670ac6044563d54aac931fdeb154f796b2814a420432644a53329d46677cf7b77d5d3a8e4a3f6aab5469708ef9e4364590ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pa-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pa-IN/firefox-63.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2fca31b8ec096191733a1a7ee6ecca37b3ce2acec56be01e23556f68ca7e6d3cc56fd1ff0a3dec7b2bb090d28606d545690f567d6432e25e8b335d7b238fd601"; + sha512 = "e20d542fc62d4610f85c0c02737c294f4ffe14f88da9f15f557ae170c332f131900a59718cd725dccaf282fe29c22c85c8466267f6b0d16464f5992e9876b536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pl/firefox-63.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "0c2f125b0aca823fb2a99567ede66e18ce9ebe1dfb649f9d6ef5bb4683c61813d9f9efe94c2224dc7ad441fe0f2b3136a3d090ac1335246ea4c4304229c106a0"; + sha512 = "e3848d7706e78f36ff41ad10656976b11ca12c98285bd5b18afb13dae9cfd43f2a38378ccdbbd741b6a2603daa1b3ed72eda4e8f47153e2eedcb066cf073877e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-BR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-BR/firefox-63.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "15563039e10ae5a6464ed0d20c0afab6d6a3bb5e54bea507db87fa03c48be22d7f325af22f776d052e49b9ebf9659c36ad77e92a22f884a0c443e3d49462b003"; + sha512 = "9848181304658218d4bc0e2c21dbd878f40d3ec5a7d93d9ca6c7e1efc803f957e845344b15f697f347da0a743b7f25bce2e5b822a81c4e0f038380ea95509605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-PT/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-PT/firefox-63.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "93eb9f47254a1119074e462c892698de6339bf68ecb3c1f3d4ccc9c97758ee3a0ce54cc026b8084b50283f7ad7960245efa9f345761ec8a50b4363ec52d86aee"; + sha512 = "8d9e9f52b80bd790a919442a970dc8e0f19f8ed5b64de22c4756fa9c0f7d1b72998a62aa249a9e8f3dc1caed1e74a07cc91ea15ee5b3f5ed1e5e340cf148eec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/rm/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/rm/firefox-63.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "96295dfe17a2e066f838add7f3002e6307d1ef7e0212c0c3bc543bf7e3ae3be9da5a49bc6850b3c4b5f5bf46e112bc690824e528eb90f15864d43c7ab55d0eaa"; + sha512 = "ea7cfa4dcf6b3cd3a483b73c8360b525d8002773a5c766887306320d99183b035f6acb9761384cd44cf5cf3391e3fc06d554e68cc95814ddd3548de5ff2e311b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ro/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ro/firefox-63.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2782b44a49d116e8d15c0df9de710f432195a56cb46934e3d5659e9c91a190dfa49289cac64c738323fc2399058dd9e3bf607fb01d52cc9ee671499c4c29e10c"; + sha512 = "97271af95125b146c4d3655daa99e59c2b3f1dba57e9c947b7337cfacebdda5517be62f14a5a3eda723bd1dbba6437c0825e0f5200f9895fe678ae80708b53ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ru/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ru/firefox-63.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fec5ece757f19a19e5dd4d92a073c8e1fbde56757e12e038a7247edef11e4fc9daf27264b560ea9bf8f37008432df4d306f8209baf826c537360ed8c6ffbb538"; + sha512 = "e8e3fefa17ae3ff51bec782b163049eb10398cb1a46b2fbc8124e9000ea0a37a0adaeb71794ef392fbad501bb4c04b0f98765cb94f90cdee4a46a30fa07dd925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/si/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/si/firefox-63.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "cceac95143d3444e6b4a589d6685ef6740ece81b4ea26c0b31b4253a117b4ee239468d404bdd9caec9543e645e9e985304eb8a354000796e2124d71e23b74921"; + sha512 = "d16d3ae7c5b5ef04b09b6c0afcf4fc55f8e47b20729bef33d2278bcf4727703710f27cfc610b78ebf8e9d45f80bdb3119f438da2598a4922a43cdd88967485f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sk/firefox-63.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1e4b31480a5c75bdd350cc17b159e2e14fcb53ba39215d565510ed54cd7d12d4e9d6901b1ed0909140e03e31f7c1005ba8e1a48a3a2f6d91bca1e51490cb30d0"; + sha512 = "3d23ce446b62314b5b6281aa4e8fa7e38ae3ea9ed7be7ae3d37d223b69ab8ab20a2e2d772d278538db8a572b839d59ebf4b7aa40211049f81641784c523e6fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sl/firefox-63.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6ce2f2c338ac8481224518bfaae55ff66e8005ef40ca7a13cec294e1b797723b6c3874f96b6c2e4fb78ae526232ad267cfa407b8952d454fa5f4eb40bbcd19a8"; + sha512 = "25e2bb9a9e92ebe5507ecea35302792acb7be4666fcbfe3dc7b0cd8ffe77ccfd514f92b9762346a5a71d55e28ed654ad55752b4ca82686d3e8fba97473afb6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/son/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/son/firefox-63.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "24ad351629771a6f3ad8d381508bad99094ae441f6ffaff9ec19d8018fc711ab852a42b9d1d0f447e8a4da79c1fc177ee9368940f15b1e89344dc7beff49946f"; + sha512 = "13f167d22fb355b90b02c4d8fd8f9aa38e7f6e626c633276a34088d5ea83e410cf3a0c00d33560c4ab48aac4613cb0d422751f8c8b7440c0fd59b8e8be0ef204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sq/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sq/firefox-63.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d8c80ea61e545f29a8a2b0bb4ee2be81650c131123693f1d6955d00364d67c4bd78ee6c85903d84d62c2405bc0df4f45f08301d1a13c30f6f33cb24ce4e9d7c6"; + sha512 = "f57dc4ec2cd1b8a45ac114b7f838d34f766f4f1f4fa9308504e6c9bfce05fb977e2982c1d83f433a957098d9069b58dc0c578af948b38f3d5f53ed59ecd3ef24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sr/firefox-63.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c9455bec9df85347e6aff71b252f57f4859bbb8f378d274010ce402da0ba6931d9bb0a6d0f2dfdd4d87700ac68b039ada9fe7f673f5fbc7d95aeff738980e68f"; + sha512 = "89ab6e7a42ccc21b0a2c3c2a55b0e3920d0addb4505dcdb98ff6d93e995f18130b31dc92c55a0f72301c59cccbd142f439a24962e19ae24ee25af59c6611c668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sv-SE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sv-SE/firefox-63.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7b80caa0fafdd82fe1d0e1909656f894515439fe21f6c41a05455a06c89afcd72fed37c846c8168e874da47598d1eb87c676637ed9047943d0483322acb027ab"; + sha512 = "e5e1e25d4c5d1c97e715bb984c0862237602329a786776b3b3a5407e585399fc3d5ea7c8e6927292f25b97924a568c95bcd758e23b74ce71cb7592877a5da3ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ta/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ta/firefox-63.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "47a13f1bb090ea5271aea1add660f765e330b351ea6c77edacb380c74d5dd1939428b98ddd4f4cceaed38af9ca99f6f499298289f44c5f5d7c78c9ee3fceb9d1"; + sha512 = "4f9e44175061339559ee743528f4e7dbe4e9b0a3d92cc178879aa71f1a30fb260be307ff75722a2f69259e3fb13e509228ab86d4a6e9708564c3696ac3531afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/te/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/te/firefox-63.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7d0c21a749be9d7bdca8a7b6baae2044335244ce35932d913575cfba1eb63b4cc2a41ab79a5e19b6d3ef0607eaccb0e6303f57cfa9d44fa21deca86a34b52843"; + sha512 = "99e52a537ec1048b63dd77a9a9ccd1e44e8a00af256ad8b0f61ecd4e2767591550a000e66cfc1b3db4819580cb05dd7a76f2d64a4839a9e72dc43e65940afb73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/th/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/th/firefox-63.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "d02a77da738db455e419fb2bc519650d911b4612e5d5e282c54100e719d8b119b5e3119cb458f652ae532128ca64afad1153cf4b3434bffecf2cdbdd67cfc029"; + sha512 = "2db11524432184bff0646b86f665431cf71a1f3389185e1e85312af7cc75be26f55f0d899262405db411acc21a549a8d451b63d1c060fb892040c72b996c0b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/tr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/tr/firefox-63.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "87ec0311160aac012e601ed753599019b499b08e73f256d78c68a695ed6c1ecab53095ff16b007a4be08ffe54feb0dcdf31e7465271a3f48928abbcc5b80d5ac"; + sha512 = "90b2543238e92f66981c0aa6cc0e563eb1bd623c7bfcc9a72aa3f158b52ddf8fc7c0b550312cdb279dbb192c3cb5d2f9019817435a17d79b31239564771ea644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uk/firefox-63.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d80c098d00c9681220c9ababf0f62b69607ab6b71ba34d177941332450ec51a5b9120e0c3e629e0eaef91c64beb9b10aaafce2fd094f931cb976a99266d63a10"; + sha512 = "cc3973e6ebcc956a626292e09629a5041bdab89e92c94c4ef461e01f2384021b39057c04981d61deaae238bcfc6cbf0eda2ac19e271fb7fecc4c22f42808ed36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ur/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ur/firefox-63.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "98d1553710997d61efa48c7d84fbad2fba5d730d0259b9213811b7a5f47ef1e4ca8940f4e17708e8dfb7949b4fd908bf80dd5e9faaa86b3e3d2c3a07b3a3d7e9"; + sha512 = "0efd6d37984445601e5076cfd19e345c2f0d038d4eb88e4543c90b27c468164ee16bf7695fe8a8f1d6fc2fdec1c8ff6525886da5b84ccb8ee6ceee8d751884b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uz/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uz/firefox-63.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7a6074c2d7f1d40c41a5969fb33839df065fb398e7161ca7bf4d6aabf22a87deaeec7d623f0d36f992f8907d696c5aa53136cdee33bb623dfed94cc402b1fc46"; + sha512 = "61ff04342906c902710dae18b8c83e40e14120bba2276aa677543032bb0667b12ff7c9df70ed5e478eb3fe79fcc1ba306b738ec5ea2b3bed2728698f49f7b1c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/vi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/vi/firefox-63.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "013c9210066a5b72f9640a5d7d647312391daeadf757e5b13484a035d5bffe2405f80d4fd750e7afe81990daf14baa49c6c4d77cce7e1a60a3483340aa115524"; + sha512 = "615754da0770dc5ac5347f7fd3ab5d4ef7aad96167deb5e7b22714595ad96e59069794abb676bc553b8aff226fe37f3db84c63ee2f662a71bd3f9163698beb0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/xh/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/xh/firefox-63.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b104815968385980a7bb297d83fea2dba4ec18bd853ecb70ac7065f30e0fcf5fd3708376f8202840d71c2d9e6bb3c48dcfa866594d334dc7a5ae3cbf3b83c888"; + sha512 = "4f82fe26348a515871f1c5775dc0ef4b31fff9a3bf48944379d08aed499bab55b314227e354ca17fe644807f1d2b1f732b8204c3179907c05f9c6d168c7fca3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-CN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-CN/firefox-63.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7961e947a3c34343c54d06e62e522f503375d83c8fda6648197b1408ec0916e54dadf6da982650c99d4b7215889eba015b5f1c8e5ddc0a48b9aa6c0925286540"; + sha512 = "2d13d782b2988389d2bbdb5560d494c77d2ef0ec479289ab683a3a7336200d2775577b2508f23587bcc8d3441693c07593c3f040fa767ea19a8adf29ed9b9b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-TW/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-TW/firefox-63.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e09fdc1b84093c49fa8918310fc2a44b0285247548941bb5150a5a64ebff12c1ceacd6e8e397137da14ca6d8336bb2411dac9f4d1126c266da679d1214ba6974"; + sha512 = "af0c5f6d98fa4cd4556c46740edbbaa76653630d1b8fe265e63caa54e51977e6eacfbe4523ab29d3b9c9af466775dae5f62b00468cc644d6e84332d59605d6e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ach/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ach/firefox-63.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f0544809f924d264af750456abd6331af1b4116710ee9149604bbc11745070a76d84cb50f4810307a078e8ae4d2966b6771c318243215a3eef8ad957b8127414"; + sha512 = "d4b255e6675e460c80df56aac8a81a531d90c4b6ebeab018a1c5d333da440d780a89ece811f2a24616949bd71e7471925059b13fd32a3376b636012b0b035f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/af/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/af/firefox-63.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3c96ed1cb9408d888478fdce554d577930d2d365d10dba7c3fb7ce93db8032df25ccfad1f055ae849dfc63428afb9935dde013ffdc737f364704d4b693d9d751"; + sha512 = "61ce8c74d62b9b2e35d7a46e0b1284ffcc3837247b12e8e5ae0242049631b5c8050b353ea07ecf7a925e237dec111d10fe10c86e49fada11f007db0b3ef3c29d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/an/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/an/firefox-63.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "87038254a3f4a6e200b5de6b6269adc0eca198e9f2739bb810f00fb028f746a989b50b5433fe3577bf63250893b69b45bc7a5184d2a6c050818e86213b1b64be"; + sha512 = "eeb42821c1e94ab24cb4438245aa018d44b84c89afcbbf271e4905929e6908ddc922768868b3c9bb4e6a83ccb266ea6b4f2d82f4a3a35c527130f3bb2aab88cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ar/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ar/firefox-63.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a7f2231f026fa90f53952bb9cc7c36663226c87afc6629466fe1d15e379048bb9e464876b0d8c79382536bed850c2f806c1e8b06fbbbaa1c02551f778767ca89"; + sha512 = "068310cf06b3149b8c54cbc8f56f4334eb1a5b0cab1ba5d7bcb899f507836240528d48c3762af4f37e4d5a9a1eb7bb0a5610d66e0911aba47c3e1ead3a0281b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/as/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/as/firefox-63.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9a101cbb2d9b689d05b976035e524f2026154508a3c18a9f1e238e600be0924d36573a951ef3a54a28e62311f661008f66ca8438d40e985357e537bfb7b71d33"; + sha512 = "1487c99d76cf37a4a53b6849501670fa8a80c6f7431f6b9503bd493dceb4786697685bb6d3970c4f47b121c8cf83299225112421217a314640ea7027cfc2c0bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ast/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ast/firefox-63.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3305cd08c09726e04ee0d3a3f0228092e596641d1f80e5703c869ce5d3588fb37bec2d80a2db5690e5fee5517c8745f13e9bf723627a03b499e59c7672ce932e"; + sha512 = "cd8205327bcef45ef0610c4c8e5010c6eb3b488401b776186350351f433a3dd3639f9c8c7a2fc26c3a3d578f85f49a1f3525a84b40a473443ca81d8d8823454a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/az/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/az/firefox-63.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "138b35496601a577752dc1362dab7a5c8dc8b3a78b0c252748dbd15b1bb1013e304aff8d8ef1a9f5138e4e26dee74149c7f66eef752fb77ea75a6dfb8d388895"; + sha512 = "0a7f11ea5f476e0a45e70bf8a1c6779ba32b96f81bff2f88c8cfd6ff29b6951456dc9aba4146ff13faaa35481c1fdb26ca944709dbbc72e4c11d9854cfc2476e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/be/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/be/firefox-63.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7f6608f932f96bd84f57902482b691aca966814f1475bbb0479356c792a16e4698a289f944d7462db71e77552f368df1dad3181280e3d0e07a5261ad90c2bf63"; + sha512 = "8e34c1b191e2d2cae88c94d99dc3d5bf6afd8a658601fb723d1b0f75f3dc7dc85b9f3bb6ecf24bb75e94a411f82c56fc88dd8a548c670351f19fc4137ad77751"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bg/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bg/firefox-63.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c284d6ddc03c3bcaf82756a8f9909e12ca193b9b2a21096f84383c71e1dd5ca7369a4eb6c02876ce741ee38e6418e45fec2ad4936e7c6d48ef270ea45ada462d"; + sha512 = "b7ba0be703e7e52abd61e8e27a25ee7a8868c1872f4babf82b3b1775abfd073c4112f738eb1ff9f341c56a15bbce5d5663895f342618e7b81fea0cfa35f3ae2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-BD/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-BD/firefox-63.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "eb9b3e070e6a2882a6b43d2a0fa7792f2b8700df9f64ca70e6f616e6237e0cb15c5d5a642db8f7b236c7cb2f4392dbc553072c544e81e0223c8f4d6d85c36be1"; + sha512 = "ccf789ace9b1e5b378a8e37fa8e1c68e52f70247305e369c536981424f6baa9d8bb132475b4af512780a6b881d5e2090ee985c9fc9481c0a0718b0028b516dd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-IN/firefox-63.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "73c4c67bb9f4fbc47509c53820319456c614a74dabe8ba14d05b365a3ba9429d1d9ad9ebbc6d1edc7bf18f4a387ed9dd92850478268f2eea3541929558f14e6e"; + sha512 = "4ca51c703f5a394b149e7c9fec038a84558fc2eab0f8ac7a2b7109e5e73207b94cfa998c9fa8f4d2ac4bec65e7f6ebdee804c5f0801bc815dc5aaa50aeda3db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/br/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/br/firefox-63.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "78921d68f06c26f029f29fea01a15c5dd54f55f59150e08d38e05f640612355a494f72d88c0e80bbb2ea6f54ec26b3a5716c3249f1118202843c4ab1ef05f891"; + sha512 = "750480cb435134377e0d09a1c0b342e104903bcec9c68ba08827ea20027754f55cde63b0d44bc248800f85f26747f5d5552bffb7f5344bd5848d6fd7d72d0269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bs/firefox-63.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "643d5ebb610d3e83a6ed85a3239a8631c150a86925ddfaf5a4adc87d0a8add022a5e35ed20fafe5e6f1a6835b3ec105ae1734cac6552d79d95b83bd34c1e73ce"; + sha512 = "1d8fdd486341c623b46a93d36bce8ce71e92269348f7e344122b9f8908c6db882d79f5d46b2498e3177df73b5344747f809b6938ee5f59f4fee43a3e1b116624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ca/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ca/firefox-63.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ceb8f81f3fde233be921da104d993546b1200ee348b19340f43dc697685b87c80a4377d406dc72080701614896f7b1cdcc27f364a89a92e433639603e08a6611"; + sha512 = "760d086dec533bd4bd98760a9de99557591c9916bfd930de061105bccf97420d2662b9286287f6d92d5d81f37a08bc30fa57874d992592eca0c531faa61f98eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cak/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cak/firefox-63.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "04f5dbdcfcfc2b996a912130335ed855612e5fd2f27bd4cc615a369be2fc2dad14ba43511dfb2bf47a9fde3d28b8b5913cefbbf34b89383eb36bfdcdb96cfb3a"; + sha512 = "e6238a1dd0ce26d80b3237f70ee822bcde3ec9149a55a152f24d4f9a44021044b8e15a2a386f731a4d7b026391fa72f3a28055f1f02dcae11d6feff670581f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cs/firefox-63.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b82cfd9dc6b57e0bd147f508a38bf41bedbf8fd9c6725434fcbdc8871cf6f683898ff0507e0e2fc202077d234096cea252acce56e6faaca738e60512b3b9e1d7"; + sha512 = "e96e451f5ad543bdcc44b87227190716f0e864408a006043dfebb37d6f5d464e08ace9c98c0fb9e51531c7aba364532a2b3147519bf6d521336d6950e4d54078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cy/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cy/firefox-63.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8f9d4ea520c99d3595d8ebfbb8732e1bbb73b7d39ab707e0a3f86d3cb928231e1b7d84c7ef017d9f685a2d2893c0b486f27cd4a704f05cd7518465452010df97"; + sha512 = "0ea943b9b5156f4e814e501c8b7a589d888e1a2f9340f0c064b134d2299e40fc766e5fb8ac89ba82e3c5c586b410af16cc86caeb71285b94efde9e171652f57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/da/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/da/firefox-63.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "28ad6674fdb830d07837b826ead67503a943b7cb2330655b75ae7bdb5f348458f19af37ab775d820a0f0131a6f7d5dda52bdabdedb5b0deccc1605912e46b9c1"; + sha512 = "6e2b71137d36912e6c4f28907b251a19bcb1f6a3f9d830b6c7b3e90fd28c5d4dfd5f31496ec45728141596b6b37c78b3c29fcf07b85fe0facf1e47c4953edf31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/de/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/de/firefox-63.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b94ebbfaa81bea44e452d0ae69c3069bf100178c82bc28b3d2841ee14dfb4bc2c55b99d325fa4d8049afad93e674d24160f6bdc235e329e9575b49842c731d5a"; + sha512 = "def2445efecbd7a998cf846c438e85e4b751655d36212b46227aa95483b474a78249e46e5d44beeb8a2ceb4baaf1e0ea84cb742993941fa2ec0f90f13f11f098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/dsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/dsb/firefox-63.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c292abb164b948ba76b13548c44fb41033ec9d394b3d3d710dadb72f666c56d16fa7d72dc5c3aa4543b81ccfd2ff76bd5e94cefaf88f537bfa7c8b16b9290f71"; + sha512 = "3cf731e4247dfc99ac7eaf85001b70413447a5409518a8aa7791e8affe85efa703c607ee9b2c3896b1ab3c640e0d80610bcca3600b057c8d0c09cedcc9e3b93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/el/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/el/firefox-63.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "35e01baea98785db080f801b911023c6ef3d5bc6c61d8e3a5e8ea1ecf7e51153e4f2646db7a8fd32dd1f778e1804cd2065efc28e8d79e8475105d9f12c9b0a7a"; + sha512 = "8ac061359a5806661eabe8c5e22c30ce795b0e019abf6f2d6b673d37b2842887525a4ced40b6aecc6fb2f02ec841d309866fe638f105ffef8576af5d3fc6cb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-CA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-CA/firefox-63.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "ccf68a4f05f4c5b0dbaec25c69fe66eb9d1c23f3ad21e6fa2be14704fd5227fbfbac8d46dbd036a6e17f0e94b58a4fecbe91520da45d56a2901074bcd7031516"; + sha512 = "9d62cfe7f055db10bdb8dd152d6dbbc40ce12b9ef4fe59086fe9818f87d95c9ea79092d25d3bf8a34cf2977b28a505f3ded4406a864d493a6f4bf2d625bf124e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-GB/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-GB/firefox-63.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "49eda2efa176054adc5579ec26a9da92df9903c16d989d761b8b566568740b135f851e5c2b983512b644e80074171895431b3c1689708dda9d86c757dd7d2599"; + sha512 = "ce98acdad497391f8872ee0c41d2fed73a51c0d52e8e812aa7a426684bc0f39103f95cbda3bde1006aeb95d8662275211efd32cfe82609a344178089153db2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-US/firefox-63.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4"; + sha512 = "06d5c79c57ac5b46cbd452a3a095ff0b87ed9a4cdfdb02d73d90947c29a8ab4c34f2bfc3f537a0dc2e60c83350531aae07f58d1808a08bd57a79bf2881144ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-ZA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-ZA/firefox-63.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "7629e33144c955d015a17bbed4d1e570ae74045511c6ea1db9131b711ac58c67e76748e22ecfaee5b594651f7c736cb0d6d87697ba9dca46705e5328bdfbdb2f"; + sha512 = "a162dc2aaa5f2036849bd73bf0014f073235c853b3fab0e3571c08a85f6fefcbd9a7d3c033d5515126e72eb1cb54ad9f68241201ca9bbc786253f0c84f6e3590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eo/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eo/firefox-63.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "13430d5a4462e8e00467f0d39d2ad03ac684e0cdebb21901cd0ee4f2411794794cf5024ec51d915e3917660de6077d6dfc08aef30fe6c342f5b8588f07883f33"; + sha512 = "1639bf250506d4dc4aff272ab0517c76eff75cc3fb4e8e9fadd2028f877e204d0bf19e3eccd7107fe448f1372e3f6dd19c99ad2f8aa1891b1c3b2dbb4b8c34ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-AR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-AR/firefox-63.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "44ca9daf57afbf9dccbb158712e9218d87db4254855838604250b8a4254fed7adadc266e3e1fd49d23b34ba0176dfe5f25fca42dd5fd6d1c322c857337de35b9"; + sha512 = "b9afb2474208530ca83b4d8bbd59176f02558d21143227f695a8705a70b16e6089d86316105deff2c89b857fd14a5c5bbd6c057aa9b66e9ebaaaff763321a86a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-CL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-CL/firefox-63.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "09e43c14a99c54ae123364ceea46ba7b1b38e30da8d15bdb734b873a63e37b6b4292edb6f8ec4ee731e97bd12194ea76ec35e710d29ebbdfcf7fb41b1997934e"; + sha512 = "134eefbb975dc1ad3f98cf340b0c544f084bd2a1bd1432594bf228e0a23e402461e936e777ee3fe0c9a86bfc59947c35f6c6d7cd74deaf6cdbf1224c9fbdf4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-ES/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-ES/firefox-63.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cc1f5b4e421813c9b044c50f66a28f9204196f9ba2574ae537dc3040d04ffb6eafcdca971536387cf2d79c4c35de5ae3a5335f4796aed878aa5ba817dd7bb308"; + sha512 = "66fac925408ea40d3348f207716e732f878bf5bf5837499a9a27a9b1e8e4a9210c3400fe90faf2807aa30d49f67dae2324e7b41d80a21daeb531e907bbdb35b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-MX/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-MX/firefox-63.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5ca49c92ea11127ed80fc48c5699ef541287bb6f53ea7ac96df990e7a82854cf8bfa8c61f21d0bea2fa245a3b0ded7aa7b3afb662b1639c421525900f8e7d688"; + sha512 = "e1dd051782b59f9b2601b051459e4f23bbf949b0d257dd70cd8bd171429f661274f3b7bd5d8d16a5daacf5a08a488db85b462c667c3c3ce0ea280648c5b2820c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/et/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/et/firefox-63.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "074986b9e80ccf1dea362bc7a28f7e44d2fcb9c19878a8456e63b64bb1e0abad293b6dceb6672bae200cff1aac1c774cc99faeb7ce52d7e6a4b3a154dccdf4ab"; + sha512 = "9b46809e42acaa8dbbcdce1df8f7471d20cf40b0a84384edafaad1a0afd17a1f2385c6d41d7eb5b472205e80c528e3408282ba0d81cd19b8d92c7f0550c4a5a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eu/firefox-63.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b823fa6c5aeced11c6e0878e11cba561a18893e531c28e9d7713e449905225ce8aed35e1240876976c4335e958e6a68d5e39037fdc59e9f0e900d5d822236c89"; + sha512 = "790dcd461764cad902cba93054c35539d2aeb30bb5fd3a6f940ae125368944e20fdbdba9899f3b52b6774fd27fe73a13c0eed7e269b20a7b73dc4fa123122a1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fa/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fa/firefox-63.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "e842e26e5095f008fee36f7b84a9932cc9ab868e9145d92f8069d2f7f24017ecf538db7d0525f7233bc7cae8a2709fa2da8bade077e864cc05c1813ba4a1ff57"; + sha512 = "4e0608da711a17faa10b5a043192b52e6d88360752d9c388e173bbee3de86bddf9693dfc75cba7ac42153e95a8056c6d0ba48141cde476b524d1fadfe3a3bc10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ff/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ff/firefox-63.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "0eb63c6a996dd29ade92ce88f2f9065da63737cea459d8b2e7c79356b51b43eddcb639af9efa85476f500885a249b77347964982ac297cb22adc501590dbb8f5"; + sha512 = "1f50eae02bed18b0230c824c9768b13e2ede4c622e42120f6cc684f7cdfae4753eb31f867cfb272710b2fb2ad9e649a99d2187eeefa74a5afc1999e002b6cfaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fi/firefox-63.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "db4da21885411214805a45bf4279776144c3270845a6dba20da95a54ddc5cf3205132ce2762ee997895b7a6f83e2f31cc618c17668df4d4211646a1e3b24edf6"; + sha512 = "5f089861d3a67b754e5ddad49858789d6d6ee309507baf9ff5198e011c26f970cef54ed37398458a3729beebfe9451fb16981ef32607cf1635cc40b7556a7f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fr/firefox-63.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "12f3fbcd0f085f4547a4406b25d83858425a4653ea9bb2bd5700e21687c2d2ec8e1a032f76a242edd72be99813cabea3332c18921f16c54edd8c430a017e4948"; + sha512 = "5f8963809cc8cc33dfce49b2ce7e44c8351d8a3d193766eea99c668533abdea89d53233ced42c9a8d57356195a3f31f549a486a42f9f06c8ee6d32720856ab1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fy-NL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fy-NL/firefox-63.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "033bc2ffed09faa76e67258bed77597bdebbe20eb0a8c17765c7f3261e9abb7cec558aeb8dc913344e4d0179b85928ad49c71979eb6f20c6a092fb7d68b9b8a6"; + sha512 = "50e1a6c68daa2d330ce9f8b070413e100bfc29f7a0f1a7794c58473de04961ff62f776e2c343452ed6ddc3cb309f615ebdada91e4d259e60f066398068141e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ga-IE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ga-IE/firefox-63.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5481287ee60e87e9f71baebe196254f30f6fd793be8b07e4c216bbb9af3d81c321f0cdf77d4459ef6e50c3fbcd7ea6929eaff38bdda2f8ec18acaf44495f7b9f"; + sha512 = "42b2b796a5ab27137e5207ead28daec4d9a0a0fdd58336064c30a56f13a4389d49188c91b6d2101d49550b071584ebefb81d1c3fcc3d9948e2b14f00a7c0feb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gd/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gd/firefox-63.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5ab61163854e8255e8cfef5ed8674f6de79cd084839c65b5e2758530135acea5dc159f7001f3ee26f9bbc6d931bf1fd0fbe360a3a570add9560493a8b7e18629"; + sha512 = "794193059ee643092981491b0c32886e77be4faef7948c5db2b79a76e3ad4baf30dc149cc63d935a9210c02ccaa843521398e9274dacfa6f98ef4f49caf65c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gl/firefox-63.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ce59c0e9cef75ad9b762d9d8c31f5c3606c047736ef20fca91a12376ee15bd67a46016d0d84da7303af61e78f1ebb6be0d99f343dd2cced01cdbcac536b0fb87"; + sha512 = "3a494f60eefef37ad8b62b30d1e32ce9e783bbea29e594668839bceb416d6cc16786a95f9cba06f31b027b4bd40528738ad26c955adac3a433ac083e49642b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gn/firefox-63.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c73b5e5b2ea49fc13f2acf0397d0f98d0178f25ee2ee303fc0647ee4f939eaa465d329affb2e3a41eb6a0d46f413918b01cb7e01b3776f42712d81472e1cb325"; + sha512 = "ddc555b5f0aeefd9fd435442a457c7c37d4bf4e338b16bf10e1f1798735c52a758b30beab270f03d425dae187bf9d83f828afee627c7d0eb3dc7615bf22f684d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gu-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gu-IN/firefox-63.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3a98d619ddfaaa94d0696d05b940d82d12c6696c98dc4356190a6c6a45a602abe14e84888a2282f6b685f26d8954e3efbbd0778b594ac63ed629e922d91549dd"; + sha512 = "a3b67578d9ab00920489d088d59f3ff1845319d9b4467ae3854ad9b08df72a07be94f2436f93db7524bed13a467ed0acf1d271dd6faa86ba9ce74535aee3d35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/he/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/he/firefox-63.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9e5fd865c107b2b9daf9ebac3ffc1d0c41b35e5d2b10c930e2cbb1da4aabe1040d4c522940b63e42c2cb2dc0923b851dd6a8ad9fd65da73026d9bf2d44dcd238"; + sha512 = "a6da54477d9a4ba632ab0c077904ead3f83c1e268781ca2bd8fbeecf15da62a3d1393c8cf316716c3c22f7c949a48e2cc7e90bf6d394b5dbf5559cb8c92c8097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hi-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hi-IN/firefox-63.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0d625b2ba90172d4e42e17ed7daf1b030ddbaa4327f9d321c67beb0c71e20572705bc54b9ac709fce67384dc6d188fb6832ff7d6e85c79acba8c975cf06455c2"; + sha512 = "708c9f75ff02efca7cbc7a2483aba15cbe1b22fcc5d4a743633d027afcb22a0ca5778fa05ce40786279a1d145f75c4b9bb64a16bdcad87c9f6f6a439ff748fd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hr/firefox-63.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "317c6fe9bb37418cfa8fe2d48d5afde58a3e5c192d2feef515865ad4669d65010ff5ca0f82efe22003f9ca763cb132798e1c86216f3ef2875178d367b894d651"; + sha512 = "6cc028e94748d9133887398299e21f70abffa4df216ab629eb579270be8c5ff9b600fbc2094b9d47ec60c577a2158ef3d3e81d63492954260d4b53bc19868769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hsb/firefox-63.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "298dd184b47db389e1b40872dec2c40814c063ef6eda8582fa6fbef647b6f91e11d49026806aa7b5f735ddd02dd48128adf8c5f9bfe17f4b9bc9e6c01ceb302c"; + sha512 = "81e8f54353a6279041694ff9e95eeb730d3ccf7438cf0b1c4c45425144b3f9e655656b9ac912405f85b9206ddd37ea31bcd6e975b25a14b179849a33368c0693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hu/firefox-63.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "53df50c2e877dab2bf1d7ee40312f77bfac977ba3a041f98c350c1b9d188b539d409f460134f0e79d07c6a3d53fe063e53b1451fd84e7a817b98d6f5b2564717"; + sha512 = "cbdc13d964387f0a5add945cb5f5f71fe2d4c6da9d37f77883074a5ffb22121c293e7c665580bea27a43d98547e2459c7d42cec60af80f44b0d5650b3b6d9042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hy-AM/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hy-AM/firefox-63.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "eec4295b544ccf4ddd46176e3b391b42c04d2ebba73edbde24a6cd0043c31d5f06e7a1e6cb03d7ed02327a07f2aaecce7d8c55f09156f413ae3e8f2c18f08649"; + sha512 = "16aa31cd906a9dcc41cdee45e00df6fbffd1fc83fe9fe5a7c10e0b6007f3ab542bfe328b456f8ec68283a6633d63457ce61dde4661283e75917a0198b38c1a72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ia/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ia/firefox-63.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b9bafd5b616722d5e0b19abe9e2080ede9c0e3d2e971cc1c00f0e3d2678489e5e4268837341fa7eed34e2076c69880e7ec726814729ede4731fc1336f4b5269f"; + sha512 = "f622f1a1c95bff1b68beb21398fc22e88e05350a2ca1d6d0c018db4d30962f1b5ee4bcc0b9fee7484b02bf06326596f702a1a9e5b0acad5e0fdb73be1c1dab45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/id/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/id/firefox-63.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "07a271e3c9b479018de9184b32bb5a164d3ac2ce5431bf714f3b53ff7bf5c324e6e9413b514748b6ef84e2e57b66145ae775b5116e88d1b695f5c9dd001ad530"; + sha512 = "9d44617bac45ccfc191ee02a3c6f994734c9a1bbd5f6cb160808361522430a57798493a33b774eeb331846c99ac09b46788e06abfc716a0a634324b2992085ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/is/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/is/firefox-63.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f101472751e16e29c2928e3d19acd25afeca20abf7f943be14297e6e03762f67edab1ba59db5e22b8ffeac398208083f91ad97772905fe3436e7daac6d554fcf"; + sha512 = "6c64320f40b41fc0ba93b94302d83cfdeaa90992681a5ef810399b35fb1f1d40406b2ed80148cecbf6603bd9dc1298dc6b3b334b98a13ffcbdc0b2e19615051f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/it/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/it/firefox-63.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dfa7a5f9cc4c53f392d061b8bc9491dc541deecb6ef5bc7386a2bda353a8980dfbbccbd16b5a2c167cd523b4f52a9993403bd44ab05b38e03b9b0308a61da261"; + sha512 = "deaf12ee7fa25a650116dc21b2507df41ed0535821f43cf7e469d870154f4e0d9d66ade3ed3463742e1c5b28d4526f4cccecba4f3995178ad7f6b82d29ea0e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ja/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ja/firefox-63.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b84f5317b7917be27d1d93d39b0b3ce0143396642d3f5c2a41a656f16074b31aaa549690bfba0675b3ec8cc2ada383929745ed2823ae6afa399bb7407557ca24"; + sha512 = "e4c1a5724c77bd99d9d10bff3f9e011f35bc130aa711e629df458e7ee46a3bdf1fcfb4bdeba4852bd0dda773b8327bb3ddeba2115406517c77d0f4d224267af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ka/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ka/firefox-63.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "5d56a8f8cfa5132c3cd5cc3c1bbc56cf3c076eabbf21f98747c493c3b64076c8506150262ad65cb62880e31cc37ad7a9ab5728094a8d8e1f704fcea145c3a049"; + sha512 = "1040735b4e1f6616ac9b2676b7007435c7423116e5fdcf8a0a9b472c5cb0c17c089dda5d711fa10129d6bb1c84082602adf20161f5d6d560fbfa12f6225635c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kab/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kab/firefox-63.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d86d69559d9e7eec6bb111fe05ffb380ba49c2f47a957e6eac8470f81213a544ca44ae685456e22644b08958c54ffe5f815b0812bd045514d1f70a08a5fe9790"; + sha512 = "511ccb5a8745fb1b93fdd49ec9369498b577a155fe5134b9990e6740505f342e76b0da136cb3ebfd2a15921b677be7cab6099cdc8cdea9d6040b989cb12672db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kk/firefox-63.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0cab56f34acb5df1b9a83c48f1a1d2f41c68e79c7896ee4da8ba11bd44e3477214e59697c9e9efec802f633171177ed2653e3184c000d145b7d73089a33930d5"; + sha512 = "1e5d5aec9db2fc36a56acd1d9e723659c3425ab4f048966f0550eb1723ffa27b0b91acf8daf8cac9bd6f9929a5fd880edbb4ec1aa4359282f4d4c4532bd6636d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/km/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/km/firefox-63.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4fe39d6a89138111c2e98d1f449adaf474d3011a966c4e17627f9793d599eeef04cc1081c6cac85df235d8854db6b57de1548834abcf3a96baabb30c797e9073"; + sha512 = "76063e3d83454f4850849af7084d9489baf4d354001277a9f606a28db089e589147033c132320b34c59032b2dfc7611ee52786c960bd280b5426781a0a0b7be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kn/firefox-63.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "563dca7d5874717937747a1771a9ff32d2012205e2da9274f4cff76ae29782d92d7a20eec8c792564d3a4929458cc5c2722fa38d8b08edcc879dc9ea184c67b4"; + sha512 = "14fdec60154ffe181f00808f8877de3b045c72b91b0a6c017951033eae786ee26e4f96555034b8161318edafb8ff07ac41203a9bce91ddc20215be87571c5e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ko/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ko/firefox-63.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "69d10aa7d2b91197bb9062ea5bcf1b89e08cd474003e4d9c203f9f4c7df14dac5b991a15c74fad38843d2534ecc5b08878536ca45c2b80e83ec4c8f6168c5acb"; + sha512 = "7990af9dc0df8f9fae35d928ee5b476dde1e12db6294f5a3033d37e73e44fb8d0bcbf7916f79459dcc6c8f05ef065ff4b0dea95bc2c342ae81f2161fd61b2fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lij/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lij/firefox-63.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01bb7b7bea7e528e2fb4ad910e591642539e68a8a3771be2b2d28c3f1b54e95d74394f3d9411d8ae9bd13f991ac4dc788e98cbc8532a552fd70e83b6b3cae38b"; + sha512 = "42faccbb1029df56f17b94c7a5d9e6f6d5fcd7c5e6b623a6fe8f89f143c909961dba135e02d0ade1bd57399bed1279a61ae16381402ca391aeb55761428f97dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lt/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lt/firefox-63.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0bb6582347ccdf31dee98a09577380f7a66e8b3222127fb222000d64cb09c4d0ab19d4084d98be2b47ecccfaed51793c1b4fa263634f61eed059da27da0e42bb"; + sha512 = "b4079f36c1a4788f8da2a4e1efd0ab4bb166ec45dcda1ff0077746a85ed5d34b8cd498a0f1d12463349d4fcfae820db39946caf7e55f4ae9ff1c9ec587a95fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lv/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lv/firefox-63.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3357a5fdf0e41b88e13c24c37243bb8bcefe75134df4944f286364d4f926efb9188e66a91ead78c7d9228275b394a8375ff9f24ac83489c987b42e34132d9224"; + sha512 = "5a8eeb1274c30e57f7ecaf307e23eddaabbd7272128063ece88f480c7a8bdf96efbf8d2db2416e0232773457b10474a531ace2eac264175e590050662c8d606b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mai/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mai/firefox-63.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "172783f25dacda040e65ac980d6f3d33125cb6721c2c3568255a27f494e6d80beae3d61783171448caaca89358735a4c3b64dd9be47ca5c904d5727a3e0ab419"; + sha512 = "b2ff3a58ff0216df0d980c941648e143a3dea87e1c90c4ef1367a3a75d5052b1c1e54b07476602a91adb691bca2fe4e9b70d89895773b3a021944257b0429518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mk/firefox-63.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8f3b31e48b1b423df1cdca1c240db88978f8d03a7409727842339096f5c1c6099e87c2fe1d6a122a6874c080b61ae59bcba1303479d80b944b4cc8d938eb7a00"; + sha512 = "4ee9b4744ed73d866d6d2e73d0a9aae983d063af3fb4e313e8c6a2fec055b10bb1d414cbf87c0909119f1f804cd64eacb981b5c17ecc87e29ab246d736b6f9df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ml/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ml/firefox-63.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "dec1bae8329c9f8498fa9d95547abb2c2ec737df03b63ab44600b5132fe6037454070ab3bdb2ec0be1de48bb97c014d985fdc8530b97803c4202793a14e5e6d7"; + sha512 = "9bdd87f047491ba138796e48e46dd4fefbccac03adb4d652978d51b933327f007ca89d41929c075dc61353584cfb5a3fbd94986ca791750117b55a4ed65b7994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mr/firefox-63.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1e876518b8c73eea6aa4f51384e6ba9d7dfa983e7ea878bbc26becc248e2badd4647f3a44d273e33a742e5b6f99ed5ad364d621eff314c830612e0971ff268cb"; + sha512 = "7680c9af0d556599120b3d8a2883a4bfb9bd0dca47a2d2b3dec669fe2852de39c134cfaec0f53082b269245a28588bc699250d438668264c778c7cbf3037a50f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ms/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ms/firefox-63.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3c72bd0536ada586d31d02cb0b59184889a064d09cf30f73bcb93417064fc6e7905fe084c554d249d0a29cc6ef6c57dfddde7d97d658c14958861397455f267f"; + sha512 = "ae78016ae552d10f4220e68259b464097464081cc2b3c114648a6e36e4381df7e9333f7c13c08e0346bdaaaaaadbbc9a111dea55cb6b4daafef29ff0b0db5afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/my/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/my/firefox-63.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1118b4d8caf8dc2b4a4aa6ee01805bef409e9238e38182ad8561bd8cd1885c22e2462b7baa00355aadbd103279ac0aa008299beca0157356f49773040916c3bf"; + sha512 = "e682f1e998a946053672d61f880a75472d692ea9f7232df9e2a51c6b3d27f7d5496138144dc17a56cd07378b20bde48450a27157782e9ff0463ce922c08c6e3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nb-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nb-NO/firefox-63.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b0243d6642d51e9a81d58951e9251cf586080a7c90849adefef1678c856a34c0cac710752efa4f3cf1f9d099461968d0a15327d9610bf1792e451bfb38296c56"; + sha512 = "b6b68de70089bc3f02741de04138922b3a4b6ea760d5b43c00bc636a3f60fdc510886e76b989facbc4db23e72e0659db9ed38705c8c56851ef9cb9209524d58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ne-NP/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ne-NP/firefox-63.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "668498eb589927f92fc53806111c47b7b130d08c53c8a3d997edab4efe52ac7aa1388dedaf976fe46cc45603249b99922b803f32b5306888df194bf4d6547aa9"; + sha512 = "057ba9953a8ff6824567de1d3629b7d995924a7da49f9b03e1b5e872cafe750dfafe05a74b72cc360c932237445712bddb646cad2a961523d29a8b5327ca3bc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nl/firefox-63.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c6db81626bfb20724faadc34e113eba0cc3da7e251d1ea9e859ea4b1c82e2d8ecdc01ae3b60c12eab5b071e62c3cfb85a28cddb43573a9da39d3a07cbe78b7ac"; + sha512 = "abfa808668e527940d7f344522650cccb4272555b67e4d90398faeb7aa31766002287c5e73f259b2ebeafdba890b0ca9940fe0bd12926f8b748ce172ff786abd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nn-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nn-NO/firefox-63.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "dcac12899163fac3d191104542f1d834a2406388f69faa78b871106408772a0cf01f73caf267cda6731e557cb872c341d6ddcaa1be9c972007e7a3cd9c0781a4"; + sha512 = "e5048346227c41b20534e71042a911a74348e403283ecbcd3a90f1ecf3154907e0c7c21eb26b67f2ba09a6e8d04200c990f7a4babe4ea5782a847a31a6a880ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/oc/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/oc/firefox-63.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1318631847b588dcf4662a3a82a80fb8bd1eac1fe1e78cd4bb5b1bb8990bc7c2adceef1dc057df1ff54cfb195a05612fc5957ddf22bf8355341d6744e1938df6"; + sha512 = "ec1f24de15020cd6a16d95d47db8e2e73d1b3aa269e27d30421c15e3d71b57625c10e7c20427fb1fcf2ca7b2e1aeb0f16b254c1107aee28c2e8522fb535d4a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/or/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/or/firefox-63.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "6d9a2af2ab431eaa6205958239e33d336f11ff789ee2cd62b90533153ce41b9e17ce3c8204d679c8949c1edbbf493efbc96d009b463e5ac96b3200ab8ab7d707"; + sha512 = "c55f10e0a9a3cd3403eb9167139b4c6f0e8a5f66e3f33b12efb40bb6b2bbb7d1dc2aa365b1ab375f41da34e7d21d2848223934ffd2ab61fa93220bccbe9fc720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pa-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pa-IN/firefox-63.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e7a0b4ff68c428d0028eb098dc0f1da82e14de691ae77d2d94e32465ef50c8af70dc9abe21f92db4606ce4a42d443b181e11bf2157363faad874b07f9c0e0110"; + sha512 = "f74dd4d54680d94ea270bb7755f6ea4fe058899cea2472c08ebe5f34b8323be7157b060abc83ec80aef8f2ca63f3c806a7a4d831a4e72025ad25d4ca40783cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pl/firefox-63.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "780886f9fa3136ea6d3981e2b63124e3c625acc971c144978840e254e1fb77da5e65fbc7b6b7edc6a363e5f24fbb09bfe16bcd89d3171e6e92efe18a58946e54"; + sha512 = "05c82b2e08f65e37d4e82fd93d3d2ebe6a5d5441ab11069cbc66b18af0ed93e877466daf1d804c53ac3c712307aea475c99f922b5064cb551d136e5378e23765"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-BR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-BR/firefox-63.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d922b1294bb2aea2019034e7af38b9f01cc7aac316a223ddc54137219f01fa1a6d34b23830d82dc9ce816024532cf0535d2753a55b36e952da1f867e487924d2"; + sha512 = "c8f2d36ada67a2fa7717527355a0e083ca5891ece1de70505efeac51dad5f6985666e2be0bdf23ad0f4402d6ee96fa2e12af50369297a3e46b9804cb0b830c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-PT/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-PT/firefox-63.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "86760623c1aa85efb05fe66929f1668fc6c7b2f631b77c9c93d1b12a23c6409345caebc25a70a6891f480dff2112966f283e3658e08951a49bac700de754c975"; + sha512 = "5e4478ab220636c747ce9c5564a1b71554b1c67999722bc55204f747d0ad430eb2a0b71336997e80ca391d7680ebf92c66ea7ef4d25dc568f8c6860cd31ee26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/rm/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/rm/firefox-63.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b66f542b8ce0e878fb9ad599233adc136a20e09f1b77a82050273e16903b56b6f3f8f94a33fdc7a2a1ff0eae94d20cccd4ec6ade8c2ddaabad3c32547303d5ee"; + sha512 = "67438f3cb1a89a0258890448de6d16be5f79291d4c0989691d9c8f38966a7a4ba2f8eaccb26ee4458a81a733ae9513555a22f8b57652b4fce1eb1e3ab2368848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ro/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ro/firefox-63.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "393fdf5d1ffe51694b50f5027243d19c2f1d5d25daf9ad88f14f21ce3bc3e0d5bece8cce2f3192d263e873a8e55e1fdd6ec22ce014c43c71ae9fe9833a7b0df9"; + sha512 = "3cdc7f593af3bbd858285237a9ffaa07aa76cbfc67c0f7d22d5cf261a19756ba3aa8971d54a10b820344beb509810b601faf0cc89c86636bc60ea1a6d8421873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ru/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ru/firefox-63.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a1af73215c8e3151e45e8a0a7b1c4eee51301065b3a724f904005f41101018eb11313319c1b8206432c4958d5a415575baebc64ff782b4e3b993b71d4a66e829"; + sha512 = "7b6b03cca2fe3887d7ee86eeb8ee699157a6cd828108737e26724a48af72cf3fe326024f41c6afc13f7e332c262a4e991728ad5d46ac6fb6942c5c3b4ea93a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/si/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/si/firefox-63.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ee3a7b6b1e9a5b10661390b7f1d1fa61ef9589d59e4f869ef8ff6c4a1719fb15014e2abcd8472769c4a17b3f74ab7ae2671f3f79ad94a1d3d875f2fbdd03eb8b"; + sha512 = "10f9fe43304931dbce1d0073ec4e827f369291b3705b322a3f3ba8f7002a974c019be8f5a594d8c88add527667d9295a27e85f2b1072e16ef1720e9e433111b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sk/firefox-63.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "478eefc7afb725496e3a17615c8458d29e44dc200dfb4534c32cd15d3c45ec15ddf9f5b1fcaad312e00d693a06d9bcd116038177d9844273a64f81b531b6e676"; + sha512 = "6b90fd21c51d48ca997ad47025aef3a4280e30152a0f18d0ab8948e055b80e5aa7cf1374b2eeeb1432d8892fb07de505adb9ae6c57e776ced4c429859577f040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sl/firefox-63.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f07fae5f52528899ef3dc680ecc551311496125d9c10c2117e35d0ac8af387d99236ac9a3f921a9ad2e40102d70df91fcb43526ccb8910d5ded1379a42bf5914"; + sha512 = "55faeb2d5310266395a442d0d9ce4a1020197d0ce7655caa8d00efd022db9e1c9926b7418f4cfa380d04e1971ed47e7025d434a36ca0fe6f58f02be7f0e26a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/son/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/son/firefox-63.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f20dbcdea88828cdaa4d9bc2e8ffd2792e06929495b0268814808f842c1bb9ccd87f86df16b005af989edd3c470d53ef6254288664ea192d15620ed10ef2682d"; + sha512 = "63f104da43ff4103b40e271de6c962fae3d77891f50fe5b39698d3c2e382b4234dad41a3a64794015ad88d34a7e2b819c0ecb62b1bb44a4d8e83eadbc1803151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sq/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sq/firefox-63.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9a548ee02d1290c112ac3a72be6cf96163cb67448a8a5ae00a88e3e115f907945899cfb5a5edbf3e37a13c16550ebe7b6f67f94c05be6659c168a5e0043adc04"; + sha512 = "534ce38e5dec85de50e9dd541f6d8445e95fdfac074a51866c993e97d020b9a310abebffa2162fc513572d202f9fec8e3a267207bf9c401b27c8541534ee2aaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sr/firefox-63.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ff081635cf761293ca77ce7d3574e0a1b6a57d7dfd5649089e9554c27b85de544a39b2973205e293152a33d69137ae373110a884f6427dd58788c5832caa7773"; + sha512 = "1174da8c998cdd62370bb8c80c6a47360cdcc84144b03ab33f10367b5622ecf6ff3058e4f525e46ddb523f13e29b6fe557b7442dfec92956b34eaf507bd5f8c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sv-SE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sv-SE/firefox-63.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "28686a08fc1c4cc63a084cbfa094e6f1b8ace446a5746f3892ea37d1b916806a15641875ef08c850c316059078a116a2060294f754e722d84d1fdc2817ed7618"; + sha512 = "7c24f0d4552ca7bc3076b9b0485c757e0547713a58d09cd568e506e37dd6133c5c7a7ad3edcffdd387cc0c5661d3602f4252d778174bf78812788ad1daa9384a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ta/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ta/firefox-63.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "43b3db7262fc43b19f66cc586af56a404b6b0feaa98d31b53766deaa8d4f5314279dd6aaee5e3373f8c1bb9f4c152e2ae6d7aa5b9e4b1123a5dec7b42c6b68ae"; + sha512 = "4387b1cfd77da777a3257e714b014c686ad8c5ff1edb7ba0e2d01f62621eaec92766ccc3bbeb93be45c0b414b9b31676692e75b366a7ed0fb8e0526f95126807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/te/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/te/firefox-63.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "05936a5de6d723edf72c1155aa0f18c9a6eb5275dac4f4de58fe93cfd9a814e7ef349fa6c630d043d6b39ca5dab6fe5f3c92c45c36d5b515b4748bff6493063f"; + sha512 = "8ad96e47cfc1066d27560a5ad26659dba098724374605520198d580867be3bcc05a63120865745055ef00163b8c7cb97ac35f18bfcdc3d171e7eed6a05f50855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/th/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/th/firefox-63.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5ececcf6b3404f1010b48956bb2423907261f7d544a695e775900e1a3cbc09e71b008b94118ee39651ff6469cf8c456afc5ab9c9fdf0b9fa4a9c41f76e16788b"; + sha512 = "74272739144c6ae69dba8229420894b10e0dd9d75ae386f1221b17f8e54baf8c3d921591c5707ab5d8847deedad2daa3061fff03add11a2e450fdf691dd49f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/tr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/tr/firefox-63.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "29cc67dc15acf77589fe72d0e28591b5f4403de5cdfc6cfa7cd9f16ccf7315ed19c2d38872b5c76c1f4a78b2688e9401417b6e6ccba1985c27becb54baba4d22"; + sha512 = "0cddf14cd7a7cd4594ca04d1416b3ab32db42a287e62b68197fe8e08078999028e47074e563302c77e480d02563932d20ceffdd89c53b53c79221f3cc309e802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uk/firefox-63.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e7814a55b835051c8d02b74e4343739241ea60d69b8060a496f60b6b323b81d8628541d346281e0080d83d9ef4183640c907c144743d3d444499c887c34709ef"; + sha512 = "17e3d498e900ddfc4b00e3ea99b7b2f55c0252e88eede45b47b020293131d6adf5642c1bf94c39bba5b9042e2f9e20ba5399e6717e6965e65d90c4717a236832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ur/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ur/firefox-63.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e6323528d7a916473a62edd9565ed8d67832e3298fba51c7aca32f9d0c2d401ac74d2df5770962e191f7fc79fbbe6f22ae242475075423a23f09c8f11c26afa9"; + sha512 = "cef0ade8282d3360e27d51b4c5487882ae8dc78c598b4150cd3053cc442843cd58f5c362ed6c5ea8362517633dfbb2751a894c6cbc45bac796c181f32f095dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uz/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uz/firefox-63.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "759e63deb63e59166d137e109f81ecd57a314aa045eb97a54ae82fe04a418bc3ac73c83bb663d65fc1b66233ed49e43ba7ba5a8db1bce5138fc6b65b7377b230"; + sha512 = "e8dc2b26f35f5ddbc93e4891d7b9b4dfd932ba6c7d1da19a6bec1f5c259f78c1c3105d9f2c89cd97c91f4032489f95a339ba5a22dc4daf3c948a968bf580d4bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/vi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/vi/firefox-63.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "cdd1e2fb71043fa628bc9653a1be4c7a4d64779383b25d2b1812ea7af2eea3711cc2777c09be1acaf2fcba9c931cd212c99bde69d067d331a294825b89c2addb"; + sha512 = "6dc0945c634052824326cfe8558d1eddb192dbb4eca9eac458b8cfb3680cb1cf5537dd8ff4237ed32264d730e95287d9504fd0b1528fa33907dc1a2b4558ea61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xh/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/xh/firefox-63.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "97eb405cc8379cd803af5db55166b9db1e489c5a0e29fc316cdeeb49e2c2beca2ba87f7f01e9117dd22639d0cbfddc26ca90aa4187a522462a1b42126bee89a7"; + sha512 = "3792ce77db9de5080437b2aad6537f00963593ff98cdd47a145ffef8243a5ea23e8cd42f82e217885601b04df4c17d833aa88b9d15cad7a6840978af3a756b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-CN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-CN/firefox-63.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7559ae148ce548d2b766be291667e7f04d9c28bca0de467cb36f37772736d2f44cb3724e0bf0c95bdd11ac2a84ab07238e14902d6f8f23280796505cf5b9e471"; + sha512 = "8043f8900ef35f85cb05f2092829899d119e079210dcb8bd9d369c7d73ff901e80afc4eecb25421058b65e5e267f7cf671c62cdec5849c2ff0da104f4ec12ad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-TW/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-TW/firefox-63.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "95829dba29e96497f047e2f03a4bcbe36d61c0a36637087e56300f889f9b191c7b6c4ce936604283145f4a8be8ee4b129fefdeba7efd201cd0a647a0016ebde1"; + sha512 = "614b7835c82f80dd27c841023aca6aa8580bdadac8241f08fc053fe7657f069d6337e3edbe0bebcc4018d47f3d9f2d328176add89aacd9847393ebd21f3e9230"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index bfdb5fcc0103..16c9b548325e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,7 +1,7 @@ -{ pname, version, updateScript ? null -, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [] -, overrides ? {}, extraNativeBuildInputs ? [], meta -, isTorBrowserLike ? false }: +{ pname, ffversion, meta, updateScript ? null +, src, unpackPhase ? null, patches ? [] +, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] +, isTorBrowserLike ? false, tbversion ? null }: { lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg @@ -10,6 +10,7 @@ , hunspell, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages +, rust-cbindgen, nodejs , debugBuild ? false ### optionals @@ -19,7 +20,7 @@ , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? true, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base -, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook +, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , gssSupport ? true, kerberos ## privacy-related options @@ -31,7 +32,7 @@ # webrtcSupport breaks the aarch64 build on version >= 60. # https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 -, webrtcSupport ? (if lib.versionAtLeast version "60" && stdenv.isAarch64 then false else !privacySupport) +, webrtcSupport ? (if lib.versionAtLeast ffversion "60" && stdenv.isAarch64 then false else !privacySupport) , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false @@ -80,23 +81,24 @@ let browserName = if stdenv.isDarwin then "Firefox" else "firefox"; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "${pname}-unwrapped-${version}"; + version = if !isTorBrowserLike then ffversion else tbversion; - inherit src patches meta; + inherit src unpackPhase patches meta; buildInputs = [ gtk2 perl zip libIDL libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr libnotify xorg.pixman yasm libGLU_combined + libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper libevent libstartup_notification libvpx /* cairo */ icu libpng jemalloc glib ] - ++ lib.optionals (!isTorBrowserLike) [ nss ] - ++ lib.optional (lib.versionOlder version "61") hunspell + ++ lib.optionals (!isTorBrowserLike) [ nspr nss ] + ++ lib.optional (lib.versionOlder ffversion "61") hunspell ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] @@ -106,21 +108,28 @@ stdenv.mkDerivation (rec { AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; - NIX_CFLAGS_COMPILE = [ "-I${nspr.dev}/include/nspr" - "-I${nss.dev}/include/nss" - "-I${glib.dev}/include/gio-unix-2.0" ] - ++ lib.optional stdenv.isDarwin [ - "-isystem ${llvmPackages.libcxx}/include/c++/v1" - "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" ]; + NIX_CFLAGS_COMPILE = [ + "-I${glib.dev}/include/gio-unix-2.0" + ] + ++ lib.optionals (!isTorBrowserLike) [ + "-I${nss.dev}/include/nss" + ] + ++ lib.optional stdenv.isDarwin [ + "-isystem ${llvmPackages.libcxx}/include/c++/v1" + "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" + ]; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0 + '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' + substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' ''; nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ extraNativeBuildInputs; preConfigure = '' @@ -128,14 +137,14 @@ stdenv.mkDerivation (rec { rm -f configure rm -f js/src/configure rm -f .mozconfig* - '' + (if lib.versionAtLeast version "58" + '' + (if lib.versionAtLeast ffversion "58" # this will run autoconf213 then '' configureScript="$(realpath ./mach) configure" '' else '' make -f client.mk configure-files configureScript="$(realpath ./configure)" - '') + lib.optionalString (!isTorBrowserLike && lib.versionAtLeast version "53") '' + '') + lib.optionalString (lib.versionAtLeast ffversion "53") '' export MOZCONFIG=$(pwd)/mozconfig # Set C flags for Rust's bindgen program. Unlike ordinary C @@ -158,7 +167,7 @@ stdenv.mkDerivation (rec { # please get your own set of keys. echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") - '' + lib.optionalString (lib.versionOlder version "58") '' + '' + lib.optionalString (lib.versionOlder ffversion "58") '' cd obj-* ''; @@ -185,37 +194,29 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=${default-toolkit}" ] - ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast version "61") "--disable-xcode-checks" - ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell" - ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks" + ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell" + ++ lib.optionals (lib.versionAtLeast ffversion "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] - ++ lib.optionals (lib.versionAtLeast version "57") [ + ++ lib.optionals (lib.versionAtLeast ffversion "57") [ "--enable-webrender=build" ] # TorBrowser patches these ++ lib.optionals (!isTorBrowserLike) [ - "--with-system-nss" "--with-system-nspr" + "--with-system-nss" ] # and wants these ++ lib.optionals isTorBrowserLike ([ - "--with-tor-browser-version=${version}" + "--with-tor-browser-version=${tbversion}" "--enable-signmar" "--enable-verify-mar" - - # We opt out of TorBrowser's nspr because that patch is useless on - # anything but Windows and produces zero fingerprinting - # possibilities on other platforms. - # Lets save some space instead. - "--with-system-nspr" - ] ++ flag geolocationSupport "mozril-geoloc" - ++ flag safeBrowsingSupport "safe-browsing" - ) + ]) ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -226,6 +227,11 @@ stdenv.mkDerivation (rec { ++ flag crashreporterSupport "crashreporter" ++ lib.optional drmSupport "--enable-eme=widevine" + ++ lib.optionals (lib.versionOlder ffversion "60") ([] + ++ flag geolocationSupport "mozril-geoloc" + ++ flag safeBrowsingSupport "safe-browsing" + ) + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] else [ "--disable-debug" "--enable-release" "--enable-optimize" @@ -239,11 +245,11 @@ stdenv.mkDerivation (rec { # top level and then run `make` in obj-*. (We can also run the # `make` at the top level in 58, but then we would have to `cd` to # `make install` anyway. This is ugly, but simple.) - postConfigure = lib.optionalString (lib.versionAtLeast version "58") '' + postConfigure = lib.optionalString (lib.versionAtLeast ffversion "58") '' cd obj-* ''; - preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) '' + preBuild = lib.optionalString isTorBrowserLike '' buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser") ''; @@ -302,4 +308,4 @@ stdenv.mkDerivation (rec { inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; -} // overrides) +} diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 369b18d5ead5..826956eb5640 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -2,16 +2,22 @@ let - common = opts: callPackage (import ./common.nix opts); + common = opts: callPackage (import ./common.nix opts) {}; nixpkgsPatches = [ ./env_var_for_system_dir.patch ]; firefox60_aarch64_skia_patch = fetchpatch { - name = "aarch64-skia.patch"; - url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch; - sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k"; + name = "aarch64-skia.patch"; + url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch; + sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k"; + }; + + firefox60_triplet_patch = fetchpatch { + name = "triplet.patch"; + url = https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c; + sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g"; }; in @@ -20,10 +26,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "62.0.3"; + ffversion = "63.0"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8"; + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2"; }; patches = nixpkgsPatches ++ [ @@ -42,13 +48,13 @@ rec { updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; }; - } {}; + }; firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.9.0esr"; + ffversion = "52.9.0esr"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9"; }; @@ -64,15 +70,15 @@ rec { }; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-52-unwrapped"; - versionSuffix = "esr"; + ffversionSuffix = "esr"; }; - } {}; + }; firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.2.2esr"; + ffversion = "60.2.2esr"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; sha512 = "2h2naaxx4lv90bjpcrsma4sdhl4mvsisx3zi09vakjwv2lad91gy41cmcpqprpcbsmlvpqf8yiv52ah4d02a8d9335xhw2ajw6asjc1"; }; @@ -91,23 +97,27 @@ rec { attrPath = "firefox-esr-60-unwrapped"; versionSuffix = "esr"; }; - } {}; + }; } // (let - commonAttrs = { - overrides = { - unpackPhase = '' - # fetchFromGitHub produces ro sources, root dir gets a name that - # is too long for shebangs. fixing - cp -a $src tor-browser - chmod -R +w tor-browser - cd tor-browser - - # set times for xpi archives - find . -exec touch -d'2010-01-01 00:00' {} \; - ''; - }; + tbcommon = args: common (args // { + pname = "tor-browser"; + isTorBrowserLike = true; + + unpackPhase = '' + # fetchFromGitHub produces ro sources, root dir gets a name that + # is too long for shebangs. fixing + cp -a $src tor-browser + chmod -R +w tor-browser + cd tor-browser + + # set times for xpi archives + find . -exec touch -d'2010-01-01 00:00' {} \; + ''; + + patches = nixpkgsPatches + ++ lib.optional (args.tbversion == "8.0.2") firefox60_triplet_patch; meta = { description = "A web browser built from TorBrowser source tree"; @@ -142,14 +152,13 @@ rec { platforms = lib.platforms.linux; license = lib.licenses.bsd3; }; - }; + }); in rec { - tor-browser-7-5 = common (rec { - pname = "tor-browser"; - version = "7.5.6"; - isTorBrowserLike = true; + tor-browser-7-5 = (tbcommon rec { + ffversion = "52.9.0esr"; + tbversion = "7.5.6"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { @@ -159,27 +168,24 @@ in rec { rev = "95bb92d552876a1f4260edf68fda5faa3eb36ad8"; sha256 = "1ykn3yg4s36g2cpzxbz7s995c33ij8kgyvghx38z4i8siaqxdddy"; }; + }).override { + gtk3Support = false; + }; - patches = nixpkgsPatches; - } // commonAttrs) {}; - - tor-browser-8-0 = common (rec { - pname = "tor-browser"; - version = "8.0.1"; - isTorBrowserLike = true; + tor-browser-8-0 = tbcommon rec { + ffversion = "60.2.1esr"; + tbversion = "8.0.2"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.8.0esr-8.0-1-slnos"; - rev = "5d7e9e1cacbf70840f8f1a9aafe99f354f9ad0ca"; - sha256 = "0cwxwwc4m7331bbp3id694ffwxar0j5kfpgpn9l1z36rmgv92n21"; + # branch "tor-browser-60.2.1esr-8.0-1-slnos" + rev = "4f71403a3e6203baa349a8f81d8664782c5ea548"; + sha256 = "0zxdi162gpnfca7g77hc0rw4wkmxhfzp9hfmw6dpn97d5kn1zqq3"; }; + }; - patches = nixpkgsPatches; - } // commonAttrs) {}; - - tor-browser = tor-browser-7-5; + tor-browser = tor-browser-8-0; }) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 23f0db67e66a..dfcc367170df 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -103,7 +103,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.2"; + version = "8.0.3"; lang = "en-US"; @@ -113,7 +113,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1vajphnl53bhp0bnq8shljvnnq4k2wpvfrfclmxklp97lqvfl9vz"; + sha256 = "19clhhsyhc8brjzjyrq0xl5gavwhbyq036nbl0x6dybawr3684gz"; }; "i686-linux" = fetchurl { @@ -121,7 +121,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "157yd8n53w79xx58xf5v983a50xq1s0c09cr7qfd5cxgs7zrwh34"; + sha256 = "1hlrbn8r9z93mswnaksn66azgf3zjf08wrlk58risli32j9gywd0"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8a21f2f0cc2a..7ef2bde68f20 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.0.1309.29-2"; + version = "2.1.1337.36-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck"; + sha256 = "14qf3gk46m65yfc7q7gsnkj6av8yhg7byi0h1yv24sr7n4rrnrsc"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 87ca350731db..349ef233ae21 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "69.0.3497.73"; + version = "70.0.3538.77"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "3qyzxdybiszwy62izr35wffnh1a1plg9y536vrmd4b2xl8p4nz18c7439blr0cdzsr5qplgrdl64446a27mkyhbw8c3iy0gb4zgb5j9"; + sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0"; }; buildInputs = [ ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix new file mode 100644 index 000000000000..fd047147e01a --- /dev/null +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "cloudflared-${version}"; + version = "2018.10.3"; + + goPackagePath = "github.com/cloudflare/cloudflared"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cloudflared"; + rev = "41916365b689bf2cc1446ea5717e4d26cc8aed43"; # untagged + sha256 = "109bhnmvlvj3ag9vw090fy202z8aaqr1rakhn8v550wwy30h9zkf"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; + homepage = https://www.cloudflare.com/products/argo-tunnel; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/networking/cloudflared/deps.nix b/pkgs/applications/networking/cloudflared/deps.nix new file mode 100644 index 000000000000..da7f509378dd --- /dev/null +++ b/pkgs/applications/networking/cloudflared/deps.nix @@ -0,0 +1,444 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "b26d9c308763d68093482582cea63d69be07a0f0"; + sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/certifi/gocertifi"; + fetch = { + type = "git"; + url = "https://github.com/certifi/gocertifi"; + rev = "deb3ae2ef2610fde3330947281941c562861188b"; + sha256 = "1xy09y1fdfcny1z09hd4493w1acj5min9z2sx4gfpshc80icrmr6"; + }; + } + { + goPackagePath = "github.com/cloudflare/brotli-go"; + fetch = { + type = "git"; + url = "https://github.com/cloudflare/brotli-go"; + rev = "18c9f6c67e3dfc12e0ddaca748d2887f97a7ac28"; + sha256 = "10112y4k8qing552n0df9w33cgminrzm6g3x7ng0vgin4sv59785"; + }; + } + { + goPackagePath = "github.com/coredns/coredns"; + fetch = { + type = "git"; + url = "https://github.com/coredns/coredns"; + rev = "992e7928c7c258628d2b13b769acc86781b9faea"; + sha256 = "0mvlkca11ikwzii0p7g5a2z3gn1xrp7qmmjwklp4i52lbnsawzv0"; + }; + } + { + goPackagePath = "github.com/coreos/go-oidc"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-oidc"; + rev = "a93f71fdfe73d2c0f5413c0565eea0af6523a6df"; + sha256 = "00pmmky0y9a9l767xn16xlf52h81j4869n6j0xql79rybp6xc1f3"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab"; + sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"; + sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/elgs/gosqljson"; + fetch = { + type = "git"; + url = "https://github.com/elgs/gosqljson"; + rev = "027aa4915315a0b2825c0f025cea347829b974fa"; + sha256 = "14i45m1y505acvsk4l725bp8p9w3mcg49khz9hxkzg3afg7nc5gq"; + }; + } + { + goPackagePath = "github.com/equinox-io/equinox"; + fetch = { + type = "git"; + url = "https://github.com/equinox-io/equinox"; + rev = "f24972fa72facf59d05c91c848b65eac38815915"; + sha256 = "1d3620g1kxyzn8b3py2471qp8ssyzm1qnpbap9gxrmg8912wiww1"; + }; + } + { + goPackagePath = "github.com/facebookgo/grace"; + fetch = { + type = "git"; + url = "https://github.com/facebookgo/grace"; + rev = "75cf19382434e82df4dd84953f566b8ad23d6e9e"; + sha256 = "15chyvgv5y59w9x2asm0vh29cmmcji7f5vxvv8gqcr15nkyi61q0"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/getsentry/raven-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/raven-go"; + rev = "ed7bcb39ff10f39ab08e317ce16df282845852fa"; + sha256 = "0pqggcjbia9sidxqxnyd5z5k44iswxaqss3qvkka8bfm082kczij"; + }; + } + { + goPackagePath = "github.com/golang-collections/collections"; + fetch = { + type = "git"; + url = "https://github.com/golang-collections/collections"; + rev = "604e922904d35e97f98a774db7881f049cd8d970"; + sha256 = "04g0xc1bs4aphc2rcj9knah2shmck500qagnazy4mg052b84ggwm"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-opentracing"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-opentracing"; + rev = "8e809c8a86450a29b90dcc9efbf062d0fe6d9746"; + sha256 = "1yz3gxhdipmi63n32y5srwx7p254k3fm8y64cimkb1gz7sw99nxw"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "2eee05ed794112d45db504eb05aa693efd2b8b09"; + sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; + sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mholt/caddy"; + fetch = { + type = "git"; + url = "https://github.com/mholt/caddy"; + rev = "d3b731e9255b72d4571a5aac125634cf1b6031dc"; + sha256 = "1183cfaryw7m3hvngzv87w80pc9vp3369sjyz7a0dlbr39jip1r0"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"; + sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"; + sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "967789050ba94deca04a5e84cce8ad472ce313c1"; + sha256 = "1djwz6shmyx5kbp9b1pim3kncq2jwn3qhbx4b0b4lq7msww76hpz"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; + sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; + sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"; + sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f"; + }; + } + { + goPackagePath = "github.com/rifflock/lfshook"; + fetch = { + type = "git"; + url = "https://github.com/rifflock/lfshook"; + rev = "bf539943797a1f34c1f502d07de419b5238ae6c6"; + sha256 = "0hns4zidw8g3s5l9dyl894fnyjr0a5xgdvx26rnal9jrn4n6z835"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; + sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "32a936f46389aa10549d60bd7833e54b01685d09"; + sha256 = "0f24khgx6s7idpnmwgkml4qyrqwkvdjd18aapn5rmybyhmrb57j7"; + }; + } + { + 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 = "ce36f3865eeb42541ce3f87f32f8462c5687befa"; + sha256 = "0dkmxn48l9g7w1247c473qlacfkfp8wyan54k9cbi79icdp65jja"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "ff3583edef7de132f219f0efc00e097cabcc0ec0"; + sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; + sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v2"; + fetch = { + type = "git"; + url = "https://github.com/cbranch/cli"; + rev = "d604b6ffeee878fbf084fd2761466b6649989cee"; + sha256 = "16csqipw5vrbb91m9w9g72jlxlrhcyxa79fz6fjp6803znmjdpk2"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "zombiezen.com/go/capnproto2"; + fetch = { + type = "git"; + url = "https://github.com/zombiezen/go-capnproto2"; + rev = "7cfd211c19c7f5783c695f3654efa46f0df259c3"; + sha256 = "0nzw3g8xpxyzwqqv3ja0iznd0j18l1rwagwhf9sinwdjjgmh51sy"; + }; + } +] diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 457e76d0a82c..b8d6cf6aee39 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -2,22 +2,21 @@ stdenv.mkDerivation rec { name = "pidgin-opensteamworks-${version}"; - version = "1.6.1"; + version = "unstable-2018-08-02"; src = fetchFromGitHub { owner = "EionRobb"; repo = "pidgin-opensteamworks"; - rev = "${version}"; - sha256 = "6ab27831e454ad3b440e4f06b52e0b3671a4f8417ba4da3ab6f56c56d82cc29b"; + rev = "b16a636d177f4a8862abdfbdb2c0994712ea0cd3"; + sha256 = "0qyxfrfzsm43f1gmbg350znwxld1fqr9a9yziqs322bx2vglzgfh"; }; preConfigure = "cd steam-mobile"; - postInstall = '' - mkdir -p $out/lib/purple-2 - mkdir -p $out/share/pixmaps/pidgin/protocols/ - cp libsteam.so $out/lib/purple-2/ - unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ - ''; + installFlags = [ + "DESTDIR=$(out)" + "PLUGIN_DIR_PURPLE=/lib/purple-2" + "DATA_ROOT_DIR_PURPLE=/share" + ]; buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 70d272187837..fd9fe0bdfbfc 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.16.5"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl"; + sha256 = "1ffbwz7wp1xhfv8a5nhrhw97nl5ybf0j97dkk2sy9cdlribzxs04"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 92f0b11c63fe..f123770197fd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.16.3"; + version = "1.17.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1fhs3408i8f80z5rlchrc3gwm0481rxqb5jk37gb8ip94zf97hsf"; + sha256 = "1cvgjllnbdsr61pz6r4dkbbz58cf69k7p8wriyp1vpzkdi7k5bpl"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ac58d4f39d6f..8297304e55c5 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let bits = "x86_64"; - version = "4.3.0"; + version = "4.4.0"; desktopItem = makeDesktopItem rec { name = "Wavebox"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { name = "wavebox-${version}"; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; - sha256 = "0kdg5q9rv8nxlg5jhmdfy5vv7gkdswzhy49af29d3zf57z69187c"; + sha256 = "0g77clrxks1ivldq496bg14hv57hm0kjh4g1askxyck69yf8illn"; }; # don't remove runtime deps diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index bf5d06423142..7ed237ce6aa2 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -6,7 +6,7 @@ , asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 -, perlSupport ? true, perl +, perlSupport ? true, perl, perlPackages , pythonSupport ? true, pythonPackages , rubySupport ? true, ruby , tclSupport ? true, tcl @@ -30,12 +30,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.2"; + version = "2.3"; name = "weechat-${version}"; src = fetchurl { - url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg"; + url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; + sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -70,13 +70,6 @@ let done ''; - # remove when bumping to the latest version. - # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c` - # from weechat upstream to weechat-2.2. - patches = [ - ./aggregate-commands.patch - ]; - meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; @@ -108,6 +101,12 @@ in if configure == null then weechat else extraEnv = '' export PATH="${perlInterpreter}/bin:$PATH" ''; + withPackages = pkgsFun: (perl // { + extraEnv = '' + ${perl.extraEnv} + export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)} + ''; + }); }; tcl = simplePlugin "tcl"; ruby = simplePlugin "ruby"; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index eb4d710857c1..72b9ce09d76d 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.1.5"; + version = "1.2.1"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "11xid07rqn7j6nxn0azxwf0g8g3jhams2fmf9q7xc1is99zfy7z4"; + sha256 = "0nyxas07d6ckgjazxapmc6iyakd2cddla6wflr5rhfp78d7kax3a"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index cda02fedfb69..d0a690496e27 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -118,12 +118,21 @@ let sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh"; }; - # Fix compile error against boost 1.66 (#33655): - patches = singleton (fetchpatch { - url = "https://github.com/mumble-voip/mumble/commit/" - + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch"; - sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh"; - }); + patches = [ + # Fix compile error against boost 1.66 (#33655): + (fetchpatch { + url = "https://github.com/mumble-voip/mumble/commit/" + + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch"; + sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh"; + }) + # Fixes hang on reconfiguring audio (often including startup) + # https://github.com/mumble-voip/mumble/pull/3418 + (fetchpatch { + url = "https://github.com/mumble-voip/mumble/commit/" + + "fbbdf2e8ab7d93ed6f7680268ad0689b7eaa71ad.patch"; + sha256 = "1yhj62mlwm6q42i4aclbia645ha97d3j4ycxhgafr46dbjs0gani"; + }) + ]; }; gitSource = rec { diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 33acd103d8b4..1dc4e3e43513 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -2,14 +2,14 @@ python2Packages.buildPythonApplication rec { pname = "zeronet"; - version = "0.6.2"; + version = "0.6.4"; format = "other"; src = fetchFromGitHub { owner = "HelloZeroNet"; repo = "ZeroNet"; rev = "v${version}"; - sha256 = "0v19jjirkyv8hj2yfdj0c40zwynn51h2bj4issn5blr95vhfm8s7"; + sha256 = "04mpnkx0pbvcfjs337f0ajabdbh6h0gypnaz6n395avkf8r1g4c3"; }; propagatedBuildInputs = with python2Packages; [ msgpack gevent ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 753defb0b4f0..5d82b1174866 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -17,6 +17,7 @@ let in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; + outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; @@ -87,6 +88,16 @@ in stdenv.mkDerivation { --replace "Exec=wireshark" "Exec=$out/bin/wireshark" install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg + mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv + + cp config.h $dev/include/ + cp ../ws_*.h $dev/include + cp ../epan/*.h $dev/include/epan/ + cp ../epan/wmem/*.h $dev/include/epan/wmem/ + cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ + cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ + cp ../wsutil/*.h $dev/include/wsutil/ + cp ../wiretap/*.h $dev/include/wiretap ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 861e7d24275d..2f736dd5856d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -4,6 +4,9 @@ , withTcl ? false, tcl , withCyrus ? true, cyrus_sasl , withUnicode ? true, icu +, withZlib ? true, zlib +, withIPv6 ? true +, withDebug ? false }: with stdenv.lib; @@ -24,7 +27,8 @@ stdenv.mkDerivation rec { ++ optional withPython python3 ++ optional withTcl tcl ++ optional withCyrus cyrus_sasl - ++ optional withUnicode icu; + ++ optional withUnicode icu + ++ optional withZlib zlib; configureFlags = [ (stdenv.lib.enableFeature withPerl "perl") @@ -32,7 +36,8 @@ stdenv.mkDerivation rec { (stdenv.lib.enableFeature withTcl "tcl") (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") (stdenv.lib.enableFeature withCyrus "cyrus") - ]; + ] ++ optional (!withIPv6) [ "--disable-ipv6" ] + ++ optional withDebug [ "--enable-debug" ]; meta = with stdenv.lib; { description = "Advanced IRC bouncer"; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index a799df2d1ed0..42d2093ee3a0 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -9,6 +9,8 @@ let inherit buildPhase; inherit installPhase; + buildInputs = znc.buildInputs; + meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; passthru.module_name = module_name; }); diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index c94d79a0ced7..5dae3c9f85c0 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmake, qtsvg }: +{ stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: let version = "1.43.27"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ qtsvg ]; hardeningDisable = [ "format" ]; @@ -23,6 +23,11 @@ in stdenv.mkDerivation rec { --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" ''; + postFixup = '' + wrapProgram $out/bin/mytetra \ + --prefix PATH : ${xdg_utils}/bin + ''; + meta = with stdenv.lib; { description = "Smart manager for information collecting"; homepage = https://webhamster.ru/site/page/index/articles/projectcode/138; diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index c552d9f9de35..e22043d9eb9c 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "star-${version}"; - version = "2.6.1a"; + version = "2.6.1c"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "11zs32d96gpjldrylz3nr5r2qrshf0nmzh5nmcy4wrk7y5lz81xc"; + sha256 = "0macdbxa0v5xplag83fpdhfpyhnqncmi9wf9r92wa7w8zkln12vd"; }; sourceRoot = "source/source"; diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 5b99a47bb415..0817ebe0654b 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -1,5 +1,13 @@ { stdenv, lib, fetchFromGitHub, alex, happy, Agda, agdaIowaStdlib, - buildPlatform, buildPackages, ghcWithPackages }: + buildPlatform, buildPackages, ghcWithPackages, fetchpatch }: +let + options-patch = + fetchpatch { + url = https://github.com/cedille/cedille/commit/ee62b0fabde6c4f7299a3778868519255cc4a64f.patch; + name = "options.patch"; + sha256 = "19xzn9sqpfnfqikqy1x9lb9mb6722kbgvrapl6cf8ckcw8cfj8cz"; + }; +in stdenv.mkDerivation rec { version = "1.0.0"; name = "cedille-${version}"; @@ -11,6 +19,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ alex happy Agda (ghcWithPackages (ps: [ps.ieee])) ]; + patches = [options-patch]; + LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc") @@ -22,9 +32,12 @@ stdenv.mkDerivation rec { chmod -R 755 ial ''; + outputs = ["out" "lib"]; + installPhase = '' mkdir -p $out/bin mv cedille $out/bin/cedille + mv lib $lib ''; meta = { diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch new file mode 100644 index 000000000000..8cd80281d0e4 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch @@ -0,0 +1,35 @@ +From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001 +From: Timo Kaufmann <timokau@zoho.com> +Date: Sun, 21 Oct 2018 17:52:40 +0200 +Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested + +--- + src/sage/doctest/control.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py +index bf18df8b2b..935c67abf7 100644 +--- a/src/sage/doctest/control.py ++++ b/src/sage/doctest/control.py +@@ -362,7 +362,8 @@ class DocTestController(SageObject): + if not optionaltag_regex.search(o): + raise ValueError('invalid optional tag {!r}'.format(o)) + +- options.optional |= auto_optional_tags ++ if "sage" in options.optional: ++ options.optional |= auto_optional_tags + + self.options = options + +@@ -765,7 +766,7 @@ class DocTestController(SageObject): + sage: DC = DocTestController(DD, [dirname]) + sage: DC.expand_files_into_sources() + sage: sorted(DC.sources[0].options.optional) # abs tol 1 +- ['guava', 'magma', 'py2'] ++ ['guava', 'magma'] + + We check that files are skipped appropriately:: + +-- +2.18.1 + diff --git a/pkgs/applications/science/math/sage/patches/revert-sphinx-always-fork.patch b/pkgs/applications/science/math/sage/patches/revert-sphinx-always-fork.patch new file mode 100644 index 000000000000..64dd6fd93777 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/revert-sphinx-always-fork.patch @@ -0,0 +1,71 @@ +commit f1c59929c3c180ac283334c2b3c901ac8c82f6b1 +Author: Timo Kaufmann <timokau@zoho.com> +Date: Sat Oct 20 20:07:41 2018 +0200 + + Revert "Something related to the sphinxbuild seems to be leaking memory" + + This reverts commit 7d85dc796c58c3de57401bc22d3587b94e205091. + +diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py +index 0b24b1a60b..084c3f89d7 100644 +--- a/src/sage_setup/docbuild/__init__.py ++++ b/src/sage_setup/docbuild/__init__.py +@@ -265,29 +265,35 @@ class DocBuilder(object): + # import the customized builder for object.inv files + inventory = builder_helper('inventory') + +-def build_many(target, args): +- # Pool() uses an actual fork() to run each new instance. This is important +- # for performance reasons, i.e., don't use a forkserver when it becomes +- # available with Python 3: Here, sage is already initialized which is quite +- # costly, with a forkserver we would have to reinitialize it for every +- # document we build. At the same time, don't serialize this by taking the +- # pool (and thus the call to fork()) out completely: The call to Sphinx +- # leaks memory, so we need to build each document in its own process to +- # control the RAM usage. +- from multiprocessing import Pool +- pool = Pool(NUM_THREADS, maxtasksperchild=1) +- # map_async handles KeyboardInterrupt correctly. Plain map and +- # apply_async does not, so don't use it. +- x = pool.map_async(target, args, 1) +- try: +- ret = x.get(99999) +- pool.close() +- pool.join() +- except Exception: +- pool.terminate() +- if ABORT_ON_ERROR: +- raise +- return ret ++if NUM_THREADS > 1: ++ def build_many(target, args): ++ from multiprocessing import Pool ++ pool = Pool(NUM_THREADS, maxtasksperchild=1) ++ # map_async handles KeyboardInterrupt correctly. Plain map and ++ # apply_async does not, so don't use it. ++ x = pool.map_async(target, args, 1) ++ try: ++ ret = x.get(99999) ++ pool.close() ++ pool.join() ++ except Exception: ++ pool.terminate() ++ if ABORT_ON_ERROR: ++ raise ++ return ret ++else: ++ def build_many(target, args): ++ results = [] ++ ++ for arg in args: ++ try: ++ results.append(target(arg)) ++ except Exception: ++ if ABORT_ON_ERROR: ++ raise ++ ++ return results ++ + + ########################################## + # Parallel Building Ref Manual # diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index f217a7a0caed..f631fe38a5b0 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -27,6 +27,16 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/25316 # https://github.com/python/cpython/pull/7476 ./patches/python-5755-hotpatch.patch + + # Revert the commit that made the sphinx build fork even in the single thread + # case. For some yet unknown reason, that breaks the docbuild on nix and archlinux. + # See https://groups.google.com/forum/#!msg/sage-packaging/VU4h8IWGFLA/mrmCMocYBwAJ. + ./patches/revert-sphinx-always-fork.patch + + # Make sure py2/py3 tests are only run when their expected context (all "sage" + # tests) are also run. That is necessary to test dochtml individually. See + # https://trac.sagemath.org/ticket/26110 for an upstream discussion. + ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch ]; packageUpgradePatches = [ @@ -48,6 +58,13 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa"; sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb"; }) + + # https://trac.sagemath.org/ticket/26360 + (fetchpatch { + name = "arb-2.15.1.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31"; + sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/applications/science/math/sage/sage-wrapper.nix b/pkgs/applications/science/math/sage/sage-wrapper.nix index 06b667f426fa..4b2f9c461c18 100644 --- a/pkgs/applications/science/math/sage/sage-wrapper.nix +++ b/pkgs/applications/science/math/sage/sage-wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = sage.version; - name = "sage-wrapper-${version}"; + name = "sage-${version}"; buildInputs = [ makeWrapper diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index b1e5d7278b0f..ad9a32e0ca56 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = sage-with-env.version; - name = "sage-${version}"; + name = "sage-tests-${version}"; buildInputs = [ makeWrapper diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 5ae10dd68b61..6661b4aa2282 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -57,6 +57,8 @@ let git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; + git-bug = callPackage ./git-bug { }; + # support for bugzilla git-bz = callPackage ./git-bz { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix new file mode 100644 index 000000000000..eabc9258e29a --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "git-bug-${version}"; + version = "0.4.0"; + rev = "2ab2412771d58a1b1f3bfeb5a6e9da2e683b0e12"; + goPackagePath = "github.com/MichaelMure/git-bug"; + + src = fetchFromGitHub { + inherit rev; + owner = "MichaelMure"; + repo = "git-bug"; + sha256 = "1zyvyg0p5h71wvyxrzkr1bwddxm3x8p44n6wh9ccfdxp8d2k6k25"; + }; + + goDeps = ./deps.nix; + + postInstall = '' + cd go/src/${goPackagePath} + install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug" + install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug" + install -D -m 0644 -t "$bin/share/man/man1" doc/man/* + ''; + + meta = with stdenv.lib; { + description = "Distributed bug tracker embedded in Git"; + homepage = https://github.com/MichaelMure/git-bug; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ royneary ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix new file mode 100644 index 000000000000..77d79602a9c1 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix @@ -0,0 +1,417 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/99designs/gqlgen"; + fetch = { + type = "git"; + url = "https://github.com/99designs/gqlgen"; + rev = "636435b68700211441303f1a5ed92f3768ba5774"; + sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz"; + }; + } + { + goPackagePath = "github.com/agnivade/levenshtein"; + fetch = { + type = "git"; + url = "https://github.com/agnivade/levenshtein"; + rev = "3d21ba515fe27b856f230847e856431ae1724adc"; + sha256 = "0dym3k3ycsj0zj0p4dhdp7gd2hm7c7pyh2wii1mdbmpdyipy99cd"; + }; + } + { + goPackagePath = "github.com/cheekybits/genny"; + fetch = { + type = "git"; + url = "https://github.com/cheekybits/genny"; + rev = "9127e812e1e9e501ce899a18121d316ecb52e4ba"; + sha256 = "1z57ga9c2sjnl5ngqgb1ap0zqv36sk0rarm02bbbkipz4m9yabjg"; + }; + } + { + goPackagePath = "github.com/corpix/uarand"; + fetch = { + type = "git"; + url = "https://github.com/corpix/uarand"; + rev = "2b8494104d86337cdd41d0a49cbed8e4583c0ab4"; + sha256 = "06ml5m8l9wbr96gvyg6z1syawn797f8kmq74nhgry3vqpngyb6yn"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"; + sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/go-test/deep"; + fetch = { + type = "git"; + url = "https://github.com/go-test/deep"; + rev = "6592d9cc0a499ad2d5f574fde80a2b5c5cc3b4f5"; + sha256 = "0f4rbdl6qmlq4bzh0443i634bm675bbrkyzwp8wkc1yhdl9qsij7"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "aa810b61a9c79d51363740d207bb46cf8e620ed5"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768"; + sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; + }; + } + { + goPackagePath = "github.com/icrowley/fake"; + fetch = { + type = "git"; + url = "https://github.com/icrowley/fake"; + rev = "4178557ae428460c3780a381c824a1f3aceb6325"; + sha256 = "1mv4bxfphaqbvacy49v4lf4gf2nmadzpmjq0jbdx93wi5bnkc977"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "c055c87ae801372cd74a0839b972db4f7697ae5f"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; + sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8"; + sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; + sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; + }; + } + { + goPackagePath = "github.com/phayes/freeport"; + fetch = { + type = "git"; + url = "https://github.com/phayes/freeport"; + rev = "b8543db493a5ed890c5499e935e2cad7504f3a04"; + sha256 = "1gwaan8fwmc5lfx4dzymq0jd6z2l1frg83jkmjpm4kw8ay4vr11q"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; + sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; + }; + } + { + goPackagePath = "github.com/shurcooL/githubv4"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/githubv4"; + rev = "b5f70540eee0ebfb6a27b52fc5b131be76415539"; + sha256 = "0hrjk16l8jwkhrbzcasp4dflv6hl24hcc4q2md5rn6i8f73dl18h"; + }; + } + { + goPackagePath = "github.com/shurcooL/go"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/go"; + rev = "9e1955d9fb6e1ee2345ba1f5e71669263e719e27"; + sha256 = "1lad9bvs75jsn61cfza19739c2c057k0bqxg2b4xz3z3l4w1mkqj"; + }; + } + { + goPackagePath = "github.com/shurcooL/graphql"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/graphql"; + rev = "365899397c9ad12805631fe4c9b2a64be9d74818"; + sha256 = "10n4id76zpj5g4hr1ry8d9v5cvm039rygrpgdk4ygk198vhr0gwm"; + }; + } + { + goPackagePath = "github.com/shurcooL/httpfs"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/httpfs"; + rev = "809beceb23714880abc4a382a00c05f89d13b1cc"; + sha256 = "1hvj5q5kjw83z7f77y03fqfg7fps7pqj2cj2c38x752m0pq4j2w3"; + }; + } + { + goPackagePath = "github.com/shurcooL/vfsgen"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/vfsgen"; + rev = "62bca832be04bd2bcaabd3b68a6b19a7ec044411"; + sha256 = "1lh8sw7qxs43jj8k9pfn91kfy2033p3il9bcb63whz8zhqw2a16y"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + fetch = { + type = "git"; + url = "https://github.com/skratchdot/open-golang"; + rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; + sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/vektah/gqlgen"; + fetch = { + type = "git"; + url = "https://github.com/vektah/gqlgen"; + rev = "636435b68700211441303f1a5ed92f3768ba5774"; + sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz"; + }; + } + { + goPackagePath = "github.com/vektah/gqlparser"; + fetch = { + type = "git"; + url = "https://github.com/vektah/gqlparser"; + rev = "14e83ae06ec152e6d0afb9766a00e0c0918aa8fc"; + sha256 = "162j259402pa2wb4645z6gplx5g1a2sfk393k2svwgws3bg2bws2"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "0e37d006457bf46f9e6692014ba72ef82c33022c"; + sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2f5d2388922f370f4355f327fcf4cfe9f5583908"; + sha256 = "03s92ygxfrd2c1m4697sd6iksgbar6c007w1yf3h6wmd79vr5dxs"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; + sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "a434f64ace81347eff0fb4a32bc80a235e0ad762"; + sha256 = "0zngnxrxjync4caz6ikmv5v0cn895iqhqmzqg9qddfm5bvl2a2my"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06"; + sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "b6e20af1ed078cd01a6413b734051a292450b4cb"; + sha256 = "11k6hmfhaf0qxpddp3i5kfpacdx51q6pv4n1kn3jnf1hjs0yny2k"; + }; + } +] \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 0d6b206cb4a4..2163855d00e1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }: stdenv.mkDerivation rec { - - name = "git-crypt-${meta.version}"; + name = "git-crypt-${version}"; + version = "0.6.0"; src = fetchFromGitHub { owner = "AGWA"; repo = "git-crypt"; - rev = meta.version; - sha256 = "4fe45f903a4b3cc06a5fe11334b914c225009fe8440d9e91a54fdf21cf4dcc4d"; + rev = "${version}"; + sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; inherit name; }; @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/AGWA/git-crypt/releases"; license = licenses.gpl3; - version = "0.5.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 9523059b42f2..88bd0b9f10db 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.125.0"; + version = "0.125.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "14a4qgpnspzw9cjqh6gbw3771bxfm789ibvmvb8jc4pklvbyl4mi"; + sha256 = "0vbxjqjs1r5c350r67812andasby5zk25xlaqp201lmlvamiv0ni"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 16acf2a91d70..3fab965bf547 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitLab, git, go }: + stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "6.1.1"; + version = "7.0.0"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr"; + sha256 = "1mmfb7h5sbva2kv9h9cxfg7dyksxrwwikq7jwggfawqaadzwm677"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c1a4392ec0ef..ba37091c433f 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -11,29 +11,29 @@ let groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; - version = "11.3.4"; + version = "11.4.0"; sources = if gitlabEnterprise then { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; - sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd"; + sha256 = "1y2a8acgsgrgcjazijsflhxq4fwqvd9yhrjx5pcncb24vl0x6dg4"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ee"; rev = "v${version}-ee"; - sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4"; + sha256 = "1pyqk1c5bml7chs4pq1fcxkrhk5r327xx9my6zmp2cb503s5m590"; }; } else { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; - sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7"; + sha256 = "0wiizjihn1a6hg6a2wpwmnh5a34n102va4djac3sgx74mwx4bniq"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ce"; rev = "v${version}"; - sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c"; + sha256 = "1a8pavqc9bblss5z9ikc9b0k0ra33vw73zy7rvn0v1wgvbqpc24k"; }; }; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f14e05d43e06..ecbfba0827d2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -80,16 +80,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -112,9 +110,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -137,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -170,10 +166,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -300,7 +295,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -425,7 +420,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index e41719ec79d3..9837a195d8c7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -86,7 +86,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -133,14 +133,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -175,8 +175,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) email_reply_trimmer (0.1.6) email_spec (2.2.0) @@ -189,7 +187,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -276,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -297,15 +295,14 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -343,7 +340,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -493,7 +490,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -501,7 +498,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -605,10 +602,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -633,9 +626,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -649,7 +642,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -735,7 +728,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -843,16 +836,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -865,7 +855,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -895,7 +885,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -954,7 +944,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1013,7 +1003,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) @@ -1038,19 +1027,20 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1114,7 +1104,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1166,9 +1155,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 65aac9891037..ee262b6b5d96 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -301,10 +301,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -504,10 +504,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -546,10 +546,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -695,15 +695,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -773,10 +764,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1078,10 +1069,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1118,15 +1109,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1144,6 +1126,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1237,10 +1228,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1779,10 +1770,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1843,10 +1834,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2207,15 +2198,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2314,18 +2296,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2382,10 +2364,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2699,10 +2681,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3072,13 +3054,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3089,15 +3071,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3144,10 +3117,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3288,10 +3261,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3518,10 +3491,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 86502db9d26e..ef14aace277e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -83,16 +83,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -115,9 +113,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -147,6 +142,7 @@ gem 'faraday_middleware-aws-signers-v4' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -180,10 +176,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -312,7 +307,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -440,7 +435,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index d7c4f80efd15..4355b3ae2717 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -94,7 +94,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -141,14 +141,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -183,8 +183,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) elasticsearch (5.0.3) elasticsearch-api (= 5.0.3) @@ -210,7 +208,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -300,7 +298,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -321,9 +319,6 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) @@ -331,6 +326,8 @@ GEM posix-spawn (~> 0.3) gitlab-license (1.0.0) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -368,7 +365,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -521,7 +518,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -529,7 +526,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -634,10 +631,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -662,9 +655,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -678,7 +671,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -764,7 +757,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -872,16 +865,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -894,7 +884,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -924,7 +914,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -983,7 +973,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1043,7 +1033,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) elasticsearch-api (= 5.0.3) elasticsearch-model (~> 0.1.9) @@ -1072,20 +1061,21 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1151,7 +1141,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1203,9 +1192,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index a067d1e42722..03efc4e9600f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -336,10 +336,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -539,10 +539,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -581,10 +581,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -730,15 +730,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -852,10 +843,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1166,10 +1157,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1206,15 +1197,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1240,6 +1222,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1333,10 +1324,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1892,10 +1883,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1956,10 +1947,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2328,15 +2319,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2435,18 +2417,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2503,10 +2485,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2820,10 +2802,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3193,13 +3175,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3210,15 +3192,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3265,10 +3238,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3409,10 +3382,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3639,10 +3612,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index c7a51508a8ce..68ecabe3b9df 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.7.1"; + version = "4.7.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "0x7hz4v882xy2r3k43fbndkq1kqwl3rl1zjmi8pxgpf05qcn950d"; + sha256 = "0y2q50380gnjzmyvmzh729ljgvq3wkcv6ham3w62mf4fjcvlpnag"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index c54a9358b609..6a429116a71d 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - sha256 = "0rx12218yy6h27z3xsmmxfsw8ldlsf4y862adkz6ybrygppsaib4"; + sha256 = "0bhzkmcinlsfp5ldgqp59xnkaz6ikzdnq78drcdf1w7q4z05ipxd"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index c44bd25b91a7..4dd2e019d1d3 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -57,6 +57,8 @@ mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; + # binary segfaults at the moment + broken = true; }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7d9ce1ac453b..3464b7aaeaa2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "27.0.0"; + version = "28.2.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0pcf0bzs588p0a4j01jzcy5y9c4hiblz3kwfznn1sjcyxm552z6n"; + sha256 = "162qj5z9wzm63im6jnd0n95ggzdk6fzq5bxgrr0l3y82ahfb7qwa"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 58ed3ec59b24..52876bb1bbc8 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.9.0"; + name = "smplayer-18.10.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0gff22yh2h76cyqsbjpa7rax51sfzygjl3isd8dk47zar9cyvw8d"; + sha256 = "1sql1rd4h74smkapjf5c686zbdqqaf44h7k7z5bxfvfcsad7rzrd"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b08ff812ace4..6cba5236a5f1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -12,6 +12,7 @@ , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , jackSupport ? false , fetchpatch +, removeReferencesTo }: with stdenv.lib; @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optional jackSupport libjack2; - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; enableParallelBuilding = true; @@ -60,10 +61,14 @@ stdenv.mkDerivation rec { /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype ''; - # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + # - Touch plugins (plugins cache keyed off mtime and file size: + # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + # - Remove references to the Qt development headers (used in error messages) postFixup = '' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' $out/lib/vlc/vlc-cache-gen $out/vlc/plugins + + remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so ''; # Most of the libraries are auto-detected so we don't need to set a bunch of @@ -72,6 +77,11 @@ stdenv.mkDerivation rec { "--with-kde-solid=$out/share/apps/solid/actions" ] ++ optional onlyLibVLC "--disable-vlc"; + # Remove runtime dependencies on libraries + postConfigure = '' + sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE "<removed>"|g' config.h + ''; + meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; homepage = http://www.videolan.org/vlc/; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix new file mode 100644 index 000000000000..79dbddfab550 --- /dev/null +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "cntr-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "cntr"; + rev = version; + sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg"; + }; + + cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51"; + + meta = with stdenv.lib; { + description = "A container debugging tool based on FUSE"; + homepage = https://github.com/Mic92/cntr; + license = licenses.mit; + # aarch64 support will be fixed soon + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index a1ff9bde3ed8..bd44b4fcbfeb 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1d4qnviv20zi3zk17zz8271mlfqqgfrxblw86izwwfvj3cvsyrah"; + sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix new file mode 100644 index 000000000000..5aebb7ed8dd1 --- /dev/null +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub +, meson, ninja +, pkgconfig, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus +, pango, cairo, libinput, libcap, pam, gdk_pixbuf +, wlroots, wayland-protocols +, buildDocs ? true +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "sway"; + version = "1.0-beta.1"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "sway"; + rev = version; + sha256 = "0h9kgrg9mh2acks63z72bw3lwff32pf2nb4i7i5xhd9i6l4gfnqa"; + }; + + nativeBuildInputs = [ + pkgconfig meson ninja + ] ++ stdenv.lib.optional buildDocs scdoc; + + buildInputs = [ + wayland libxkbcommon pcre json_c dbus + pango cairo libinput libcap pam gdk_pixbuf + wlroots wayland-protocols + ]; + + enableParallelBuilding = true; + + mesonFlags = "-Dsway-version=${version}"; + + meta = with stdenv.lib; { + description = "i3-compatible window manager for Wayland"; + homepage = https://swaywm.org; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date. + }; +} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 50614534f8e7..fb30f0073bfd 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; - homepage = http://swaywm.org; + homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index f65118ba4a64..252a0ff521fd 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -2,7 +2,7 @@ { crateName, dependencies, crateFeatures, libName, release, libPath, - crateType, metadata, crateBin, + crateType, metadata, crateBin, hasCrateBin, extraRustcOpts, verbose, colors }: let @@ -13,6 +13,17 @@ (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + + # Some platforms have different names for rustc. + rustPlatform = + with stdenv.hostPlatform.parsed; + let cpu_ = if cpu.name == "armv7a" then "armv7" + else cpu.name; + vendor_ = vendor.name; + kernel_ = kernel.name; + abi_ = abi.name; + in + "${cpu_}-${vendor_}-${kernel_}-${abi_}"; in '' runHook preBuild norm="" @@ -32,7 +43,8 @@ lib_src=$1 echo_build_heading $lib_src ${libName} - noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \ + noisily rustc --crate-name $CRATE_NAME $lib_src \ + ${lib.strings.concatStrings (map (x: " --crate-type ${x}") crateType)} \ ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \ --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} @@ -54,7 +66,8 @@ noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ - $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \ + ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rustPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} if [ "$crate_name_" != "$crate_name" ]; then mv target/bin/$crate_name_ target/bin/$crate_name fi @@ -103,9 +116,9 @@ tr '\n' ' ' < target/link > target/link_ LINK=$(cat target/link_) fi - - mkdir -p target/bin + ${lib.optionalString (crateBin != "") '' printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do + mkdir -p target/bin # filter empty entries / empty "lines" if [[ -z "$BIN_NAME" ]]; then continue @@ -141,13 +154,15 @@ fi build_bin "$BIN_NAME" "$BIN_PATH" done + ''} - - ${lib.optionalString (crateBin == "") '' + ${lib.optionalString (crateBin == "" && !hasCrateBin) '' if [[ -e src/main.rs ]]; then + mkdir -p target/bin build_bin ${crateName} src/main.rs fi for i in src/bin/*.rs; do #*/ + mkdir -p target/bin build_bin "$(basename $i .rs)" "$i" done ''} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index a11cef9f1f46..ec11472bbaeb 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }: let # This doesn't appear to be officially documented anywhere yet. @@ -16,7 +16,7 @@ let makeDeps = dependencies: (lib.concatMapStringsSep " " (dep: let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in - (if dep.crateType == "lib" then + (if lib.lists.any (x: x == "lib") dep.crateType then " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" else " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") @@ -86,7 +86,8 @@ stdenv.mkDerivation (rec { else fetchCrate { inherit (crate) crateName version sha256; }; name = "rust_${crate.crateName}-${crate.version}"; - buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_; + depsBuildBuild = [ rust stdenv.cc ]; + buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = builtins.map (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) @@ -122,15 +123,16 @@ stdenv.mkDerivation (rec { ) "" crate.crateBin else ""; + hasCrateBin = crate ? crateBin; build = crate.build or ""; workspace_member = crate.workspace_member or "."; crateVersion = crate.version; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = - if lib.attrByPath ["procMacro"] false crate then "proc-macro" else - if lib.attrByPath ["plugin"] false crate then "dylib" else - (crate.type or "lib"); + if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else + if lib.attrByPath ["plugin"] false crate then ["dylib"] else + (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); configurePhase = configureCrate { @@ -143,7 +145,7 @@ stdenv.mkDerivation (rec { buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType - metadata crateBin verbose colors + metadata crateBin hasCrateBin verbose colors extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix new file mode 100644 index 000000000000..e04324684e50 --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -0,0 +1,24 @@ +{stdenv, lib}: +{ + kernel = stdenv.hostPlatform.parsed.kernel.name; + abi = stdenv.hostPlatform.parsed.abi.name; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + exclude = excludedFiles: src: builtins.filterSource (path: type: + lib.lists.all (f: + !lib.strings.hasPrefix (toString (src + ("/" + f))) path + ) excludedFiles + ) src; +} diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 0b8b3d60b6c9..7a0d92f81b45 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,1444 +1,251 @@ -# Generated by carnix 0.7.2: carnix nix -{ lib, stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.hostPlatform.parsed.kernel.name; - abi = stdenv.hostPlatform.parsed.abi.name; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); +# Generated by carnix 0.8.11: carnix generate-nix +{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; in +let crates = cratesIO; in rec { - carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; }; + carnix = crates.crates.carnix."0.8.11" deps; __all = [ (carnix {}) ]; - aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.4"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; + deps.aho_corasick."0.6.8" = { + memchr = "2.1.0"; + }; + deps.ansi_term."0.11.0" = { + winapi = "0.3.6"; + }; + deps.argon2rs."0.2.5" = { + blake2_rfc = "0.2.18"; + scoped_threadpool = "0.1.9"; + }; + deps.arrayvec."0.4.7" = { + nodrop = "0.1.12"; + }; + deps.atty."0.2.11" = { + termion = "1.5.1"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.backtrace."0.3.9" = { + cfg_if = "0.1.6"; + rustc_demangle = "0.1.9"; + backtrace_sys = "0.1.24"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.backtrace_sys."0.1.24" = { + libc = "0.2.43"; + cc = "1.0.25"; + }; + deps.bitflags."1.0.4" = {}; + deps.blake2_rfc."0.2.18" = { + arrayvec = "0.4.7"; + constant_time_eq = "0.1.3"; + }; + deps.carnix."0.8.11" = { + clap = "2.32.0"; + dirs = "1.0.4"; + env_logger = "0.5.13"; + error_chain = "0.12.0"; + itertools = "0.7.8"; + log = "0.4.5"; + nom = "3.2.1"; + regex = "1.0.5"; + rusqlite = "0.14.0"; + serde = "1.0.80"; + serde_derive = "1.0.80"; + serde_json = "1.0.32"; + tempdir = "0.3.7"; + toml = "0.4.8"; + }; + deps.cc."1.0.25" = {}; + deps.cfg_if."0.1.6" = {}; + deps.clap."2.32.0" = { + atty = "0.2.11"; + bitflags = "1.0.4"; + strsim = "0.7.0"; + textwrap = "0.10.0"; + unicode_width = "0.1.5"; + vec_map = "0.8.1"; + ansi_term = "0.11.0"; + }; + deps.constant_time_eq."0.1.3" = {}; + deps.dirs."1.0.4" = { + redox_users = "0.2.0"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.either."1.5.0" = {}; + deps.env_logger."0.5.13" = { + atty = "0.2.11"; + humantime = "1.1.1"; + log = "0.4.5"; + regex = "1.0.5"; + termcolor = "1.0.4"; + }; + deps.error_chain."0.12.0" = { + backtrace = "0.3.9"; + }; + deps.failure."0.1.3" = { + backtrace = "0.3.9"; + failure_derive = "0.1.3"; + }; + deps.failure_derive."0.1.3" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + synstructure = "0.10.0"; + }; + deps.fuchsia_zircon."0.3.3" = { + bitflags = "1.0.4"; + fuchsia_zircon_sys = "0.3.3"; + }; + deps.fuchsia_zircon_sys."0.3.3" = {}; + deps.humantime."1.1.1" = { + quick_error = "1.2.2"; + }; + deps.itertools."0.7.8" = { + either = "1.5.0"; + }; + deps.itoa."0.4.3" = {}; + deps.lazy_static."1.1.0" = { + version_check = "0.1.5"; + }; + deps.libc."0.2.43" = {}; + deps.libsqlite3_sys."0.9.3" = { + pkg_config = "0.3.14"; + }; + deps.linked_hash_map."0.4.2" = {}; + deps.log."0.4.5" = { + cfg_if = "0.1.6"; + }; + deps.lru_cache."0.1.1" = { + linked_hash_map = "0.4.2"; + }; + deps.memchr."1.0.2" = { + libc = "0.2.43"; + }; + deps.memchr."2.1.0" = { + cfg_if = "0.1.6"; + libc = "0.2.43"; + version_check = "0.1.5"; + }; + deps.nodrop."0.1.12" = {}; + deps.nom."3.2.1" = { + memchr = "1.0.2"; + }; + deps.pkg_config."0.3.14" = {}; + deps.proc_macro2."0.4.20" = { + unicode_xid = "0.1.0"; + }; + deps.quick_error."1.2.2" = {}; + deps.quote."0.6.8" = { + proc_macro2 = "0.4.20"; + }; + deps.rand."0.4.3" = { + fuchsia_zircon = "0.3.3"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.redox_syscall."0.1.40" = {}; + deps.redox_termios."0.1.1" = { + redox_syscall = "0.1.40"; + }; + deps.redox_users."0.2.0" = { + argon2rs = "0.2.5"; + failure = "0.1.3"; + rand = "0.4.3"; + redox_syscall = "0.1.40"; + }; + deps.regex."1.0.5" = { + aho_corasick = "0.6.8"; + memchr = "2.1.0"; + regex_syntax = "0.6.2"; + thread_local = "0.3.6"; + utf8_ranges = "1.0.1"; + }; + deps.regex_syntax."0.6.2" = { + ucd_util = "0.1.1"; + }; + deps.remove_dir_all."0.5.1" = { + winapi = "0.3.6"; + }; + deps.rusqlite."0.14.0" = { + bitflags = "1.0.4"; + libsqlite3_sys = "0.9.3"; + lru_cache = "0.1.1"; + time = "0.1.40"; + }; + deps.rustc_demangle."0.1.9" = {}; + deps.ryu."0.2.6" = {}; + deps.scoped_threadpool."0.1.9" = {}; + deps.serde."1.0.80" = {}; + deps.serde_derive."1.0.80" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + }; + deps.serde_json."1.0.32" = { + itoa = "0.4.3"; + ryu = "0.2.6"; + serde = "1.0.80"; + }; + deps.strsim."0.7.0" = {}; + deps.syn."0.15.13" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + unicode_xid = "0.1.0"; + }; + deps.synstructure."0.10.0" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + unicode_xid = "0.1.0"; + }; + deps.tempdir."0.3.7" = { + rand = "0.4.3"; + remove_dir_all = "0.5.1"; + }; + deps.termcolor."1.0.4" = { + wincolor = "1.0.1"; + }; + deps.termion."1.5.1" = { + libc = "0.2.43"; + redox_syscall = "0.1.40"; + redox_termios = "0.1.1"; + }; + deps.textwrap."0.10.0" = { + unicode_width = "0.1.5"; + }; + deps.thread_local."0.3.6" = { + lazy_static = "1.1.0"; + }; + deps.time."0.1.40" = { + libc = "0.2.43"; + redox_syscall = "0.1.40"; + winapi = "0.3.6"; + }; + deps.toml."0.4.8" = { + serde = "1.0.80"; + }; + deps.ucd_util."0.1.1" = {}; + deps.unicode_width."0.1.5" = {}; + deps.unicode_xid."0.1.0" = {}; + deps.utf8_ranges."1.0.1" = {}; + deps.vcpkg."0.2.6" = {}; + deps.vec_map."0.8.1" = {}; + deps.version_check."0.1.5" = {}; + deps.winapi."0.3.6" = { + winapi_i686_pc_windows_gnu = "0.4.0"; + winapi_x86_64_pc_windows_gnu = "0.4.0"; + }; + deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; + deps.winapi_util."0.1.1" = { + winapi = "0.3.6"; + }; + deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; + deps.wincolor."1.0.1" = { + winapi = "0.3.6"; + winapi_util = "0.1.1"; }; - ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - inherit dependencies buildDependencies features; - }; - atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.8"; - authors = [ "softprops <d.tangren@gmail.com>" ]; - sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d"; - inherit dependencies buildDependencies features; - }; - backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.6"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ]; - sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx"; - inherit dependencies buildDependencies features; - }; - backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace-sys"; - version = "0.1.16"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; - inherit dependencies buildDependencies features; - }; - carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "carnix"; - version = "0.7.2"; - authors = [ "pe@pijul.org <pe@pijul.org>" ]; - sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5"; - crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ]; - inherit dependencies buildDependencies features; - }; - cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cc"; - version = "1.0.10"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn"; - inherit dependencies buildDependencies features; - }; - cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.2"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; - inherit dependencies buildDependencies features; - }; - clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.31.2"; - authors = [ "Kevin K. <kbknapp@gmail.com>" ]; - sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.2"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; - inherit dependencies buildDependencies features; - }; - either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "either"; - version = "1.5.0"; - authors = [ "bluss" ]; - sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; - inherit dependencies buildDependencies features; - }; - env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "env_logger"; - version = "0.5.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l"; - inherit dependencies buildDependencies features; - }; - error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "error-chain"; - version = "0.11.0"; - authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ]; - sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - inherit dependencies buildDependencies features; - }; - humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "humantime"; - version = "1.1.1"; - authors = [ "Paul Colomiets <paul@colomiets.name>" ]; - sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itertools"; - version = "0.7.8"; - authors = [ "bluss" ]; - sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; - inherit dependencies buildDependencies features; - }; - itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.4.1"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij"; - inherit dependencies buildDependencies features; - }; - lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "1.0.0"; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; - inherit dependencies buildDependencies features; - }; - libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; - inherit dependencies buildDependencies features; - }; - libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libsqlite3-sys"; - version = "0.9.1"; - authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; - sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "linked-hash-map"; - version = "0.4.2"; - authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ]; - sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; - inherit dependencies buildDependencies features; - }; - log_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.4.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "01vm8yy3wngvyj6qp1x3xpcb4xq7v67yn9l7fsma8kz28mliz90d"; - inherit dependencies buildDependencies features; - }; - lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lru-cache"; - version = "0.1.1"; - authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ]; - sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; - inherit dependencies buildDependencies features; - }; - memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "1.0.2"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; - sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; - inherit dependencies buildDependencies features; - }; - memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "2.0.1"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; - sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; - inherit dependencies buildDependencies features; - }; - nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nom"; - version = "3.2.1"; - authors = [ "contact@geoffroycouprie.com" ]; - sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; - inherit dependencies buildDependencies features; - }; - num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.2.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - inherit dependencies buildDependencies features; - }; - proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.3.6"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp"; - inherit dependencies buildDependencies features; - }; - quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quick-error"; - version = "1.2.1"; - authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ]; - sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6"; - inherit dependencies buildDependencies features; - }; - quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.5.1"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r"; - inherit dependencies buildDependencies features; - }; - rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.4.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.37"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.2.10"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.5.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp"; - inherit dependencies buildDependencies features; - }; - remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "remove_dir_all"; - version = "0.5.0"; - authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; - sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y"; - inherit dependencies buildDependencies features; - }; - rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rusqlite"; - version = "0.13.0"; - authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; - sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; - inherit dependencies buildDependencies features; - }; - rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.7"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6"; - inherit dependencies buildDependencies features; - }; - serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.38"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.38"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive_internals"; - version = "0.23.1"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4"; - inherit dependencies buildDependencies features; - }; - serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.14"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj"; - inherit dependencies buildDependencies features; - }; - strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - inherit dependencies buildDependencies features; - }; - syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.13.1"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg"; - inherit dependencies buildDependencies features; - }; - tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempdir"; - version = "0.3.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; - inherit dependencies buildDependencies features; - }; - termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termcolor"; - version = "0.3.6"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; - inherit dependencies buildDependencies features; - }; - termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - inherit dependencies buildDependencies features; - }; - textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "textwrap"; - version = "0.9.0"; - authors = [ "Martin Geisler <martin@geisler.net>" ]; - sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.5"; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; - inherit dependencies buildDependencies features; - }; - time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "time"; - version = "0.1.39"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if"; - inherit dependencies buildDependencies features; - }; - toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.4.6"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; - inherit dependencies buildDependencies features; - }; - ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.1.0"; - authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; - sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.0"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; - inherit dependencies buildDependencies features; - }; - vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.3"; - authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; - sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; - inherit dependencies buildDependencies features; - }; - vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.0"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; - sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.3.4"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wincolor"; - version = "0.1.6"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { - dependencies = mapFeatures features ([ memchr_2_0_1 ]); - }; - aho_corasick_0_6_4_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); - memchr_2_0_1.default = true; - }) [ memchr_2_0_1_features ]; - ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - ansi_term_0_11_0_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.processenv = true; - }) [ winapi_0_3_4_features ]; - atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - atty_0_2_8_features = f: updateFeatures f (rec { - atty_0_2_8.default = (f.atty_0_2_8.default or true); - libc_0_2_40.default = (f.libc_0_2_40.default or false); - termion_1_5_1.default = true; - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; - backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []); - features = mkFeatures (features.backtrace_0_3_6 or {}); - }; - backtrace_0_3_6_features = f: updateFeatures f (rec { - backtrace_0_3_6.addr2line = - (f.backtrace_0_3_6.addr2line or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.backtrace-sys = - (f.backtrace_0_3_6.backtrace-sys or false) || - (f.backtrace_0_3_6.libbacktrace or false) || - (backtrace_0_3_6.libbacktrace or false); - backtrace_0_3_6.coresymbolication = - (f.backtrace_0_3_6.coresymbolication or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.dbghelp = - (f.backtrace_0_3_6.dbghelp or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true); - backtrace_0_3_6.dladdr = - (f.backtrace_0_3_6.dladdr or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.findshlibs = - (f.backtrace_0_3_6.findshlibs or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.gimli = - (f.backtrace_0_3_6.gimli or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.libbacktrace = - (f.backtrace_0_3_6.libbacktrace or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.libunwind = - (f.backtrace_0_3_6.libunwind or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.memmap = - (f.backtrace_0_3_6.memmap or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.object = - (f.backtrace_0_3_6.object or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.rustc-serialize = - (f.backtrace_0_3_6.rustc-serialize or false) || - (f.backtrace_0_3_6.serialize-rustc or false) || - (backtrace_0_3_6.serialize-rustc or false); - backtrace_0_3_6.serde = - (f.backtrace_0_3_6.serde or false) || - (f.backtrace_0_3_6.serialize-serde or false) || - (backtrace_0_3_6.serialize-serde or false); - backtrace_0_3_6.serde_derive = - (f.backtrace_0_3_6.serde_derive or false) || - (f.backtrace_0_3_6.serialize-serde or false) || - (backtrace_0_3_6.serialize-serde or false); - backtrace_0_3_6.winapi = - (f.backtrace_0_3_6.winapi or false) || - (f.backtrace_0_3_6.dbghelp or false) || - (backtrace_0_3_6.dbghelp or false); - backtrace_sys_0_1_16.default = true; - cfg_if_0_1_2.default = true; - libc_0_2_40.default = true; - rustc_demangle_0_1_7.default = true; - winapi_0_3_4.dbghelp = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processthreadsapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.winnt = true; - }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ]; - backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]); - buildDependencies = mapFeatures features ([ cc_1_0_10 ]); - }; - backtrace_sys_0_1_16_features = f: updateFeatures f (rec { - backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true); - cc_1_0_10.default = true; - libc_0_2_40.default = true; - }) [ libc_0_2_40_features cc_1_0_10_features ]; - bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { - features = mkFeatures (features.bitflags_1_0_1 or {}); - }; - bitflags_1_0_1_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true); - bitflags_1_0_1.example_generated = - (f.bitflags_1_0_1.example_generated or false) || - (f.bitflags_1_0_1.default or false) || - (bitflags_1_0_1.default or false); - }) []; - carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ { - dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]); - }; - carnix_0_7_2_features = f: updateFeatures f (rec { - carnix_0_7_2.default = (f.carnix_0_7_2.default or true); - clap_2_31_2.default = true; - env_logger_0_5_7.default = true; - error_chain_0_11_0.default = true; - itertools_0_7_8.default = true; - log_0_4_1.default = true; - nom_3_2_1.default = true; - regex_0_2_10.default = true; - rusqlite_0_13_0.default = true; - serde_1_0_38.default = true; - serde_derive_1_0_38.default = true; - serde_json_1_0_14.default = true; - tempdir_0_3_7.default = true; - toml_0_4_6.default = true; - }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ]; - cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_10 or {}); - }; - cc_1_0_10_features = f: updateFeatures f (rec { - cc_1_0_10.default = (f.cc_1_0_10.default or true); - cc_1_0_10.rayon = - (f.cc_1_0_10.rayon or false) || - (f.cc_1_0_10.parallel or false) || - (cc_1_0_10.parallel or false); - }) []; - cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; - cfg_if_0_1_2_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); - }) []; - clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ] - ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else []) - ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) - ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ ] - ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); - features = mkFeatures (features.clap_2_31_2 or {}); - }; - clap_2_31_2_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = true; - atty_0_2_8.default = true; - bitflags_1_0_1.default = true; - clap_2_31_2.ansi_term = - (f.clap_2_31_2.ansi_term or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.atty = - (f.clap_2_31_2.atty or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.clippy = - (f.clap_2_31_2.clippy or false) || - (f.clap_2_31_2.lints or false) || - (clap_2_31_2.lints or false); - clap_2_31_2.color = - (f.clap_2_31_2.color or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.default = (f.clap_2_31_2.default or true); - clap_2_31_2.strsim = - (f.clap_2_31_2.strsim or false) || - (f.clap_2_31_2.suggestions or false) || - (clap_2_31_2.suggestions or false); - clap_2_31_2.suggestions = - (f.clap_2_31_2.suggestions or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.term_size = - (f.clap_2_31_2.term_size or false) || - (f.clap_2_31_2.wrap_help or false) || - (clap_2_31_2.wrap_help or false); - clap_2_31_2.vec_map = - (f.clap_2_31_2.vec_map or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.yaml = - (f.clap_2_31_2.yaml or false) || - (f.clap_2_31_2.doc or false) || - (clap_2_31_2.doc or false); - clap_2_31_2.yaml-rust = - (f.clap_2_31_2.yaml-rust or false) || - (f.clap_2_31_2.yaml or false) || - (clap_2_31_2.yaml or false); - strsim_0_7_0.default = true; - textwrap_0_9_0.default = true; - textwrap_0_9_0.term_size = - (f.textwrap_0_9_0.term_size or false) || - (clap_2_31_2.wrap_help or false) || - (f.clap_2_31_2.wrap_help or false); - unicode_width_0_1_4.default = true; - vec_map_0_8_0.default = true; - }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ]; - dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; - dtoa_0_4_2_features = f: updateFeatures f (rec { - dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); - }) []; - either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.either_1_5_0 or {}); - }; - either_1_5_0_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or true); - either_1_5_0.use_std = - (f.either_1_5_0.use_std or false) || - (f.either_1_5_0.default or false) || - (either_1_5_0.default or false); - }) []; - env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ { - dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ] - ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else [])); - features = mkFeatures (features.env_logger_0_5_7 or {}); - }; - env_logger_0_5_7_features = f: updateFeatures f (rec { - atty_0_2_8.default = true; - env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true); - env_logger_0_5_7.regex = - (f.env_logger_0_5_7.regex or false) || - (f.env_logger_0_5_7.default or false) || - (env_logger_0_5_7.default or false); - humantime_1_1_1.default = true; - log_0_4_1.default = true; - log_0_4_1.std = true; - regex_0_2_10.default = true; - termcolor_0_3_6.default = true; - }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ]; - error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { - dependencies = mapFeatures features ([ ] - ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else [])); - features = mkFeatures (features.error_chain_0_11_0 or {}); - }; - error_chain_0_11_0_features = f: updateFeatures f (rec { - backtrace_0_3_6.default = true; - error_chain_0_11_0.backtrace = - (f.error_chain_0_11_0.backtrace or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true); - error_chain_0_11_0.example_generated = - (f.error_chain_0_11_0.example_generated or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - }) [ backtrace_0_3_6_features ]; - fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]); - }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = true; - fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); - fuchsia_zircon_sys_0_3_3.default = true; - }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ]; - fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { - fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); - }) []; - humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ { - dependencies = mapFeatures features ([ quick_error_1_2_1 ]); - }; - humantime_1_1_1_features = f: updateFeatures f (rec { - humantime_1_1_1.default = (f.humantime_1_1_1.default or true); - quick_error_1_2_1.default = true; - }) [ quick_error_1_2_1_features ]; - itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ { - dependencies = mapFeatures features ([ either_1_5_0 ]); - features = mkFeatures (features.itertools_0_7_8 or {}); - }; - itertools_0_7_8_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or false); - itertools_0_7_8.default = (f.itertools_0_7_8.default or true); - itertools_0_7_8.use_std = - (f.itertools_0_7_8.use_std or false) || - (f.itertools_0_7_8.default or false) || - (itertools_0_7_8.default or false); - }) [ either_1_5_0_features ]; - itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ { - features = mkFeatures (features.itoa_0_4_1 or {}); - }; - itoa_0_4_1_features = f: updateFeatures f (rec { - itoa_0_4_1.default = (f.itoa_0_4_1.default or true); - itoa_0_4_1.std = - (f.itoa_0_4_1.std or false) || - (f.itoa_0_4_1.default or false) || - (itoa_0_4_1.default or false); - }) []; - lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_1_0_0 or {}); - }; - lazy_static_1_0_0_features = f: updateFeatures f (rec { - lazy_static_1_0_0.compiletest_rs = - (f.lazy_static_1_0_0.compiletest_rs or false) || - (f.lazy_static_1_0_0.compiletest or false) || - (lazy_static_1_0_0.compiletest or false); - lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); - lazy_static_1_0_0.nightly = - (f.lazy_static_1_0_0.nightly or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - lazy_static_1_0_0.spin = - (f.lazy_static_1_0_0.spin or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - }) []; - libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { - features = mkFeatures (features.libc_0_2_40 or {}); - }; - libc_0_2_40_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or true); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (f.libc_0_2_40.default or false) || - (libc_0_2_40.default or false); - }) []; - libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ { - dependencies = (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ ] - ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else [])); - features = mkFeatures (features.libsqlite3_sys_0_9_1 or {}); - }; - libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec { - libsqlite3_sys_0_9_1.bindgen = - (f.libsqlite3_sys_0_9_1.bindgen or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false); - libsqlite3_sys_0_9_1.cc = - (f.libsqlite3_sys_0_9_1.cc or false) || - (f.libsqlite3_sys_0_9_1.bundled or false) || - (libsqlite3_sys_0_9_1.bundled or false); - libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true); - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.default or false) || - (libsqlite3_sys_0_9_1.default or false); - libsqlite3_sys_0_9_1.pkg-config = - (f.libsqlite3_sys_0_9_1.pkg-config or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); - libsqlite3_sys_0_9_1.vcpkg = - (f.libsqlite3_sys_0_9_1.vcpkg or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); - pkg_config_0_3_9.default = true; - }) [ pkg_config_0_3_9_features ]; - linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.linked_hash_map_0_4_2 or {}); - }; - linked_hash_map_0_4_2_features = f: updateFeatures f (rec { - linked_hash_map_0_4_2.default = (f.linked_hash_map_0_4_2.default or true); - linked_hash_map_0_4_2.heapsize = - (f.linked_hash_map_0_4_2.heapsize or false) || - (f.linked_hash_map_0_4_2.heapsize_impl or false) || - (linked_hash_map_0_4_2.heapsize_impl or false); - linked_hash_map_0_4_2.serde = - (f.linked_hash_map_0_4_2.serde or false) || - (f.linked_hash_map_0_4_2.serde_impl or false) || - (linked_hash_map_0_4_2.serde_impl or false); - linked_hash_map_0_4_2.serde_test = - (f.linked_hash_map_0_4_2.serde_test or false) || - (f.linked_hash_map_0_4_2.serde_impl or false) || - (linked_hash_map_0_4_2.serde_impl or false); - }) []; - log_0_4_1 = { features?(log_0_4_1_features {}) }: log_0_4_1_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 ]); - features = mkFeatures (features.log_0_4_1 or {}); - }; - log_0_4_1_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = true; - log_0_4_1.default = (f.log_0_4_1.default or true); - }) [ cfg_if_0_1_2_features ]; - lru_cache_0_1_1 = { features?(lru_cache_0_1_1_features {}) }: lru_cache_0_1_1_ { - dependencies = mapFeatures features ([ linked_hash_map_0_4_2 ]); - features = mkFeatures (features.lru_cache_0_1_1 or {}); - }; - lru_cache_0_1_1_features = f: updateFeatures f (rec { - linked_hash_map_0_4_2.default = true; - linked_hash_map_0_4_2.heapsize_impl = - (f.linked_hash_map_0_4_2.heapsize_impl or false) || - (lru_cache_0_1_1.heapsize_impl or false) || - (f.lru_cache_0_1_1.heapsize_impl or false); - lru_cache_0_1_1.default = (f.lru_cache_0_1_1.default or true); - lru_cache_0_1_1.heapsize = - (f.lru_cache_0_1_1.heapsize or false) || - (f.lru_cache_0_1_1.heapsize_impl or false) || - (lru_cache_0_1_1.heapsize_impl or false); - }) [ linked_hash_map_0_4_2_features ]; - memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_1_0_2 or {}); - }; - memchr_1_0_2_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.use_std or false); - memchr_1_0_2.default = (f.memchr_1_0_2.default or true); - memchr_1_0_2.libc = - (f.memchr_1_0_2.libc or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false) || - (f.memchr_1_0_2.use_std or false) || - (memchr_1_0_2.use_std or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false); - }) [ libc_0_2_40_features ]; - memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_2_0_1 or {}); - }; - memchr_2_0_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.use_std or false); - memchr_2_0_1.default = (f.memchr_2_0_1.default or true); - memchr_2_0_1.libc = - (f.memchr_2_0_1.libc or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false) || - (f.memchr_2_0_1.use_std or false) || - (memchr_2_0_1.use_std or false); - memchr_2_0_1.use_std = - (f.memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false); - }) [ libc_0_2_40_features ]; - nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { - dependencies = mapFeatures features ([ memchr_1_0_2 ]); - features = mkFeatures (features.nom_3_2_1 or {}); - }; - nom_3_2_1_features = f: updateFeatures f (rec { - memchr_1_0_2.default = (f.memchr_1_0_2.default or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (nom_3_2_1.std or false) || - (f.nom_3_2_1.std or false); - nom_3_2_1.compiler_error = - (f.nom_3_2_1.compiler_error or false) || - (f.nom_3_2_1.nightly or false) || - (nom_3_2_1.nightly or false); - nom_3_2_1.default = (f.nom_3_2_1.default or true); - nom_3_2_1.lazy_static = - (f.nom_3_2_1.lazy_static or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.regex = - (f.nom_3_2_1.regex or false) || - (f.nom_3_2_1.regexp or false) || - (nom_3_2_1.regexp or false); - nom_3_2_1.regexp = - (f.nom_3_2_1.regexp or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.std = - (f.nom_3_2_1.std or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - nom_3_2_1.stream = - (f.nom_3_2_1.stream or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - }) [ memchr_1_0_2_features ]; - num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ { - features = mkFeatures (features.num_traits_0_2_2 or {}); - }; - num_traits_0_2_2_features = f: updateFeatures f (rec { - num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true); - num_traits_0_2_2.std = - (f.num_traits_0_2_2.std or false) || - (f.num_traits_0_2_2.default or false) || - (num_traits_0_2_2.default or false); - }) []; - pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { - pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); - }) []; - proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ { - dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); - features = mkFeatures (features.proc_macro2_0_3_6 or {}); - }; - proc_macro2_0_3_6_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (f.proc_macro2_0_3_6.default or false) || - (proc_macro2_0_3_6.default or false) || - (f.proc_macro2_0_3_6.nightly or false) || - (proc_macro2_0_3_6.nightly or false); - unicode_xid_0_1_0.default = true; - }) [ unicode_xid_0_1_0_features ]; - quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {}; - quick_error_1_2_1_features = f: updateFeatures f (rec { - quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true); - }) []; - quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]); - features = mkFeatures (features.quote_0_5_1 or {}); - }; - quote_0_5_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (quote_0_5_1.proc-macro or false) || - (f.quote_0_5_1.proc-macro or false); - quote_0_5_1.default = (f.quote_0_5_1.default or true); - quote_0_5_1.proc-macro = - (f.quote_0_5_1.proc-macro or false) || - (f.quote_0_5_1.default or false) || - (quote_0_5_1.default or false); - }) [ proc_macro2_0_3_6_features ]; - rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - features = mkFeatures (features.rand_0_4_2 or {}); - }; - rand_0_4_2_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_40.default = true; - rand_0_4_2.default = (f.rand_0_4_2.default or true); - rand_0_4_2.i128_support = - (f.rand_0_4_2.i128_support or false) || - (f.rand_0_4_2.nightly or false) || - (rand_0_4_2.nightly or false); - rand_0_4_2.libc = - (f.rand_0_4_2.libc or false) || - (f.rand_0_4_2.std or false) || - (rand_0_4_2.std or false); - rand_0_4_2.std = - (f.rand_0_4_2.std or false) || - (f.rand_0_4_2.default or false) || - (rand_0_4_2.default or false); - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntsecapi = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.winnt = true; - }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; - redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; - redox_syscall_0_1_37_features = f: updateFeatures f (rec { - redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); - }) []; - redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); - }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_37_features ]; - regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_10 or {}); - }; - regex_0_2_10_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = true; - memchr_2_0_1.default = true; - regex_0_2_10.default = (f.regex_0_2_10.default or true); - regex_0_2_10.pattern = - (f.regex_0_2_10.pattern or false) || - (f.regex_0_2_10.unstable or false) || - (regex_0_2_10.unstable or false); - regex_syntax_0_5_5.default = true; - thread_local_0_3_5.default = true; - utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ { - dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); - }; - regex_syntax_0_5_5_features = f: updateFeatures f (rec { - regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true); - ucd_util_0_1_1.default = true; - }) [ ucd_util_0_1_1_features ]; - remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - remove_dir_all_0_5_0_features = f: updateFeatures f (rec { - remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true); - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.fileapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.winbase = true; - winapi_0_3_4.winerror = true; - }) [ winapi_0_3_4_features ]; - rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]); - features = mkFeatures (features.rusqlite_0_13_0 or {}); - }; - rusqlite_0_13_0_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = true; - libsqlite3_sys_0_9_1.buildtime_bindgen = - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (rusqlite_0_13_0.buildtime_bindgen or false) || - (f.rusqlite_0_13_0.buildtime_bindgen or false); - libsqlite3_sys_0_9_1.bundled = - (f.libsqlite3_sys_0_9_1.bundled or false) || - (rusqlite_0_13_0.bundled or false) || - (f.rusqlite_0_13_0.bundled or false); - libsqlite3_sys_0_9_1.default = true; - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (rusqlite_0_13_0.backup or false) || - (f.rusqlite_0_13_0.backup or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (rusqlite_0_13_0.trace or false) || - (f.rusqlite_0_13_0.trace or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (rusqlite_0_13_0.functions or false) || - (f.rusqlite_0_13_0.functions or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (rusqlite_0_13_0.blob or false) || - (f.rusqlite_0_13_0.blob or false); - libsqlite3_sys_0_9_1.sqlcipher = - (f.libsqlite3_sys_0_9_1.sqlcipher or false) || - (rusqlite_0_13_0.sqlcipher or false) || - (f.rusqlite_0_13_0.sqlcipher or false); - lru_cache_0_1_1.default = true; - rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true); - time_0_1_39.default = true; - }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ]; - rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {}; - rustc_demangle_0_1_7_features = f: updateFeatures f (rec { - rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true); - }) []; - serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_38 or {}); - }; - serde_1_0_38_features = f: updateFeatures f (rec { - serde_1_0_38.default = (f.serde_1_0_38.default or true); - serde_1_0_38.serde_derive = - (f.serde_1_0_38.serde_derive or false) || - (f.serde_1_0_38.derive or false) || - (serde_1_0_38.derive or false) || - (f.serde_1_0_38.playground or false) || - (serde_1_0_38.playground or false); - serde_1_0_38.std = - (f.serde_1_0_38.std or false) || - (f.serde_1_0_38.default or false) || - (serde_1_0_38.default or false); - serde_1_0_38.unstable = - (f.serde_1_0_38.unstable or false) || - (f.serde_1_0_38.alloc or false) || - (serde_1_0_38.alloc or false); - }) []; - serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]); - features = mkFeatures (features.serde_derive_1_0_38 or {}); - }; - serde_derive_1_0_38_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = true; - quote_0_5_1.default = true; - serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true); - serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false); - syn_0_13_1.default = true; - syn_0_13_1.visit = true; - }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ]; - serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]); - }; - serde_derive_internals_0_23_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = true; - serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true); - syn_0_13_1.clone-impls = true; - syn_0_13_1.default = (f.syn_0_13_1.default or false); - syn_0_13_1.derive = true; - syn_0_13_1.parsing = true; - }) [ proc_macro2_0_3_6_features syn_0_13_1_features ]; - serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ { - dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]); - features = mkFeatures (features.serde_json_1_0_14 or {}); - }; - serde_json_1_0_14_features = f: updateFeatures f (rec { - dtoa_0_4_2.default = true; - itoa_0_4_1.default = true; - num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false); - serde_1_0_38.default = true; - serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true); - serde_json_1_0_14.linked-hash-map = - (f.serde_json_1_0_14.linked-hash-map or false) || - (f.serde_json_1_0_14.preserve_order or false) || - (serde_json_1_0_14.preserve_order or false); - }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ]; - strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f (rec { - strsim_0_7_0.default = (f.strsim_0_7_0.default or true); - }) []; - syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ] - ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else [])); - features = mkFeatures (features.syn_0_13_1 or {}); - }; - syn_0_13_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.proc-macro or false); - quote_0_5_1.default = (f.quote_0_5_1.default or false); - quote_0_5_1.proc-macro = - (f.quote_0_5_1.proc-macro or false) || - (syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.proc-macro or false); - syn_0_13_1.clone-impls = - (f.syn_0_13_1.clone-impls or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.default = (f.syn_0_13_1.default or true); - syn_0_13_1.derive = - (f.syn_0_13_1.derive or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.parsing = - (f.syn_0_13_1.parsing or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.printing = - (f.syn_0_13_1.printing or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.proc-macro = - (f.syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.quote = - (f.syn_0_13_1.quote or false) || - (f.syn_0_13_1.printing or false) || - (syn_0_13_1.printing or false); - unicode_xid_0_1_0.default = true; - }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ]; - tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { - dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]); - }; - tempdir_0_3_7_features = f: updateFeatures f (rec { - rand_0_4_2.default = true; - remove_dir_all_0_5_0.default = true; - tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); - }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ]; - termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); - }; - termcolor_0_3_6_features = f: updateFeatures f (rec { - termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); - wincolor_0_1_6.default = true; - }) [ wincolor_0_1_6_features ]; - termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); - }; - termion_1_5_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = true; - termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; - textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - }; - textwrap_0_9_0_features = f: updateFeatures f (rec { - textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { - dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); - }; - thread_local_0_3_5_features = f: updateFeatures f (rec { - lazy_static_1_0_0.default = true; - thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); - unreachable_1_0_0.default = true; - }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; - time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - time_0_1_39_features = f: updateFeatures f (rec { - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - time_0_1_39.default = (f.time_0_1_39.default or true); - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntdef = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.sysinfoapi = true; - winapi_0_3_4.timezoneapi = true; - }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ]; - toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { - dependencies = mapFeatures features ([ serde_1_0_38 ]); - }; - toml_0_4_6_features = f: updateFeatures f (rec { - serde_1_0_38.default = true; - toml_0_4_6.default = (f.toml_0_4_6.default or true); - }) [ serde_1_0_38_features ]; - ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f (rec { - ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); - }) []; - unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { - features = mkFeatures (features.unicode_width_0_1_4 or {}); - }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { - unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); - }) []; - unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { - features = mkFeatures (features.unicode_xid_0_1_0 or {}); - }; - unicode_xid_0_1_0_features = f: updateFeatures f (rec { - unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f (rec { - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f (rec { - utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); - }) []; - vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; - vcpkg_0_2_3_features = f: updateFeatures f (rec { - vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); - }) []; - vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.vec_map_0_8_0 or {}); - }; - vec_map_0_8_0_features = f: updateFeatures f (rec { - vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); - vec_map_0_8_0.serde = - (f.vec_map_0_8_0.serde or false) || - (f.vec_map_0_8_0.eders or false) || - (vec_map_0_8_0.eders or false); - vec_map_0_8_0.serde_derive = - (f.vec_map_0_8_0.serde_derive or false) || - (f.vec_map_0_8_0.eders or false) || - (vec_map_0_8_0.eders or false); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); - features = mkFeatures (features.winapi_0_3_4 or {}); - }; - winapi_0_3_4_features = f: updateFeatures f (rec { - winapi_0_3_4.default = (f.winapi_0_3_4.default or true); - winapi_i686_pc_windows_gnu_0_4_0.default = true; - winapi_x86_64_pc_windows_gnu_0_4_0.default = true; - }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; - winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); - }) []; - winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); - }) []; - wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { - dependencies = mapFeatures features ([ winapi_0_3_4 ]); - }; - wincolor_0_1_6_features = f: updateFeatures f (rec { - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - winapi_0_3_4.wincon = true; - wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); - }) [ winapi_0_3_4_features ]; } diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix new file mode 100644 index 000000000000..9d9cafe4cbf2 --- /dev/null +++ b/pkgs/build-support/rust/crates-io.nix @@ -0,0 +1,2050 @@ +{ lib, buildRustCrate, buildRustCrateHelpers }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + + crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.8"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "04bz5m32ykyn946iwxgbrl8nwca7ssxsqma140hgmkchaay80nfr"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec { + aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true); + memchr."${deps.aho_corasick."0.6.8".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.6.8"."memchr"}" deps) + ]; + + + crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]) else []); + }; + features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec { + ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; } + { "${deps.ansi_term."0.11.0".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]; + + + crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate { + crateName = "argon2rs"; + version = "0.2.5"; + authors = [ "bryant <bryant@defrag.in>" ]; + sha256 = "1byl9b3wwyrarn8qack21v5fi2qsnn3y5clvikk2apskhmnih1rw"; + dependencies = mapFeatures features ([ + (crates."blake2_rfc"."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) + (crates."scoped_threadpool"."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) + ]); + features = mkFeatures (features."argon2rs"."0.2.5" or {}); + }; + features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec { + argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true); + blake2_rfc = fold recursiveUpdate {} [ + { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; } + { "0.2.18".simd_asm = + (f.blake2_rfc."0.2.18".simd_asm or false) || + (argon2rs."0.2.5"."simd" or false) || + (f."argon2rs"."0.2.5"."simd" or false); } + ]; + scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true; + }) [ + (features_.blake2_rfc."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) + (features_.scoped_threadpool."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) + ]; + + + crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.7"; + authors = [ "bluss" ]; + sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; + dependencies = mapFeatures features ([ + (crates."nodrop"."${deps."arrayvec"."0.4.7"."nodrop"}" deps) + ]); + features = mkFeatures (features."arrayvec"."0.4.7" or {}); + }; + features_.arrayvec."0.4.7" = deps: f: updateFeatures f (rec { + arrayvec = fold recursiveUpdate {} [ + { "0.4.7".default = (f.arrayvec."0.4.7".default or true); } + { "0.4.7".serde = + (f.arrayvec."0.4.7".serde or false) || + (f.arrayvec."0.4.7".serde-1 or false) || + (arrayvec."0.4.7"."serde-1" or false); } + { "0.4.7".std = + (f.arrayvec."0.4.7".std or false) || + (f.arrayvec."0.4.7".default or false) || + (arrayvec."0.4.7"."default" or false); } + ]; + nodrop."${deps.arrayvec."0.4.7".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.7".nodrop}".default or false); + }) [ + (features_.nodrop."${deps."arrayvec"."0.4.7"."nodrop"}" deps) + ]; + + + crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate { + crateName = "atty"; + version = "0.2.11"; + authors = [ "softprops <d.tangren@gmail.com>" ]; + sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."termion"."${deps."atty"."0.2.11"."termion"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."atty"."0.2.11"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps) + ]) else []); + }; + features_.atty."0.2.11" = deps: f: updateFeatures f (rec { + atty."0.2.11".default = (f.atty."0.2.11".default or true); + libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false); + termion."${deps.atty."0.2.11".termion}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.atty."0.2.11".winapi}"."consoleapi" = true; } + { "${deps.atty."0.2.11".winapi}"."minwinbase" = true; } + { "${deps.atty."0.2.11".winapi}"."minwindef" = true; } + { "${deps.atty."0.2.11".winapi}"."processenv" = true; } + { "${deps.atty."0.2.11".winapi}"."winbase" = true; } + { "${deps.atty."0.2.11".winapi}".default = true; } + ]; + }) [ + (features_.termion."${deps."atty"."0.2.11"."termion"}" deps) + (features_.libc."${deps."atty"."0.2.11"."libc"}" deps) + (features_.winapi."${deps."atty"."0.2.11"."winapi"}" deps) + ]; + + + crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.9"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ]; + sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."backtrace"."0.3.9"."cfg_if"}" deps) + (crates."rustc_demangle"."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."0.1.24" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."0.3.6" deps) ] else [])) else []); + features = mkFeatures (features."backtrace"."0.3.9" or {}); + }; + features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec { + backtrace = fold recursiveUpdate {} [ + { "0.3.9".addr2line = + (f.backtrace."0.3.9".addr2line or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".backtrace-sys = + (f.backtrace."0.3.9".backtrace-sys or false) || + (f.backtrace."0.3.9".libbacktrace or false) || + (backtrace."0.3.9"."libbacktrace" or false); } + { "0.3.9".coresymbolication = + (f.backtrace."0.3.9".coresymbolication or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".dbghelp = + (f.backtrace."0.3.9".dbghelp or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".default = (f.backtrace."0.3.9".default or true); } + { "0.3.9".dladdr = + (f.backtrace."0.3.9".dladdr or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".findshlibs = + (f.backtrace."0.3.9".findshlibs or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".gimli = + (f.backtrace."0.3.9".gimli or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".libbacktrace = + (f.backtrace."0.3.9".libbacktrace or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".libunwind = + (f.backtrace."0.3.9".libunwind or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".memmap = + (f.backtrace."0.3.9".memmap or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".object = + (f.backtrace."0.3.9".object or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".rustc-serialize = + (f.backtrace."0.3.9".rustc-serialize or false) || + (f.backtrace."0.3.9".serialize-rustc or false) || + (backtrace."0.3.9"."serialize-rustc" or false); } + { "0.3.9".serde = + (f.backtrace."0.3.9".serde or false) || + (f.backtrace."0.3.9".serialize-serde or false) || + (backtrace."0.3.9"."serialize-serde" or false); } + { "0.3.9".serde_derive = + (f.backtrace."0.3.9".serde_derive or false) || + (f.backtrace."0.3.9".serialize-serde or false) || + (backtrace."0.3.9"."serialize-serde" or false); } + { "0.3.9".winapi = + (f.backtrace."0.3.9".winapi or false) || + (f.backtrace."0.3.9".dbghelp or false) || + (backtrace."0.3.9"."dbghelp" or false); } + ]; + backtrace_sys."${deps.backtrace."0.3.9".backtrace_sys}".default = true; + cfg_if."${deps.backtrace."0.3.9".cfg_if}".default = true; + libc."${deps.backtrace."0.3.9".libc}".default = true; + rustc_demangle."${deps.backtrace."0.3.9".rustc_demangle}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.backtrace."0.3.9".winapi}"."dbghelp" = true; } + { "${deps.backtrace."0.3.9".winapi}"."minwindef" = true; } + { "${deps.backtrace."0.3.9".winapi}"."processthreadsapi" = true; } + { "${deps.backtrace."0.3.9".winapi}"."std" = true; } + { "${deps.backtrace."0.3.9".winapi}"."winnt" = true; } + { "${deps.backtrace."0.3.9".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."backtrace"."0.3.9"."cfg_if"}" deps) + (features_.rustc_demangle."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) + (features_.backtrace_sys."${deps."backtrace"."0.3.9"."backtrace_sys"}" deps) + (features_.libc."${deps."backtrace"."0.3.9"."libc"}" deps) + (features_.winapi."${deps."backtrace"."0.3.9"."winapi"}" deps) + ]; + + + crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.24"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "15d6jlknykiijcin3vqbx33760w24ss5qw3l1xd3hms5k4vc8305"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."backtrace_sys"."0.1.24"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps) + ]); + }; + features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec { + backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true); + cc."${deps.backtrace_sys."0.1.24".cc}".default = true; + libc."${deps.backtrace_sys."0.1.24".libc}".default = true; + }) [ + (features_.libc."${deps."backtrace_sys"."0.1.24"."libc"}" deps) + (features_.cc."${deps."backtrace_sys"."0.1.24"."cc"}" deps) + ]; + + + crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.4"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; + features = mkFeatures (features."bitflags"."1.0.4" or {}); + }; + features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); + }) []; + + + crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate { + crateName = "blake2-rfc"; + version = "0.2.18"; + authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ]; + sha256 = "0pyqrik4471ljk16prs0iwb2sam39z0z6axyyjxlqxdmf4wprf0l"; + dependencies = mapFeatures features ([ + (crates."arrayvec"."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) + (crates."constant_time_eq"."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) + ]); + features = mkFeatures (features."blake2_rfc"."0.2.18" or {}); + }; + features_.blake2_rfc."0.2.18" = deps: f: updateFeatures f (rec { + arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default = (f.arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default or false); + blake2_rfc = fold recursiveUpdate {} [ + { "0.2.18".default = (f.blake2_rfc."0.2.18".default or true); } + { "0.2.18".simd = + (f.blake2_rfc."0.2.18".simd or false) || + (f.blake2_rfc."0.2.18".simd_opt or false) || + (blake2_rfc."0.2.18"."simd_opt" or false); } + { "0.2.18".simd_opt = + (f.blake2_rfc."0.2.18".simd_opt or false) || + (f.blake2_rfc."0.2.18".simd_asm or false) || + (blake2_rfc."0.2.18"."simd_asm" or false); } + { "0.2.18".std = + (f.blake2_rfc."0.2.18".std or false) || + (f.blake2_rfc."0.2.18".default or false) || + (blake2_rfc."0.2.18"."default" or false); } + ]; + constant_time_eq."${deps.blake2_rfc."0.2.18".constant_time_eq}".default = true; + }) [ + (features_.arrayvec."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) + (features_.constant_time_eq."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) + ]; + + + crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.8.11"; + authors = [ "pe@pijul.org <pe@pijul.org>" ]; + sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.8.11"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.8.11"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.8.11"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.8.11"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.8.11"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.8.11"."log"}" deps) + (crates."nom"."${deps."carnix"."0.8.11"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.8.11"."regex"}" deps) + (crates."rusqlite"."${deps."carnix"."0.8.11"."rusqlite"}" deps) + (crates."serde"."${deps."carnix"."0.8.11"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.8.11"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.8.11"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.8.11"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.8.11"."toml"}" deps) + ]); + }; + features_.carnix."0.8.11" = deps: f: updateFeatures f (rec { + carnix."0.8.11".default = (f.carnix."0.8.11".default or true); + clap."${deps.carnix."0.8.11".clap}".default = true; + dirs."${deps.carnix."0.8.11".dirs}".default = true; + env_logger."${deps.carnix."0.8.11".env_logger}".default = true; + error_chain."${deps.carnix."0.8.11".error_chain}".default = true; + itertools."${deps.carnix."0.8.11".itertools}".default = true; + log."${deps.carnix."0.8.11".log}".default = true; + nom."${deps.carnix."0.8.11".nom}".default = true; + regex."${deps.carnix."0.8.11".regex}".default = true; + rusqlite."${deps.carnix."0.8.11".rusqlite}".default = true; + serde."${deps.carnix."0.8.11".serde}".default = true; + serde_derive."${deps.carnix."0.8.11".serde_derive}".default = true; + serde_json."${deps.carnix."0.8.11".serde_json}".default = true; + tempdir."${deps.carnix."0.8.11".tempdir}".default = true; + toml."${deps.carnix."0.8.11".toml}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.8.11"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.8.11"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.8.11"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.8.11"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.8.11"."itertools"}" deps) + (features_.log."${deps."carnix"."0.8.11"."log"}" deps) + (features_.nom."${deps."carnix"."0.8.11"."nom"}" deps) + (features_.regex."${deps."carnix"."0.8.11"."regex"}" deps) + (features_.rusqlite."${deps."carnix"."0.8.11"."rusqlite"}" deps) + (features_.serde."${deps."carnix"."0.8.11"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.8.11"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.8.11"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.8.11"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.8.11"."toml"}" deps) + ]; + + + crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.25"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.25" or {}); + }; + features_.cc."1.0.25" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.25".default = (f.cc."1.0.25".default or true); } + { "1.0.25".rayon = + (f.cc."1.0.25".rayon or false) || + (f.cc."1.0.25".parallel or false) || + (cc."1.0.25"."parallel" or false); } + ]; + }) []; + + + crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.6"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; + }; + features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec { + cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); + }) []; + + + crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate { + crateName = "clap"; + version = "2.32.0"; + authors = [ "Kevin K. <kbknapp@gmail.com>" ]; + sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."clap"."2.32.0"."bitflags"}" deps) + (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps) + (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps) + ] + ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."0.2.11" deps) ] else []) + ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."0.7.0" deps) ] else []) + ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."0.8.1" deps) ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ + ] + ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."0.11.0" deps) ] else [])) else []); + features = mkFeatures (features."clap"."2.32.0" or {}); + }; + features_.clap."2.32.0" = deps: f: updateFeatures f (rec { + ansi_term."${deps.clap."2.32.0".ansi_term}".default = true; + atty."${deps.clap."2.32.0".atty}".default = true; + bitflags."${deps.clap."2.32.0".bitflags}".default = true; + clap = fold recursiveUpdate {} [ + { "2.32.0".ansi_term = + (f.clap."2.32.0".ansi_term or false) || + (f.clap."2.32.0".color or false) || + (clap."2.32.0"."color" or false); } + { "2.32.0".atty = + (f.clap."2.32.0".atty or false) || + (f.clap."2.32.0".color or false) || + (clap."2.32.0"."color" or false); } + { "2.32.0".clippy = + (f.clap."2.32.0".clippy or false) || + (f.clap."2.32.0".lints or false) || + (clap."2.32.0"."lints" or false); } + { "2.32.0".color = + (f.clap."2.32.0".color or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".default = (f.clap."2.32.0".default or true); } + { "2.32.0".strsim = + (f.clap."2.32.0".strsim or false) || + (f.clap."2.32.0".suggestions or false) || + (clap."2.32.0"."suggestions" or false); } + { "2.32.0".suggestions = + (f.clap."2.32.0".suggestions or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".term_size = + (f.clap."2.32.0".term_size or false) || + (f.clap."2.32.0".wrap_help or false) || + (clap."2.32.0"."wrap_help" or false); } + { "2.32.0".vec_map = + (f.clap."2.32.0".vec_map or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".yaml = + (f.clap."2.32.0".yaml or false) || + (f.clap."2.32.0".doc or false) || + (clap."2.32.0"."doc" or false); } + { "2.32.0".yaml-rust = + (f.clap."2.32.0".yaml-rust or false) || + (f.clap."2.32.0".yaml or false) || + (clap."2.32.0"."yaml" or false); } + ]; + strsim."${deps.clap."2.32.0".strsim}".default = true; + textwrap = fold recursiveUpdate {} [ + { "${deps.clap."2.32.0".textwrap}".default = true; } + { "0.10.0".term_size = + (f.textwrap."0.10.0".term_size or false) || + (clap."2.32.0"."wrap_help" or false) || + (f."clap"."2.32.0"."wrap_help" or false); } + ]; + unicode_width."${deps.clap."2.32.0".unicode_width}".default = true; + vec_map."${deps.clap."2.32.0".vec_map}".default = true; + }) [ + (features_.atty."${deps."clap"."2.32.0"."atty"}" deps) + (features_.bitflags."${deps."clap"."2.32.0"."bitflags"}" deps) + (features_.strsim."${deps."clap"."2.32.0"."strsim"}" deps) + (features_.textwrap."${deps."clap"."2.32.0"."textwrap"}" deps) + (features_.unicode_width."${deps."clap"."2.32.0"."unicode_width"}" deps) + (features_.vec_map."${deps."clap"."2.32.0"."vec_map"}" deps) + (features_.ansi_term."${deps."clap"."2.32.0"."ansi_term"}" deps) + ]; + + + crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate { + crateName = "constant_time_eq"; + version = "0.1.3"; + authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ]; + sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd"; + }; + features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec { + constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true); + }) []; + + + crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate { + crateName = "dirs"; + version = "1.0.4"; + authors = [ "Simon Ochsenreither <simon@ochsenreither.de>" ]; + sha256 = "1hp3nz0350b0gpavb3w5ajqc9l1k59cfrcsr3hcavwlkizdnpv1y"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."redox_users"."${deps."dirs"."1.0.4"."redox_users"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."dirs"."1.0.4"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps) + ]) else []); + }; + features_.dirs."1.0.4" = deps: f: updateFeatures f (rec { + dirs."1.0.4".default = (f.dirs."1.0.4".default or true); + libc."${deps.dirs."1.0.4".libc}".default = true; + redox_users."${deps.dirs."1.0.4".redox_users}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.dirs."1.0.4".winapi}"."knownfolders" = true; } + { "${deps.dirs."1.0.4".winapi}"."objbase" = true; } + { "${deps.dirs."1.0.4".winapi}"."shlobj" = true; } + { "${deps.dirs."1.0.4".winapi}"."winbase" = true; } + { "${deps.dirs."1.0.4".winapi}"."winerror" = true; } + { "${deps.dirs."1.0.4".winapi}".default = true; } + ]; + }) [ + (features_.redox_users."${deps."dirs"."1.0.4"."redox_users"}" deps) + (features_.libc."${deps."dirs"."1.0.4"."libc"}" deps) + (features_.winapi."${deps."dirs"."1.0.4"."winapi"}" deps) + ]; + + + crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate { + crateName = "either"; + version = "1.5.0"; + authors = [ "bluss" ]; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."either"."1.5.0" or {}); + }; + features_.either."1.5.0" = deps: f: updateFeatures f (rec { + either = fold recursiveUpdate {} [ + { "1.5.0".default = (f.either."1.5.0".default or true); } + { "1.5.0".use_std = + (f.either."1.5.0".use_std or false) || + (f.either."1.5.0".default or false) || + (either."1.5.0"."default" or false); } + ]; + }) []; + + + crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate { + crateName = "env_logger"; + version = "0.5.13"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1q6vylngcz4bn088b4hvsl879l8yz1k2bma75waljb5p4h4kbb72"; + dependencies = mapFeatures features ([ + (crates."atty"."${deps."env_logger"."0.5.13"."atty"}" deps) + (crates."humantime"."${deps."env_logger"."0.5.13"."humantime"}" deps) + (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps) + (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps) + ] + ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."1.0.5" deps) ] else [])); + features = mkFeatures (features."env_logger"."0.5.13" or {}); + }; + features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec { + atty."${deps.env_logger."0.5.13".atty}".default = true; + env_logger = fold recursiveUpdate {} [ + { "0.5.13".default = (f.env_logger."0.5.13".default or true); } + { "0.5.13".regex = + (f.env_logger."0.5.13".regex or false) || + (f.env_logger."0.5.13".default or false) || + (env_logger."0.5.13"."default" or false); } + ]; + humantime."${deps.env_logger."0.5.13".humantime}".default = true; + log = fold recursiveUpdate {} [ + { "${deps.env_logger."0.5.13".log}"."std" = true; } + { "${deps.env_logger."0.5.13".log}".default = true; } + ]; + regex."${deps.env_logger."0.5.13".regex}".default = true; + termcolor."${deps.env_logger."0.5.13".termcolor}".default = true; + }) [ + (features_.atty."${deps."env_logger"."0.5.13"."atty"}" deps) + (features_.humantime."${deps."env_logger"."0.5.13"."humantime"}" deps) + (features_.log."${deps."env_logger"."0.5.13"."log"}" deps) + (features_.regex."${deps."env_logger"."0.5.13"."regex"}" deps) + (features_.termcolor."${deps."env_logger"."0.5.13"."termcolor"}" deps) + ]; + + + crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate { + crateName = "error-chain"; + version = "0.12.0"; + authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ]; + sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl"; + dependencies = mapFeatures features ([ + ] + ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else [])); + features = mkFeatures (features."error_chain"."0.12.0" or {}); + }; + features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec { + backtrace."${deps.error_chain."0.12.0".backtrace}".default = true; + error_chain = fold recursiveUpdate {} [ + { "0.12.0".backtrace = + (f.error_chain."0.12.0".backtrace or false) || + (f.error_chain."0.12.0".default or false) || + (error_chain."0.12.0"."default" or false); } + { "0.12.0".default = (f.error_chain."0.12.0".default or true); } + { "0.12.0".example_generated = + (f.error_chain."0.12.0".example_generated or false) || + (f.error_chain."0.12.0".default or false) || + (error_chain."0.12.0"."default" or false); } + ]; + }) [ + (features_.backtrace."${deps."error_chain"."0.12.0"."backtrace"}" deps) + ]; + + + crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate { + crateName = "failure"; + version = "0.1.3"; + authors = [ "Without Boats <boats@mozilla.com>" ]; + sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s"; + dependencies = mapFeatures features ([ + ] + ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []) + ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."0.1.3" deps) ] else [])); + features = mkFeatures (features."failure"."0.1.3" or {}); + }; + features_.failure."0.1.3" = deps: f: updateFeatures f (rec { + backtrace."${deps.failure."0.1.3".backtrace}".default = true; + failure = fold recursiveUpdate {} [ + { "0.1.3".backtrace = + (f.failure."0.1.3".backtrace or false) || + (f.failure."0.1.3".std or false) || + (failure."0.1.3"."std" or false); } + { "0.1.3".default = (f.failure."0.1.3".default or true); } + { "0.1.3".derive = + (f.failure."0.1.3".derive or false) || + (f.failure."0.1.3".default or false) || + (failure."0.1.3"."default" or false); } + { "0.1.3".failure_derive = + (f.failure."0.1.3".failure_derive or false) || + (f.failure."0.1.3".derive or false) || + (failure."0.1.3"."derive" or false); } + { "0.1.3".std = + (f.failure."0.1.3".std or false) || + (f.failure."0.1.3".default or false) || + (failure."0.1.3"."default" or false); } + ]; + failure_derive."${deps.failure."0.1.3".failure_derive}".default = true; + }) [ + (features_.backtrace."${deps."failure"."0.1.3"."backtrace"}" deps) + (features_.failure_derive."${deps."failure"."0.1.3"."failure_derive"}" deps) + ]; + + + crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.3"; + authors = [ "Without Boats <woboats@gmail.com>" ]; + sha256 = "1mh7ad2d17f13g0k29bskp0f9faws0w1q4a5yfzlzi75bw9kidgm"; + procMacro = true; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) + (crates."quote"."${deps."failure_derive"."0.1.3"."quote"}" deps) + (crates."syn"."${deps."failure_derive"."0.1.3"."syn"}" deps) + (crates."synstructure"."${deps."failure_derive"."0.1.3"."synstructure"}" deps) + ]); + features = mkFeatures (features."failure_derive"."0.1.3" or {}); + }; + features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec { + failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true); + proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true; + quote."${deps.failure_derive."0.1.3".quote}".default = true; + syn."${deps.failure_derive."0.1.3".syn}".default = true; + synstructure."${deps.failure_derive."0.1.3".synstructure}".default = true; + }) [ + (features_.proc_macro2."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) + (features_.quote."${deps."failure_derive"."0.1.3"."quote"}" deps) + (features_.syn."${deps."failure_derive"."0.1.3"."syn"}" deps) + (features_.synstructure."${deps."failure_derive"."0.1.3"."synstructure"}" deps) + ]; + + + crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]); + }; + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; + fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); + fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; + }) [ + (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]; + + + crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + }; + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); + }) []; + + + crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate { + crateName = "humantime"; + version = "1.1.1"; + authors = [ "Paul Colomiets <paul@colomiets.name>" ]; + sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps) + ]); + }; + features_.humantime."1.1.1" = deps: f: updateFeatures f (rec { + humantime."1.1.1".default = (f.humantime."1.1.1".default or true); + quick_error."${deps.humantime."1.1.1".quick_error}".default = true; + }) [ + (features_.quick_error."${deps."humantime"."1.1.1"."quick_error"}" deps) + ]; + + + crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate { + crateName = "itertools"; + version = "0.7.8"; + authors = [ "bluss" ]; + sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; + dependencies = mapFeatures features ([ + (crates."either"."${deps."itertools"."0.7.8"."either"}" deps) + ]); + features = mkFeatures (features."itertools"."0.7.8" or {}); + }; + features_.itertools."0.7.8" = deps: f: updateFeatures f (rec { + either."${deps.itertools."0.7.8".either}".default = (f.either."${deps.itertools."0.7.8".either}".default or false); + itertools = fold recursiveUpdate {} [ + { "0.7.8".default = (f.itertools."0.7.8".default or true); } + { "0.7.8".use_std = + (f.itertools."0.7.8".use_std or false) || + (f.itertools."0.7.8".default or false) || + (itertools."0.7.8"."default" or false); } + ]; + }) [ + (features_.either."${deps."itertools"."0.7.8"."either"}" deps) + ]; + + + crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate { + crateName = "itoa"; + version = "0.4.3"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1"; + features = mkFeatures (features."itoa"."0.4.3" or {}); + }; + features_.itoa."0.4.3" = deps: f: updateFeatures f (rec { + itoa = fold recursiveUpdate {} [ + { "0.4.3".default = (f.itoa."0.4.3".default or true); } + { "0.4.3".std = + (f.itoa."0.4.3".std or false) || + (f.itoa."0.4.3".default or false) || + (itoa."0.4.3"."default" or false); } + ]; + }) []; + + + crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.1.0"; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "1da2b6nxfc2l547qgl9kd1pn9sh1af96a6qx6xw8xdnv6hh5fag0"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."lazy_static"."1.1.0"."version_check"}" deps) + ]); + features = mkFeatures (features."lazy_static"."1.1.0" or {}); + }; + features_.lazy_static."1.1.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.1.0".default = (f.lazy_static."1.1.0".default or true); } + { "1.1.0".nightly = + (f.lazy_static."1.1.0".nightly or false) || + (f.lazy_static."1.1.0".spin_no_std or false) || + (lazy_static."1.1.0"."spin_no_std" or false); } + { "1.1.0".spin = + (f.lazy_static."1.1.0".spin or false) || + (f.lazy_static."1.1.0".spin_no_std or false) || + (lazy_static."1.1.0"."spin_no_std" or false); } + ]; + version_check."${deps.lazy_static."1.1.0".version_check}".default = true; + }) [ + (features_.version_check."${deps."lazy_static"."1.1.0"."version_check"}" deps) + ]; + + + crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.43"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0pshydmsq71kl9276zc2928ld50sp524ixcqkcqsgq410dx6c50b"; + features = mkFeatures (features."libc"."0.2.43" or {}); + }; + features_.libc."0.2.43" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.43".default = (f.libc."0.2.43".default or true); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (f.libc."0.2.43".default or false) || + (libc."0.2.43"."default" or false); } + ]; + }) []; + + + crates.libsqlite3_sys."0.9.3" = deps: { features?(features_.libsqlite3_sys."0.9.3" deps {}) }: buildRustCrate { + crateName = "libsqlite3-sys"; + version = "0.9.3"; + authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; + sha256 = "128bv2y342iksv693bffvybr3zzi04vd8p0307zi9wixbdxyp021"; + build = "build.rs"; + dependencies = (if abi == "msvc" then mapFeatures features ([ +]) else []); + + buildDependencies = mapFeatures features ([ + ] + ++ (if features.libsqlite3_sys."0.9.3".pkg-config or false then [ (crates.pkg_config."0.3.14" deps) ] else [])); + features = mkFeatures (features."libsqlite3_sys"."0.9.3" or {}); + }; + features_.libsqlite3_sys."0.9.3" = deps: f: updateFeatures f (rec { + libsqlite3_sys = fold recursiveUpdate {} [ + { "0.9.3".bindgen = + (f.libsqlite3_sys."0.9.3".bindgen or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false); } + { "0.9.3".cc = + (f.libsqlite3_sys."0.9.3".cc or false) || + (f.libsqlite3_sys."0.9.3".bundled or false) || + (libsqlite3_sys."0.9.3"."bundled" or false); } + { "0.9.3".default = (f.libsqlite3_sys."0.9.3".default or true); } + { "0.9.3".min_sqlite_version_3_6_8 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys."0.9.3".default or false) || + (libsqlite3_sys."0.9.3"."default" or false); } + { "0.9.3".pkg-config = + (f.libsqlite3_sys."0.9.3".pkg-config or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); } + { "0.9.3".vcpkg = + (f.libsqlite3_sys."0.9.3".vcpkg or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); } + ]; + pkg_config."${deps.libsqlite3_sys."0.9.3".pkg_config}".default = true; + }) [ + (features_.pkg_config."${deps."libsqlite3_sys"."0.9.3"."pkg_config"}" deps) + ]; + + + crates.linked_hash_map."0.4.2" = deps: { features?(features_.linked_hash_map."0.4.2" deps {}) }: buildRustCrate { + crateName = "linked-hash-map"; + version = "0.4.2"; + authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ]; + sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."linked_hash_map"."0.4.2" or {}); + }; + features_.linked_hash_map."0.4.2" = deps: f: updateFeatures f (rec { + linked_hash_map = fold recursiveUpdate {} [ + { "0.4.2".default = (f.linked_hash_map."0.4.2".default or true); } + { "0.4.2".heapsize = + (f.linked_hash_map."0.4.2".heapsize or false) || + (f.linked_hash_map."0.4.2".heapsize_impl or false) || + (linked_hash_map."0.4.2"."heapsize_impl" or false); } + { "0.4.2".serde = + (f.linked_hash_map."0.4.2".serde or false) || + (f.linked_hash_map."0.4.2".serde_impl or false) || + (linked_hash_map."0.4.2"."serde_impl" or false); } + { "0.4.2".serde_test = + (f.linked_hash_map."0.4.2".serde_test or false) || + (f.linked_hash_map."0.4.2".serde_impl or false) || + (linked_hash_map."0.4.2"."serde_impl" or false); } + ]; + }) []; + + + crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate { + crateName = "log"; + version = "0.4.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hdcj17al94ga90q7jx2y1rmxi68n3akra1awv3hr3s9b9zipgq6"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."log"."0.4.5"."cfg_if"}" deps) + ]); + features = mkFeatures (features."log"."0.4.5" or {}); + }; + features_.log."0.4.5" = deps: f: updateFeatures f (rec { + cfg_if."${deps.log."0.4.5".cfg_if}".default = true; + log."0.4.5".default = (f.log."0.4.5".default or true); + }) [ + (features_.cfg_if."${deps."log"."0.4.5"."cfg_if"}" deps) + ]; + + + crates.lru_cache."0.1.1" = deps: { features?(features_.lru_cache."0.1.1" deps {}) }: buildRustCrate { + crateName = "lru-cache"; + version = "0.1.1"; + authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ]; + sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; + dependencies = mapFeatures features ([ + (crates."linked_hash_map"."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps) + ]); + features = mkFeatures (features."lru_cache"."0.1.1" or {}); + }; + features_.lru_cache."0.1.1" = deps: f: updateFeatures f (rec { + linked_hash_map = fold recursiveUpdate {} [ + { "${deps.lru_cache."0.1.1".linked_hash_map}".default = true; } + { "0.4.2".heapsize_impl = + (f.linked_hash_map."0.4.2".heapsize_impl or false) || + (lru_cache."0.1.1"."heapsize_impl" or false) || + (f."lru_cache"."0.1.1"."heapsize_impl" or false); } + ]; + lru_cache = fold recursiveUpdate {} [ + { "0.1.1".default = (f.lru_cache."0.1.1".default or true); } + { "0.1.1".heapsize = + (f.lru_cache."0.1.1".heapsize or false) || + (f.lru_cache."0.1.1".heapsize_impl or false) || + (lru_cache."0.1.1"."heapsize_impl" or false); } + ]; + }) [ + (features_.linked_hash_map."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps) + ]; + + + crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + dependencies = mapFeatures features ([ + ] + ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" deps) ] else [])); + features = mkFeatures (features."memchr"."1.0.2" or {}); + }; + features_.memchr."1.0.2" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (memchr."1.0.2"."use_std" or false) || + (f."memchr"."1.0.2"."use_std" or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "1.0.2".default = (f.memchr."1.0.2".default or true); } + { "1.0.2".libc = + (f.memchr."1.0.2".libc or false) || + (f.memchr."1.0.2".default or false) || + (memchr."1.0.2"."default" or false) || + (f.memchr."1.0.2".use_std or false) || + (memchr."1.0.2"."use_std" or false); } + { "1.0.2".use_std = + (f.memchr."1.0.2".use_std or false) || + (f.memchr."1.0.2".default or false) || + (memchr."1.0.2"."default" or false); } + ]; + }) [ + (features_.libc."${deps."memchr"."1.0.2"."libc"}" deps) + ]; + + + crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "2.1.0"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "02w1fc5z1ccx8fbzgcr0mpk0xf2i9g4vbx9q5c2g8pjddbaqvjjq"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps) + ] + ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."0.2.43" deps) ] else [])); + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps) + ]); + features = mkFeatures (features."memchr"."2.1.0" or {}); + }; + features_.memchr."2.1.0" = deps: f: updateFeatures f (rec { + cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true; + libc = fold recursiveUpdate {} [ + { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (memchr."2.1.0"."use_std" or false) || + (f."memchr"."2.1.0"."use_std" or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "2.1.0".default = (f.memchr."2.1.0".default or true); } + { "2.1.0".libc = + (f.memchr."2.1.0".libc or false) || + (f.memchr."2.1.0".default or false) || + (memchr."2.1.0"."default" or false) || + (f.memchr."2.1.0".use_std or false) || + (memchr."2.1.0"."use_std" or false); } + { "2.1.0".use_std = + (f.memchr."2.1.0".use_std or false) || + (f.memchr."2.1.0".default or false) || + (memchr."2.1.0"."default" or false); } + ]; + version_check."${deps.memchr."2.1.0".version_check}".default = true; + }) [ + (features_.cfg_if."${deps."memchr"."2.1.0"."cfg_if"}" deps) + (features_.libc."${deps."memchr"."2.1.0"."libc"}" deps) + (features_.version_check."${deps."memchr"."2.1.0"."version_check"}" deps) + ]; + + + crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.12"; + authors = [ "bluss" ]; + sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."nodrop"."0.1.12" or {}); + }; + features_.nodrop."0.1.12" = deps: f: updateFeatures f (rec { + nodrop = fold recursiveUpdate {} [ + { "0.1.12".default = (f.nodrop."0.1.12".default or true); } + { "0.1.12".nodrop-union = + (f.nodrop."0.1.12".nodrop-union or false) || + (f.nodrop."0.1.12".use_union or false) || + (nodrop."0.1.12"."use_union" or false); } + { "0.1.12".std = + (f.nodrop."0.1.12".std or false) || + (f.nodrop."0.1.12".default or false) || + (nodrop."0.1.12"."default" or false); } + ]; + }) []; + + + crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate { + crateName = "nom"; + version = "3.2.1"; + authors = [ "contact@geoffroycouprie.com" ]; + sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."nom"."3.2.1"."memchr"}" deps) + ]); + features = mkFeatures (features."nom"."3.2.1" or {}); + }; + features_.nom."3.2.1" = deps: f: updateFeatures f (rec { + memchr = fold recursiveUpdate {} [ + { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); } + { "1.0.2".use_std = + (f.memchr."1.0.2".use_std or false) || + (nom."3.2.1"."std" or false) || + (f."nom"."3.2.1"."std" or false); } + ]; + nom = fold recursiveUpdate {} [ + { "3.2.1".compiler_error = + (f.nom."3.2.1".compiler_error or false) || + (f.nom."3.2.1".nightly or false) || + (nom."3.2.1"."nightly" or false); } + { "3.2.1".default = (f.nom."3.2.1".default or true); } + { "3.2.1".lazy_static = + (f.nom."3.2.1".lazy_static or false) || + (f.nom."3.2.1".regexp_macros or false) || + (nom."3.2.1"."regexp_macros" or false); } + { "3.2.1".regex = + (f.nom."3.2.1".regex or false) || + (f.nom."3.2.1".regexp or false) || + (nom."3.2.1"."regexp" or false); } + { "3.2.1".regexp = + (f.nom."3.2.1".regexp or false) || + (f.nom."3.2.1".regexp_macros or false) || + (nom."3.2.1"."regexp_macros" or false); } + { "3.2.1".std = + (f.nom."3.2.1".std or false) || + (f.nom."3.2.1".default or false) || + (nom."3.2.1"."default" or false); } + { "3.2.1".stream = + (f.nom."3.2.1".stream or false) || + (f.nom."3.2.1".default or false) || + (nom."3.2.1"."default" or false); } + ]; + }) [ + (features_.memchr."${deps."nom"."3.2.1"."memchr"}" deps) + ]; + + + crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.14"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; + }; + features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec { + pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); + }) []; + + + crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.4.20"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0yr74b00d3wzg21kjvfln7vzzvf9aghbaff4c747i3grbd997ys2"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."proc_macro2"."0.4.20" or {}); + }; + features_.proc_macro2."0.4.20" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "0.4.20".default = (f.proc_macro2."0.4.20".default or true); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (f.proc_macro2."0.4.20".default or false) || + (proc_macro2."0.4.20"."default" or false) || + (f.proc_macro2."0.4.20".nightly or false) || + (proc_macro2."0.4.20"."nightly" or false); } + ]; + unicode_xid."${deps.proc_macro2."0.4.20".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) + ]; + + + crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate { + crateName = "quick-error"; + version = "1.2.2"; + authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ]; + sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5"; + }; + features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec { + quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true); + }) []; + + + crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.6.8"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0dq6j23w6pmc4l6v490arixdwypy0b82z76nrzaingqhqri4p3mh"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."quote"."0.6.8"."proc_macro2"}" deps) + ]); + features = mkFeatures (features."quote"."0.6.8" or {}); + }; + features_.quote."0.6.8" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (quote."0.6.8"."proc-macro" or false) || + (f."quote"."0.6.8"."proc-macro" or false); } + ]; + quote = fold recursiveUpdate {} [ + { "0.6.8".default = (f.quote."0.6.8".default or true); } + { "0.6.8".proc-macro = + (f.quote."0.6.8".proc-macro or false) || + (f.quote."0.6.8".default or false) || + (quote."0.6.8"."default" or false); } + ]; + }) [ + (features_.proc_macro2."${deps."quote"."0.6.8"."proc_macro2"}" deps) + ]; + + + crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f"; + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_zircon"."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."0.2.43" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.4.3" or {}); + }; + features_.rand."0.4.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true; + libc."${deps.rand."0.4.3".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.4.3".default = (f.rand."0.4.3".default or true); } + { "0.4.3".i128_support = + (f.rand."0.4.3".i128_support or false) || + (f.rand."0.4.3".nightly or false) || + (rand."0.4.3"."nightly" or false); } + { "0.4.3".libc = + (f.rand."0.4.3".libc or false) || + (f.rand."0.4.3".std or false) || + (rand."0.4.3"."std" or false); } + { "0.4.3".std = + (f.rand."0.4.3".std or false) || + (f.rand."0.4.3".default or false) || + (rand."0.4.3"."default" or false); } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.4.3".winapi}"."minwindef" = true; } + { "${deps.rand."0.4.3".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.4.3".winapi}"."profileapi" = true; } + { "${deps.rand."0.4.3".winapi}"."winnt" = true; } + { "${deps.rand."0.4.3".winapi}".default = true; } + ]; + }) [ + (features_.fuchsia_zircon."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) + (features_.libc."${deps."rand"."0.4.3"."libc"}" deps) + (features_.winapi."${deps."rand"."0.4.3"."winapi"}" deps) + ]; + + + crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.40"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true); + }) []; + + + crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]); + }; + features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; + redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); + }) [ + (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]; + + + crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate { + crateName = "redox_users"; + version = "0.2.0"; + authors = [ "Jose Narvaez <goyox86@gmail.com>" "Wesley Hershberger <mggmugginsmc@gmail.com>" ]; + sha256 = "0s9jrh378jk8rfi1xfwxvh2r1gv6rn3bq6n7sbajkrqqq0xzijvf"; + dependencies = mapFeatures features ([ + (crates."argon2rs"."${deps."redox_users"."0.2.0"."argon2rs"}" deps) + (crates."failure"."${deps."redox_users"."0.2.0"."failure"}" deps) + (crates."rand"."${deps."redox_users"."0.2.0"."rand"}" deps) + (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) + ]); + }; + features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec { + argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false); + failure."${deps.redox_users."0.2.0".failure}".default = true; + rand."${deps.redox_users."0.2.0".rand}".default = true; + redox_syscall."${deps.redox_users."0.2.0".redox_syscall}".default = true; + redox_users."0.2.0".default = (f.redox_users."0.2.0".default or true); + }) [ + (features_.argon2rs."${deps."redox_users"."0.2.0"."argon2rs"}" deps) + (features_.failure."${deps."redox_users"."0.2.0"."failure"}" deps) + (features_.rand."${deps."redox_users"."0.2.0"."rand"}" deps) + (features_.redox_syscall."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) + ]; + + + crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "1.0.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1nb4dva9lhb3v76bdds9qcxldb2xy998sdraqnqaqdr6axfsfp02"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."1.0.5"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."1.0.5"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."1.0.5"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."1.0.5"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."1.0.5"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."1.0.5" or {}); + }; + features_.regex."1.0.5" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."1.0.5".aho_corasick}".default = true; + memchr."${deps.regex."1.0.5".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "1.0.5".default = (f.regex."1.0.5".default or true); } + { "1.0.5".pattern = + (f.regex."1.0.5".pattern or false) || + (f.regex."1.0.5".unstable or false) || + (regex."1.0.5"."unstable" or false); } + { "1.0.5".use_std = + (f.regex."1.0.5".use_std or false) || + (f.regex."1.0.5".default or false) || + (regex."1.0.5"."default" or false); } + ]; + regex_syntax."${deps.regex."1.0.5".regex_syntax}".default = true; + thread_local."${deps.regex."1.0.5".thread_local}".default = true; + utf8_ranges."${deps.regex."1.0.5".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."1.0.5"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."1.0.5"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."1.0.5"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."1.0.5"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."1.0.5"."utf8_ranges"}" deps) + ]; + + + crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec { + regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true); + ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) + ]; + + + crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.1"; + authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; + sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]) else []); + }; + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]; + + + crates.rusqlite."0.14.0" = deps: { features?(features_.rusqlite."0.14.0" deps {}) }: buildRustCrate { + crateName = "rusqlite"; + version = "0.14.0"; + authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; + sha256 = "06j1z8yicn6jg8irxclsvgp0575gz5k24jgnbk0d807i5gvsg9jq"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."rusqlite"."0.14.0"."bitflags"}" deps) + (crates."libsqlite3_sys"."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps) + (crates."lru_cache"."${deps."rusqlite"."0.14.0"."lru_cache"}" deps) + (crates."time"."${deps."rusqlite"."0.14.0"."time"}" deps) + ]); + features = mkFeatures (features."rusqlite"."0.14.0" or {}); + }; + features_.rusqlite."0.14.0" = deps: f: updateFeatures f (rec { + bitflags."${deps.rusqlite."0.14.0".bitflags}".default = true; + libsqlite3_sys = fold recursiveUpdate {} [ + { "${deps.rusqlite."0.14.0".libsqlite3_sys}".default = true; } + { "0.9.3".buildtime_bindgen = + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (rusqlite."0.14.0"."buildtime_bindgen" or false) || + (f."rusqlite"."0.14.0"."buildtime_bindgen" or false); } + { "0.9.3".bundled = + (f.libsqlite3_sys."0.9.3".bundled or false) || + (rusqlite."0.14.0"."bundled" or false) || + (f."rusqlite"."0.14.0"."bundled" or false); } + { "0.9.3".min_sqlite_version_3_6_11 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (rusqlite."0.14.0"."backup" or false) || + (f."rusqlite"."0.14.0"."backup" or false); } + { "0.9.3".min_sqlite_version_3_6_23 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (rusqlite."0.14.0"."trace" or false) || + (f."rusqlite"."0.14.0"."trace" or false); } + { "0.9.3".min_sqlite_version_3_7_3 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (rusqlite."0.14.0"."functions" or false) || + (f."rusqlite"."0.14.0"."functions" or false); } + { "0.9.3".min_sqlite_version_3_7_4 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (rusqlite."0.14.0"."blob" or false) || + (f."rusqlite"."0.14.0"."blob" or false); } + { "0.9.3".min_sqlite_version_3_7_7 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (rusqlite."0.14.0"."vtab" or false) || + (f."rusqlite"."0.14.0"."vtab" or false); } + { "0.9.3".sqlcipher = + (f.libsqlite3_sys."0.9.3".sqlcipher or false) || + (rusqlite."0.14.0"."sqlcipher" or false) || + (f."rusqlite"."0.14.0"."sqlcipher" or false); } + { "0.9.3".unlock_notify = + (f.libsqlite3_sys."0.9.3".unlock_notify or false) || + (rusqlite."0.14.0"."unlock_notify" or false) || + (f."rusqlite"."0.14.0"."unlock_notify" or false); } + ]; + lru_cache."${deps.rusqlite."0.14.0".lru_cache}".default = true; + rusqlite = fold recursiveUpdate {} [ + { "0.14.0".bundled = + (f.rusqlite."0.14.0".bundled or false) || + (f.rusqlite."0.14.0".array or false) || + (rusqlite."0.14.0"."array" or false); } + { "0.14.0".csv = + (f.rusqlite."0.14.0".csv or false) || + (f.rusqlite."0.14.0".csvtab or false) || + (rusqlite."0.14.0"."csvtab" or false); } + { "0.14.0".default = (f.rusqlite."0.14.0".default or true); } + { "0.14.0".lazy_static = + (f.rusqlite."0.14.0".lazy_static or false) || + (f.rusqlite."0.14.0".vtab or false) || + (rusqlite."0.14.0"."vtab" or false); } + { "0.14.0".vtab = + (f.rusqlite."0.14.0".vtab or false) || + (f.rusqlite."0.14.0".array or false) || + (rusqlite."0.14.0"."array" or false) || + (f.rusqlite."0.14.0".csvtab or false) || + (rusqlite."0.14.0"."csvtab" or false); } + ]; + time."${deps.rusqlite."0.14.0".time}".default = true; + }) [ + (features_.bitflags."${deps."rusqlite"."0.14.0"."bitflags"}" deps) + (features_.libsqlite3_sys."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps) + (features_.lru_cache."${deps."rusqlite"."0.14.0"."lru_cache"}" deps) + (features_.time."${deps."rusqlite"."0.14.0"."time"}" deps) + ]; + + + crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.9"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; + }; + features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec { + rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true); + }) []; + + + crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate { + crateName = "ryu"; + version = "0.2.6"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1vdh6z4aysc9kiiqhl7vxkqz3fykcnp24kgfizshlwfsz2j0p9dr"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."ryu"."0.2.6" or {}); + }; + features_.ryu."0.2.6" = deps: f: updateFeatures f (rec { + ryu."0.2.6".default = (f.ryu."0.2.6".default or true); + }) []; + + + crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.9"; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v"; + features = mkFeatures (features."scoped_threadpool"."0.1.9" or {}); + }; + features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true); + }) []; + + + crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate { + crateName = "serde"; + version = "1.0.80"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0vyciw2qhrws4hz87pfnsjdfzzdw2sclxqxq394g3a219a2rdcxz"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."serde"."1.0.80" or {}); + }; + features_.serde."1.0.80" = deps: f: updateFeatures f (rec { + serde = fold recursiveUpdate {} [ + { "1.0.80".default = (f.serde."1.0.80".default or true); } + { "1.0.80".serde_derive = + (f.serde."1.0.80".serde_derive or false) || + (f.serde."1.0.80".derive or false) || + (serde."1.0.80"."derive" or false); } + { "1.0.80".std = + (f.serde."1.0.80".std or false) || + (f.serde."1.0.80".default or false) || + (serde."1.0.80"."default" or false); } + { "1.0.80".unstable = + (f.serde."1.0.80".unstable or false) || + (f.serde."1.0.80".alloc or false) || + (serde."1.0.80"."alloc" or false); } + ]; + }) []; + + + crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.80"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1akvzhbnnqhd92lfj7vp43scs1vdml7x27c82l5yh0kz7xf7jaky"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) + (crates."quote"."${deps."serde_derive"."1.0.80"."quote"}" deps) + (crates."syn"."${deps."serde_derive"."1.0.80"."syn"}" deps) + ]); + features = mkFeatures (features."serde_derive"."1.0.80" or {}); + }; + features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true; + quote."${deps.serde_derive."1.0.80".quote}".default = true; + serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true); + syn = fold recursiveUpdate {} [ + { "${deps.serde_derive."1.0.80".syn}"."visit" = true; } + { "${deps.serde_derive."1.0.80".syn}".default = true; } + ]; + }) [ + (features_.proc_macro2."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) + (features_.quote."${deps."serde_derive"."1.0.80"."quote"}" deps) + (features_.syn."${deps."serde_derive"."1.0.80"."syn"}" deps) + ]; + + + crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.32"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1dqkvizi02j1bs5c21kw20idf4aa5399g29ndwl6vkmmrqkr1gr0"; + dependencies = mapFeatures features ([ + (crates."itoa"."${deps."serde_json"."1.0.32"."itoa"}" deps) + (crates."ryu"."${deps."serde_json"."1.0.32"."ryu"}" deps) + (crates."serde"."${deps."serde_json"."1.0.32"."serde"}" deps) + ]); + features = mkFeatures (features."serde_json"."1.0.32" or {}); + }; + features_.serde_json."1.0.32" = deps: f: updateFeatures f (rec { + itoa."${deps.serde_json."1.0.32".itoa}".default = true; + ryu."${deps.serde_json."1.0.32".ryu}".default = true; + serde."${deps.serde_json."1.0.32".serde}".default = true; + serde_json = fold recursiveUpdate {} [ + { "1.0.32".default = (f.serde_json."1.0.32".default or true); } + { "1.0.32".indexmap = + (f.serde_json."1.0.32".indexmap or false) || + (f.serde_json."1.0.32".preserve_order or false) || + (serde_json."1.0.32"."preserve_order" or false); } + ]; + }) [ + (features_.itoa."${deps."serde_json"."1.0.32"."itoa"}" deps) + (features_.ryu."${deps."serde_json"."1.0.32"."ryu"}" deps) + (features_.serde."${deps."serde_json"."1.0.32"."serde"}" deps) + ]; + + + crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + }; + features_.strsim."0.7.0" = deps: f: updateFeatures f (rec { + strsim."0.7.0".default = (f.strsim."0.7.0".default or true); + }) []; + + + crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.15.13"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1zvnppl08f2njpkl3m10h221sdl4vsm7v6vyq63dxk16nn37b1bh"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps) + (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps) + ] + ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."0.6.8" deps) ] else [])); + features = mkFeatures (features."syn"."0.15.13" or {}); + }; + features_.syn."0.15.13" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (syn."0.15.13"."proc-macro" or false) || + (f."syn"."0.15.13"."proc-macro" or false); } + ]; + quote = fold recursiveUpdate {} [ + { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); } + { "0.6.8".proc-macro = + (f.quote."0.6.8".proc-macro or false) || + (syn."0.15.13"."proc-macro" or false) || + (f."syn"."0.15.13"."proc-macro" or false); } + ]; + syn = fold recursiveUpdate {} [ + { "0.15.13".clone-impls = + (f.syn."0.15.13".clone-impls or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".default = (f.syn."0.15.13".default or true); } + { "0.15.13".derive = + (f.syn."0.15.13".derive or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".parsing = + (f.syn."0.15.13".parsing or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".printing = + (f.syn."0.15.13".printing or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".proc-macro = + (f.syn."0.15.13".proc-macro or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".quote = + (f.syn."0.15.13".quote or false) || + (f.syn."0.15.13".printing or false) || + (syn."0.15.13"."printing" or false); } + ]; + unicode_xid."${deps.syn."0.15.13".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."syn"."0.15.13"."proc_macro2"}" deps) + (features_.quote."${deps."syn"."0.15.13"."quote"}" deps) + (features_.unicode_xid."${deps."syn"."0.15.13"."unicode_xid"}" deps) + ]; + + + crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate { + crateName = "synstructure"; + version = "0.10.0"; + authors = [ "Nika Layzell <nika@thelayzells.com>" ]; + sha256 = "1alb4hsbm5qf4jy7nmdkqrh3jagqk1xj88w0pmz67f16dvgpf0qf"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) + (crates."quote"."${deps."synstructure"."0.10.0"."quote"}" deps) + (crates."syn"."${deps."synstructure"."0.10.0"."syn"}" deps) + (crates."unicode_xid"."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."synstructure"."0.10.0" or {}); + }; + features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true; + quote."${deps.synstructure."0.10.0".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "${deps.synstructure."0.10.0".syn}"."extra-traits" = true; } + { "${deps.synstructure."0.10.0".syn}"."visit" = true; } + { "${deps.synstructure."0.10.0".syn}".default = true; } + ]; + synstructure."0.10.0".default = (f.synstructure."0.10.0".default or true); + unicode_xid."${deps.synstructure."0.10.0".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) + (features_.quote."${deps."synstructure"."0.10.0"."quote"}" deps) + (features_.syn."${deps."synstructure"."0.10.0"."syn"}" deps) + (features_.unicode_xid."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) + ]; + + + crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; + dependencies = mapFeatures features ([ + (crates."rand"."${deps."tempdir"."0.3.7"."rand"}" deps) + (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) + ]); + }; + features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec { + rand."${deps.tempdir."0.3.7".rand}".default = true; + remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true; + tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true); + }) [ + (features_.rand."${deps."tempdir"."0.3.7"."rand"}" deps) + (features_.remove_dir_all."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) + ]; + + + crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate { + crateName = "termcolor"; + version = "1.0.4"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "0xydrjc0bxg08llcbcmkka29szdrfklk4vh6l6mdd67ajifqw1mv"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps) + ]) else []); + }; + features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec { + termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true); + wincolor."${deps.termcolor."1.0.4".wincolor}".default = true; + }) [ + (features_.wincolor."${deps."termcolor"."1.0.4"."wincolor"}" deps) + ]; + + + crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + dependencies = (if !(kernel == "redox") then mapFeatures features ([ + (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]) else []); + }; + features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + libc."${deps.termion."1.5.1".libc}".default = true; + redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; + redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; + termion."1.5.1".default = (f.termion."1.5.1".default or true); + }) [ + (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) + (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]; + + + crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate { + crateName = "textwrap"; + version = "0.10.0"; + authors = [ "Martin Geisler <martin@geisler.net>" ]; + sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas"; + dependencies = mapFeatures features ([ + (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps) + ]); + }; + features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec { + textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true); + unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true; + }) [ + (features_.unicode_width."${deps."textwrap"."0.10.0"."unicode_width"}" deps) + ]; + + + crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.6"; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps) + ]); + }; + features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec { + lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true; + thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true); + }) [ + (features_.lazy_static."${deps."thread_local"."0.3.6"."lazy_static"}" deps) + ]; + + + crates.time."0.1.40" = deps: { features?(features_.time."0.1.40" deps {}) }: buildRustCrate { + crateName = "time"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."time"."0.1.40"."libc"}" deps) + ]) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."time"."0.1.40"."redox_syscall"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."time"."0.1.40"."winapi"}" deps) + ]) else []); + }; + features_.time."0.1.40" = deps: f: updateFeatures f (rec { + libc."${deps.time."0.1.40".libc}".default = true; + redox_syscall."${deps.time."0.1.40".redox_syscall}".default = true; + time."0.1.40".default = (f.time."0.1.40".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.time."0.1.40".winapi}"."minwinbase" = true; } + { "${deps.time."0.1.40".winapi}"."minwindef" = true; } + { "${deps.time."0.1.40".winapi}"."ntdef" = true; } + { "${deps.time."0.1.40".winapi}"."profileapi" = true; } + { "${deps.time."0.1.40".winapi}"."std" = true; } + { "${deps.time."0.1.40".winapi}"."sysinfoapi" = true; } + { "${deps.time."0.1.40".winapi}"."timezoneapi" = true; } + { "${deps.time."0.1.40".winapi}".default = true; } + ]; + }) [ + (features_.libc."${deps."time"."0.1.40"."libc"}" deps) + (features_.redox_syscall."${deps."time"."0.1.40"."redox_syscall"}" deps) + (features_.winapi."${deps."time"."0.1.40"."winapi"}" deps) + ]; + + + crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate { + crateName = "toml"; + version = "0.4.8"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1xm3chgsvi3qqi7vj8sb5xvnbfpkqyl4fiwh7y2cl6r4brwlmif1"; + dependencies = mapFeatures features ([ + (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps) + ]); + }; + features_.toml."0.4.8" = deps: f: updateFeatures f (rec { + serde."${deps.toml."0.4.8".serde}".default = true; + toml."0.4.8".default = (f.toml."0.4.8".default or true); + }) [ + (features_.serde."${deps."toml"."0.4.8"."serde"}" deps) + ]; + + + crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; + }; + features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec { + ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); + }) []; + + + crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.5"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; + features = mkFeatures (features."unicode_width"."0.1.5" or {}); + }; + features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec { + unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); + }) []; + + + crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.1.0"; + authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; + sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; + features = mkFeatures (features."unicode_xid"."0.1.0" or {}); + }; + features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec { + unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true); + }) []; + + + crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp"; + }; + features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec { + utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true); + }) []; + + + crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.6"; + authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; + sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x"; + }; + features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec { + vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true); + }) []; + + + crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.1"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; + sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."vec_map"."0.8.1" or {}); + }; + features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec { + vec_map = fold recursiveUpdate {} [ + { "0.8.1".default = (f.vec_map."0.8.1".default or true); } + { "0.8.1".serde = + (f.vec_map."0.8.1".serde or false) || + (f.vec_map."0.8.1".eders or false) || + (vec_map."0.8.1"."eders" or false); } + ]; + }) []; + + + crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate { + crateName = "version_check"; + version = "0.1.5"; + authors = [ "Sergio Benitez <sb@sergio.bz>" ]; + sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd"; + }; + features_.version_check."0.1.5" = deps: f: updateFeatures f (rec { + version_check."0.1.5".default = (f.version_check."0.1.5".default or true); + }) []; + + + crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.3.6"; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4"; + build = "build.rs"; + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]) else []); + features = mkFeatures (features."winapi"."0.3.6" or {}); + }; + features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + winapi."0.3.6".default = (f.winapi."0.3.6".default or true); + winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; + winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; + }) [ + (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]; + + + crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + }; + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); + }) []; + + + crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "winapi-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "10madanla73aagbklx6y73r2g2vwq9w8a0qcghbbbpn9vfr6a95f"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps) + ]) else []); + }; + features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."fileapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."minwindef" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."processenv" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."std" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."winbase" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."wincon" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."winerror" = true; } + { "${deps.winapi_util."0.1.1".winapi}".default = true; } + ]; + winapi_util."0.1.1".default = (f.winapi_util."0.1.1".default or true); + }) [ + (features_.winapi."${deps."winapi_util"."0.1.1"."winapi"}" deps) + ]; + + + crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + }; + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); + }) []; + + + crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate { + crateName = "wincolor"; + version = "1.0.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "0gr7v4krmjba7yq16071rfacz42qbapas7mxk5nphjwb042a8gvz"; + dependencies = mapFeatures features ([ + (crates."winapi"."${deps."wincolor"."1.0.1"."winapi"}" deps) + (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps) + ]); + }; + features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; } + { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; } + { "${deps.wincolor."1.0.1".winapi}".default = true; } + ]; + winapi_util."${deps.wincolor."1.0.1".winapi_util}".default = true; + wincolor."1.0.1".default = (f.wincolor."1.0.1".default or true); + }) [ + (features_.winapi."${deps."wincolor"."1.0.1"."winapi"}" deps) + (features_.winapi_util."${deps."wincolor"."1.0.1"."winapi_util"}" deps) + ]; + + +} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d93e0a5f56df..da3f0a59eb60 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -6,76 +6,97 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; in { + cairo-rs = attrs: { + buildInputs = [ cairo ]; + }; + cargo = attrs: { buildInputs = [ openssl zlib curl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; # TODO: buildRustCrate seems to use incorrect default inference crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ]; }; + cargo-vendor = attrs: { buildInputs = [ openssl zlib curl ]; # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to # be considered a cargo subcommand. crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; }; + curl-sys = attrs: { buildInputs = [ pkgconfig zlib curl ]; propagatedBuildInputs = [ curl zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; + + dbus = attrs: { + buildInputs = [ pkgconfig dbus ]; + }; + + gobject-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + + gio-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + + gdk-pixbuf-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + + gdk-pixbuf = attrs: { + buildInputs = [ gdk_pixbuf ]; + }; + libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; buildInputs = [ pkgconfig openssl zlib libgit2 ]; }; + libsqlite3-sys = attrs: { buildInputs = [ pkgconfig sqlite ]; }; + libssh2-sys = attrs: { buildInputs = [ pkgconfig openssl zlib libssh2 ]; }; + + libdbus-sys = attrs: { + buildInputs = [ pkgconfig dbus ]; + }; + openssl = attrs: { buildInputs = [ openssl ]; }; + openssl-sys = attrs: { buildInputs = [ pkgconfig openssl ]; }; - dbus = attrs: { - buildInputs = [ pkgconfig dbus ]; - }; - libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus ]; - }; - gobject-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - gio-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - gdk-pixbuf-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - gdk-pixbuf = attrs: { - buildInputs = [ gdk_pixbuf ]; + pq-sys = attr: { + buildInputs = [ pkgconfig postgresql ]; }; + rink = attrs: { buildInputs = [ gmp ]; crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ]; }; - cairo-rs = attrs: { - buildInputs = [ cairo ]; + + security-framework-sys = attr: { + propagatedBuildInputs = [ Security ]; }; - xcb = attrs: { - buildInputs = [ python3 ]; + + serde_derive = attrs: { + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; }; thrussh-libsodium = attrs: { buildInputs = [ pkgconfig libsodium ]; }; - pq-sys = attr: { - buildInputs = [ pkgconfig postgresql ]; - }; - security-framework-sys = attr: { - propagatedBuildInputs = [ Security ]; + + xcb = attrs: { + buildInputs = [ python3 ]; }; } diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/pkgs/build-support/setup-hooks/breakpoint-hook.sh new file mode 100644 index 000000000000..6bef786ac3ac --- /dev/null +++ b/pkgs/build-support/setup-hooks/breakpoint-hook.sh @@ -0,0 +1,9 @@ +breakpointHook() { + local red='\033[0;31m' + local no_color='\033[0m' + + echo -e "${red}build failed in ${curPhase} with exit code ${exitCode}${no_color}" + printf "To attach install cntr and run the following command as root:\n\n" + sh -c "echo ' cntr attach -t command cntr-${out}'; while true; do sleep 99999999; done" +} +failureHooks+=(breakpointHook) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 079fccadfcb1..0be9abba71d6 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz"; - sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/420a405e4dbccd78b2a471b632b9fe1a1e04502b.tar.gz"; + sha256 = "01vdbp1yh2s0afijz9ap4590mlpiica7l6k0mpfc0jwzymn9w86n"; } diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index f0ad2c43a9c8..b5293c6d341e 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2018.09.07"; + version = "2018.10.24"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz"; - sha256 = "0nnn10pk94qnrdy55pwcr7506bxdsywa88a3shgqxsd3y53q2sx3"; + sha256 = "05lixkdzy7f3wpan6svh1n9f70rs0kfw6hl6p34sl8bxqxd88ghd"; }; dontBuild = true; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix new file mode 100644 index 000000000000..cab3aff14048 --- /dev/null +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, + qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, + dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, + hicolor-icon-theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-session-ui"; + version = "4.5.1.10"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0cr3g9jbgpp8k41i86lr4pg88gn690nzili7ah745vf1kdwvi1w0"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + deepin-gettext-tools + ]; + + buildInputs = [ + dde-qt-dbus-factory + dtkcore + dtkwidget + gsettings-qt + lightdm_qt + qtsvg + qtx11extras + xorg.libXcursor + xorg.libXrandr + xorg.libXtst + xkeyboard_config + hicolor-icon-theme + ]; + + postPatch = '' + patchShebangs . + sed -i translate_desktop.sh -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," + find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} + + find -type f -exec sed -i -e "s,path = /usr,path = $out," {} + + find -type f -exec sed -i -e "s,Exec=/usr,Exec=$out," {} + + find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + + sed -i global_util/xkbparser.h -e "s,/usr/share/X11/xkb/rules/base.xml,${xkeyboard_config}/share/X11/xkb/rules/base.xml," + sed -i lightdm-deepin-greeter/Scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter," + # fix default background url + sed -i widgets/*.cpp boxframe/*.cpp -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' + ''; + + meta = with stdenv.lib; { + description = "Deepin desktop-environment - Session UI module"; + homepage = https://github.com/linuxdeepin/dde-session-ui; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index daee9e46255f..86e5fc37fa54 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -8,6 +8,7 @@ let dde-calendar = callPackage ./dde-calendar { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; + dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index ce596ec628ec..1313527e20f1 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; - version = "3.28.0"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks"; + sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 8eacbb037dd1..b1369d8304b0 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3, python3 +{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3 , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection python3 ]; - buildInputs = [ glib dbus-glib gtk3 gnome3.defaultIconTheme gnome3.dconf ]; + buildInputs = [ glib gtk3 gnome3.dconf ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index c9312c228829..68193bad5833 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3 +, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch }: let @@ -13,6 +13,19 @@ in stdenv.mkDerivation rec { sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-10733-1.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch; + sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd"; + }) + (fetchpatch { + name = "CVE-2018-10733-2.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch; + sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; buildInputs = [ glib cairo freetype libjpeg libtiff ]; propagatedBuildInputs = [ libarchive ]; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 498f6d35b176..4201bdb968da 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook -, gtk, gnome3, gnome-autoar, dbus-glib, shared-mime-info, libnotify, libexif +, gtk, gnome3, gnome-autoar, glib-networking, shared-mime-info, libnotify, libexif , exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ]; buildInputs = [ - dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux + glib-networking shared-mime-info libexif gtk exempi libnotify libselinux tracker tracker-miners gnome-desktop gexiv2 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index da50b657007a..dfaf73a9d7f1 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit -, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus, desktop-file-utils }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit +, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -10,17 +10,19 @@ stdenv.mkDerivation rec { sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; - nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit - libcanberra-gtk3 libnotify dbus-glib dbus ]; + buildInputs = [ gnome3.gtk packagekit systemd polkit ]; - prePatch = "patchShebangs meson_post_install.sh"; + postPatch = '' + patchShebangs meson_post_install.sh + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-packagekit"; + attrPath = "gnome3.gnome-packagekit"; + }; + }; meta = with stdenv.lib; { homepage = https://www.freedesktop.org/software/PackageKit/; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 566245c4441d..1659ebaae656 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "python-caja-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk"; + sha256 = "16y9xri92x7a40db2qakf20c80a6vqy21nwnjhwrki5rqk7nwbgx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix new file mode 100644 index 000000000000..c2c13649f885 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -0,0 +1,59 @@ +{ name +, url +, sha256 +}: + +{ swingSupport ? true # not used for now +, stdenv +, fetchurl +}: + +let result = stdenv.mkDerivation rec { + inherit name; + + src = fetchurl { + inherit url sha256; + }; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + mv $sourceRoot $out + + rm -rf $out/Home/demo + + # Remove some broken manpages. + rm -rf $out/Home/man/ja* + + # for backward compatibility + ln -s $out/Contents/Home $out/jre + + ln -s $out/Contents/Home/* $out/ + + mkdir -p $out/nix-support + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # FIXME: use multiple outputs or return actual JRE package + passthru.jre = result; + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.gpl2Classpath; + description = "AdoptOpenJDK, prebuilt OpenJDK binary"; + platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + +}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix new file mode 100644 index 000000000000..cf38ca9eaebe --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -0,0 +1,119 @@ +{ name +, url +, sha256 +}: + +{ swingSupport ? true +, stdenv +, fetchurl +, file +, xorg ? null +, glib +, libxml2 +, ffmpeg_2 +, libxslt +, libGL +, freetype +, fontconfig +, gtk2 +, pango +, cairo +, alsaLib +, atk +, gdk_pixbuf +, zlib +, elfutils +}: + +assert swingSupport -> xorg != null; + +let + rSubPaths = [ + "lib/jli" + "lib/server" + "lib/compressedrefs" # OpenJ9 + "lib/j9vm" # OpenJ9 + "lib" + ]; + + libraries = [ + stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL + xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf + atk zlib elfutils + ] ++ (stdenv.lib.optionals swingSupport [ + xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt + xorg.libXrender + stdenv.cc.cc + ]); +in + +let result = stdenv.mkDerivation rec { + inherit name; + + src = fetchurl { + inherit url sha256; + }; + + nativeBuildInputs = [ file ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + # Set PaX markings + exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + + mv $sourceRoot $out + + rm -rf $out/demo + + # Remove some broken manpages. + rm -rf $out/man/ja* + + # for backward compatibility + ln -s $out $out/jre + + mkdir -p $out/nix-support + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + ''; + + rpath = stdenv.lib.strings.makeLibraryPath libraries; + + # FIXME: use multiple outputs or return actual JRE package + passthru.jre = result; + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.gpl2Classpath; + description = "AdoptOpenJDK, prebuilt OpenJDK binary"; + platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + +}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix new file mode 100644 index 000000000000..77d9d85aaa93 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -0,0 +1,26 @@ +let + version = "11"; + buildNumber = "28"; + baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; + makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { + name = if packageType == "jdk" + then + "adoptopenjdk-${vmType}-bin-${version}" + else + "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; + url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; + }; +in +{ + jdk-hotspot = makePackage { + packageType = "jdk"; + vmType = "hotspot"; + sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; + }; + jre-hotspot = makePackage { + packageType = "jre"; + vmType = "hotspot"; + sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; + }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix new file mode 100644 index 000000000000..6e00782c3918 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -0,0 +1,36 @@ +let + version = "11"; + buildNumber = "28"; + baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; + makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix { + name = if packageType == "jdk" + then + "adoptopenjdk-${vmType}-bin-${version}" + else + "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; + url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; + }; +in +{ + jdk-hotspot = makePackage { + packageType = "jdk"; + vmType = "hotspot"; + sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; + }; + jre-hotspot = makePackage { + packageType = "jre"; + vmType = "hotspot"; + sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; + }; + jdk-openj9 = makePackage { + packageType = "jdk"; + vmType = "openj9"; + sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f"; + }; + jre-openj9 = makePackage { + packageType = "jre"; + vmType = "openj9"; + sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42"; + }; +} diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index d6453d1d1071..6da21d7f4009 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.3.11" ; + versionPkg = "0.3.12" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "300884eca8a54cb9b0daa19bd04a86252160cc8ad6ef494198babd56d5a579bc"; + sha256 = "6e53e3070f50600373b857a73a76196adffcabc3c0d3173eaaf9a5f50f4596f4"; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "feba71f37e9688b8ff0a72c4eb21914ce59f19421350d9dc3f15ad6f8c28428a"; + sha256 = "63eb02b225a11752745e8f08691140ed764288ab4ceda3710670cde24835b0d8"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index eb7a1e737193..9970fd9b33d3 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,14 +12,14 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.1.402"; - netCoreVersion = "2.1.4"; + version = "2.1.403"; + netCoreVersion = "2.1.5"; name = "dotnet-sdk-${version}"; src = fetchurl { url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48"; + sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9"; }; unpackPhase = '' diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 62ea39791b90..2363953e35b8 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation (rec { inherit enableShared; # Our Cabal compiler name - haskellCompilerName = "ghc-8.4.3"; + haskellCompilerName = "ghc-8.6.1"; }; meta = { diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index e07c2c04b92d..70ff40cd7ec5 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation rec { touch test/$i.jl done rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl + rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl ''; diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 9665f5006ede..12f833f55255 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -86,7 +86,5 @@ stdenv.mkDerivation rec { platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; license = licenses.free; # Combination of LGPL/X11/GPL ? - # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06 - broken = stdenv.isAarch64 && (versionAtLeast version "5"); }; } diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 09677a47ab2a..d90ddcaacfb0 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.24.4"; + version = "0.25.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6"; + sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 81c935fc421f..0832d14992d1 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,18 +4,20 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.3.3"; + version = "3.3.7"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9"; - sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18"; + rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a"; + sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk"; }; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ makeWrapper ocaml findlib dune utop menhir ]; + buildInputs = [ ocaml findlib dune utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 55348c5795ad..e738dd7acaed 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.28.0"; + version = "1.29.2"; - # fetch hashes by running `print-hashes.sh 1.24.1` + # fetch hashes by running `print-hashes.sh 1.29.2` hashes = { - i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f"; - x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810"; - armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2"; - aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1"; - i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68"; - x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393"; + i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e"; + x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8"; + armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0"; + aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f"; + i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f"; + x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 25a71965e0b4..02ea7ebbbfbf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,13 +1,10 @@ { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, CoreFoundation, Security , version , patches ? [] , src }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation; -in - rustPlatform.buildRustPackage rec { name = "cargo-${version}"; inherit version src patches; @@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7d785093f9b3..a925127596d5 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, CoreFoundation, Security , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -6,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.29.1"; - cargoVersion = "1.29.1"; + version = "1.30.0"; + cargoVersion = "1.30.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"; + sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd"; }; in rec { rustc = callPackage ./rustc.nix { @@ -44,8 +45,7 @@ in rec { cargo = callPackage ./cargo.nix rec { version = cargoVersion; - inherit src; - inherit stdenv; + inherit src stdenv CoreFoundation Security; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a054ed0eb557..decf14a32948 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -92,15 +92,15 @@ stdenv.mkDerivation { #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Disable fragile tests. - rm -vr src/test/run-make/linker-output-non-utf8 || true - rm -vr src/test/run-make/issue-26092 || true + rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true + rm -vr src/test/run-make-fulldeps/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 - rm -vr src/test/run-pass/issue-36023.rs || true + rm -vr src/test/ui/run-pass/issue-36023.rs || true # Disable test getting stuck on hydra - possible fix: # https://reviews.llvm.org/rL281650 - rm -vr src/test/run-pass/issue-36474.rs || true + rm -vr src/test/ui/run-pass/issue-36474.rs || true # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs @@ -116,18 +116,18 @@ stdenv.mkDerivation { # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* - rm -v src/test/run-pass/backtrace-debuginfo.rs + rm -v src/test/run-pass/backtrace-debuginfo.rs || true # error: No such file or directory - rm -v src/test/run-pass/issue-45731.rs + rm -v src/test/ui/run-pass/issues/issue-45731.rs || true # Disable tests that fail when sandboxing is enabled. substituteInPlace src/libstd/sys/unix/ext/net.rs \ --replace '#[test]' '#[test] #[ignore]' substituteInPlace src/test/run-pass/env-home-dir.rs \ --replace 'home_dir().is_some()' true - rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes? - rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? + rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes? + rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? ''; # rustc unfortunately need cmake for compiling llvm-rt but doesn't diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 34855838fe8b..334ecbb168ba 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.10"; + version = "1.4.12"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh"; + sha256 = "0maa4h5zdykq050hdqk5wd74dhl6k7br3qrhfd4f2387skk8ky7a"; }; patchPhase = '' @@ -87,15 +87,23 @@ stdenv.mkDerivation rec { installPhase = '' INSTALL_ROOT=$out sh install.sh + '' + + stdenv.lib.optionalString (!purgeNixReferences) '' + cp -r src $out/lib/sbcl + cp -r contrib $out/lib/sbcl + cat >$out/lib/sbcl/sbclrc <<EOF + (setf (logical-pathname-translations "SYS") + '(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*") + ("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*"))) + EOF ''; - # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. - setupHook = writeText "setupHook.sh" '' + setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" '' addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' } - ''; + ''); meta = sbclBootstrap.meta // { inherit version; diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix new file mode 100644 index 000000000000..cd7ddfefb84a --- /dev/null +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, coq }: + +let params = + { + "8.6" = { + version = "20180221"; + rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; + sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; + }; + + "8.7" = { + version = "20180221"; + rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; + sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; + }; + + "8.8" = { + version = "20180221"; + rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; + sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; + }; + }; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-Velisarios-${param.version}"; + + src = fetchFromGitHub { + owner = "vrahli"; + repo = "Velisarios"; + inherit (param) rev sha256; + }; + + buildInputs = [ + coq coq.ocaml coq.camlp5 coq.findlib + ]; + enableParallelBuilding = true; + + buildPhase = "make -j$NIX_BUILD_CORES"; + preBuild = "./create-makefile.sh"; + installPhase = '' + mkdir -p $out/lib/coq/${coq.coq-version}/Velisarios + cp -pR model/*.vo $out/lib/coq/${coq.coq-version}/Velisarios + ''; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + }; +} diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 4587e08be483..94ed29456923 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchgit, coq, ssreflect }: +{ stdenv, fetchgit, coq, ssreflect, equations }: -let param = - { - "8.6" = { +let + params = + let + v20180709 = { version = "20180709"; rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; }; - - "8.7" = { - version = "20180709"; - rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; - sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; + v20181016 = { + version = "20181016"; + rev = "8049479c5aee00ed0b92e5edc7c8996aebf48208"; + sha256 = "14f9rlwh8vgmcl6njykvsiwxx0jn623375afixk26mzpy12zdcph"; }; - - }."${coq.coq-version}" -; in + in { + "8.6" = v20180709; + "8.7" = v20180709; + "8.8" = v20181016; + }; + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { @@ -26,8 +30,8 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ]; - propagatedBuildInputs = [ coq ssreflect ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]); + propagatedBuildInputs = [ ssreflect equations ]; enableParallelBuilding = false; @@ -43,7 +47,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.hasAttr v params; }; } diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 3faa4c268ac0..0e092473bd52 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -103,6 +103,7 @@ go.stdenv.mkDerivation ( '') + '' export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache runHook postConfigure ''; @@ -193,9 +194,6 @@ go.stdenv.mkDerivation ( find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; - # Disable go cache, which is not reused in nix anyway - GOCACHE = "off"; - shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2cb95a397c6b..33f498d922b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1147,9 +1147,6 @@ self: super: { arbtt = doJailbreak super.arbtt; - # https://github.com/yesodweb/yesod/issues/1563 - yesod-core = self.yesod-core_1_6_8_1; - # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 8d0669ca2acb..213651405f35 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -56,8 +56,19 @@ self: super: { }; in appendPatch super.hadoop-rpc patch; - # Version 1.9.1 needs Cabal 2.4.x or later, so - # we use the one from the ghc-8.6.1 package set. - stack = markBroken super.stack; + # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent + # version of yaml. Go figure. We avoid overrideScope here because using it to + # change Cabal would re-compile every single package instead of just those + # that have it as an actual library dependency. The explicit overrides are + # more verbose but friendlier for Hydra. + stack = (doJailbreak super.stack).override { + Cabal = self.Cabal_2_4_0_1; + hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; }; + yaml = self.yaml_0_11_0_0; + hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; }; + }; + hpack_0_31_0 = super.hpack_0_31_0.override { + yaml = self.yaml_0_11_0_0; + }; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ca2c8849dc64..61f188aeddbc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -90,7 +90,6 @@ self: super: { data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x Diff = dontCheck super.Diff; http-api-data = doJailbreak super.http-api-data; - lucid = doJailbreak super.lucid; persistent-sqlite = dontCheck super.persistent-sqlite; psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" @@ -109,10 +108,7 @@ self: super: { # https://github.com/skogsbaer/HTF/issues/69 HTF = markBrokenVersion "0.13.2.4" super.HTF; - # https://github.com/jgm/pandoc-types/issues/52 - pandoc-types = doJailbreak super.pandoc-types; - - # + # https://github.com/jgm/skylighting/issues/55 skylighting-core = dontCheck super.skylighting-core; # https://github.com/joelburget/easytest/issues/12 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8b469e6c0f5e..b5f5e1f3675c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,7 @@ default-package-overrides: - base-compat-batteries ==0.10.1 # Newer versions don't work in LTS-12.x - cassava-megaparsec < 2 - # LTS Haskell 12.13 + # LTS Haskell 12.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -78,7 +78,7 @@ default-package-overrides: - alarmclock ==0.5.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.7.0 + - alg ==0.2.8.0 - algebra ==4.3.1 - algebraic-graphs ==0.2 - Allure ==0.8.3.0 @@ -233,7 +233,7 @@ default-package-overrides: - base64-bytestring ==1.0.0.1 - base64-bytestring-type ==1 - base64-string ==0.2 - - base-compat ==0.10.4 + - base-compat ==0.10.5 - base-compat-batteries ==0.10.1 - basement ==0.0.8 - base-orphans ==0.7 @@ -253,7 +253,7 @@ default-package-overrides: - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - - binary-conduit ==1.3 + - binary-conduit ==1.3.1 - binary-ext ==2.0.4 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 @@ -335,7 +335,7 @@ default-package-overrides: - Cabal ==2.2.0.1 - cabal2spec ==2.1.1 - cabal-doctest ==1.0.6 - - cabal-rpm ==0.12.5 + - cabal-rpm ==0.12.6 - cache ==0.1.1.1 - cachix ==0.1.2 - cachix-api ==0.1.0.2 @@ -404,7 +404,7 @@ default-package-overrides: - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.3 - - cmark-gfm ==0.1.5 + - cmark-gfm ==0.1.6 - cmdargs ==0.10.20 - code-builder ==0.1.3 - codec ==0.2.1 @@ -461,7 +461,7 @@ default-package-overrides: - contravariant ==1.4.1 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - - control-dsl ==0.2.1.1 + - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 @@ -486,7 +486,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.0.2.13 + - crypto-enigma ==0.0.2.14 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -576,7 +576,7 @@ default-package-overrides: - dhall ==1.15.1 - dhall-bash ==1.0.15 - dhall-json ==1.2.3 - - dhall-text ==1.0.12 + - dhall-text ==1.0.13 - di ==1.0.1 - diagrams ==1.4 - diagrams-builder ==0.8.0.3 @@ -659,7 +659,7 @@ default-package-overrides: - eliminators ==0.4.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - email-validate ==2.3.2.7 + - email-validate ==2.3.2.8 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.3 - enummapset ==0.5.2.2 @@ -702,7 +702,7 @@ default-package-overrides: - exp-pairs ==0.1.6.0 - extensible ==0.4.9 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.12 + - extra ==1.6.13 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - facts ==0.0.1.0 @@ -784,7 +784,7 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - fuzzyset ==0.1.0.6 - - gauge ==0.2.3 + - gauge ==0.2.4 - gc ==0.0.2 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -896,7 +896,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.6.0 + - hapistrano ==0.3.6.1 - happstack-server ==7.5.1.1 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -982,7 +982,7 @@ default-package-overrides: - hmpfr ==0.4.4 - Hoed ==0.5.1 - hoopl ==3.10.2.2 - - hOpenPGP ==2.7.3 + - hOpenPGP ==2.7.4.1 - hopenpgp-tools ==0.21.2 - hopfli ==0.2.2.1 - hostname ==1.0 @@ -1004,8 +1004,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 @@ -1044,7 +1044,7 @@ default-package-overrides: - htaglib ==1.2.0 - HTF ==0.13.2.4 - html ==1.0.1.2 - - html-conduit ==1.3.1 + - html-conduit ==1.3.2 - html-email-validate ==0.2.0.0 - html-entities ==1.1.4.2 - html-entity-map ==0.1.0.0 @@ -1118,7 +1118,7 @@ default-package-overrides: - Imlib ==0.1.2 - immortal ==0.3 - include-file ==0.1.0.3 - - incremental-parser ==0.3.1.1 + - incremental-parser ==0.3.2 - indentation-core ==0.0.0.2 - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 @@ -1136,7 +1136,7 @@ default-package-overrides: - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - - interpolatedstring-perl6 ==1.0.0 + - interpolatedstring-perl6 ==1.0.1 - interpolation ==0.1.0.3 - IntervalMap ==0.6.0.0 - intervals ==0.8.1 @@ -1154,7 +1154,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.3.0 - ip6addr ==1.0.0 - - iproute ==1.7.5 + - iproute ==1.7.6 - IPv6Addr ==1.1.1 - IPv6DB ==0.3.1 - ipython-kernel ==0.9.1.0 @@ -1228,7 +1228,7 @@ default-package-overrides: - lawful ==0.1.0.0 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.7.5 + - leancheck ==0.7.7 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.3 - lens ==4.16.1 @@ -1283,7 +1283,7 @@ default-package-overrides: - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.3 - - lucid ==2.9.10 + - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 - lz4 ==0.2.3.1 @@ -1303,7 +1303,7 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - marvin-interpolate ==1.1.2 - - massiv ==0.2.1.0 + - massiv ==0.2.2.0 - massiv-io ==0.1.4.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 @@ -1351,7 +1351,7 @@ default-package-overrides: - mintty ==0.1.2 - miso ==0.21.2.0 - missing-foreign ==0.1.1 - - MissingH ==1.4.0.1 + - MissingH ==1.4.1.0 - mixed-types-num ==0.3.1.4 - mltool ==0.2.0.1 - mmap ==0.5.9 @@ -1370,7 +1370,7 @@ default-package-overrides: - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadlist ==0.0.2 - - monad-logger ==0.3.29 + - monad-logger ==0.3.30 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.10 - monad-logger-syslog ==0.1.4.0 @@ -1522,8 +1522,8 @@ default-package-overrides: - pagination ==0.2.1 - palette ==0.3.0.1 - pandoc ==2.2.1 - - pandoc-citeproc ==0.14.5 - - pandoc-types ==1.17.5.1 + - pandoc-citeproc ==0.14.8 + - pandoc-types ==1.17.5.2 - pango ==0.13.5.0 - papillon ==0.1.0.6 - parallel ==3.2.2.0 @@ -1754,7 +1754,7 @@ default-package-overrides: - rethinkdb-client-driver ==0.0.25 - retry ==0.7.7.0 - rev-state ==0.1.2 - - rfc5051 ==0.1.0.3 + - rfc5051 ==0.1.0.4 - rhine ==0.4.0.1 - riak ==1.1.2.5 - riak-protobuf ==0.23.0.0 @@ -1841,7 +1841,7 @@ default-package-overrides: - servant-streaming ==0.3.0.0 - servant-streaming-client ==0.3.0.0 - servant-streaming-server ==0.3.0.0 - - servant-swagger ==1.1.5 + - servant-swagger ==1.1.6 - servant-swagger-ui ==0.3.0.3.13.2 - servant-swagger-ui-core ==0.3.1 - servant-tracing ==0.1.0.2 @@ -1859,7 +1859,7 @@ default-package-overrides: - SHA ==1.6.4.4 - shake ==0.16.4 - shake-language-c ==0.12.0 - - shakespeare ==2.0.18 + - shakespeare ==2.0.19 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 @@ -1871,6 +1871,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 + - simple-cmd ==0.1.1 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - simplest-sqlite ==0.1.0.0 @@ -1880,11 +1881,11 @@ default-package-overrides: - singleton-nats ==0.4.2 - singletons ==2.4.1 - siphash ==1.0.3 - - size-based ==0.1.1.0 + - size-based ==0.1.2.0 - skein ==1.0.9.4 - skylighting ==0.7.4 - skylighting-core ==0.7.4 - - slack-web ==0.2.0.6 + - slack-web ==0.2.0.7 - slave-thread ==1.0.2 - smallcheck ==1.1.5 - smoothie ==0.4.2.9 @@ -2152,7 +2153,7 @@ default-package-overrides: - unicode-show ==0.1.0.3 - unicode-transforms ==0.3.4 - unification-fd ==0.10.0.1 - - union ==0.1.1.2 + - union ==0.1.2 - union-find ==0.2 - uniplate ==1.6.12 - uniprot-kb ==0.1.2.0 @@ -2332,29 +2333,29 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.8.32 - yeshql ==4.1.0.1 - - yeshql-core ==4.1.0.1 - - yeshql-hdbc ==4.1.0.1 + - yeshql-core ==4.1.0.2 + - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.4.1 + - yesod-auth ==1.6.5 - yesod-auth-fb ==1.9.1 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.8 + - yesod-core ==1.6.8.1 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.2 + - yesod-form ==1.6.3 - yesod-form-bootstrap4 ==1.0.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.1 - - yesod-persistent ==1.6.0 + - yesod-persistent ==1.6.0.1 - yesod-recaptcha2 ==0.2.4 - yesod-sitemap ==1.6.0 - - yesod-static ==1.6.0 - - yesod-test ==1.6.5 + - yesod-static ==1.6.0.1 + - yesod-test ==1.6.5.1 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fd19a506d15b..fe488d0447e1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12298,31 +12298,6 @@ self: { }: mkDerivation { pname = "MissingH"; - version = "1.4.0.1"; - sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; - revision = "1"; - editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MissingH_1_4_1_0" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; version = "1.4.1.0"; sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29"; libraryHaskellDepends = [ @@ -12336,7 +12311,6 @@ self: { ]; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MissingK" = callPackage @@ -18676,8 +18650,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.14"; - sha256 = "0hwlm91dlhbl0g6axpqx3pbr89icaqmrgnnn6lhcwd7sd8rzycbg"; + version = "0.1.2.16"; + sha256 = "00ngq1i7f1sqksfl9cg1qzhp4fxv9h6mmjfljj3cahcw50h4al64"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18687,7 +18661,7 @@ self: { transformers unix uri-encode ]; executableHaskellDepends = [ - base HDBC HDBC-sqlite3 random scotty split text time + base HDBC HDBC-sqlite3 mtl random scotty split text time ]; testHaskellDepends = [ base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck @@ -19634,8 +19608,8 @@ self: { ({ mkDerivation, base, deepseq, random }: mkDerivation { pname = "Yampa"; - version = "0.11.1"; - sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1"; + version = "0.12"; + sha256 = "077fnazzcv7gckpklmdgk4hz6nnfnims11c1r4dwpnb0z6n31wcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random ]; @@ -23140,23 +23114,11 @@ self: { ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.7.0"; - sha256 = "00ih68mh1494s856ygkc887m0vhrs2sfchjgqrsgw8v7lqcqjsx6"; - libraryHaskellDepends = [ base util ]; - description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alg_0_2_8_0" = callPackage - ({ mkDerivation, base, util }: - mkDerivation { - pname = "alg"; version = "0.2.8.0"; sha256 = "1zw50da4wz8qdc62qlvg74k3g5n48xlzda2k7c3y9zb8xb2xbfrr"; libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -29163,6 +29125,8 @@ self: { pname = "ascii"; version = "0.0.5.1"; sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn"; + revision = "1"; + editedCabalFile = "1v8pgvhl47c4sf226pg175wydw5a60lssz0876haqkqm5h7bjm7g"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text @@ -29677,8 +29641,8 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; - revision = "3"; - editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7"; + revision = "4"; + editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A library for constructing AST by using do-notation"; @@ -33032,23 +32996,11 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "base-compat"; - version = "0.10.4"; - sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d"; - libraryHaskellDepends = [ base unix ]; - description = "A compatibility layer for base"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-compat_0_10_5" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "base-compat"; version = "0.10.5"; sha256 = "0hgvlqcr852hfp52jp99snhbj550mvxxpi8qn15d8ml9aqhyl2lr"; libraryHaskellDepends = [ base unix ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-compat-batteries" = callPackage @@ -34234,8 +34186,8 @@ self: { }: mkDerivation { pname = "bench-show"; - version = "0.2.0"; - sha256 = "17d7dk5r697r9fls14labciwp3rwykv6n5mkhljrjszf2z2c6j65"; + version = "0.2.1"; + sha256 = "1afx5vck4b57r6kanr5g46rk5n8hf9vw4vg2sfqgdb3fhc9979g5"; libraryHaskellDepends = [ ansi-wl-pprint base Chart Chart-diagrams csv directory filepath mwc-random split statistics transformers vector @@ -34930,27 +34882,6 @@ self: { }: mkDerivation { pname = "binary-conduit"; - version = "1.3"; - sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3"; - revision = "1"; - editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx"; - libraryHaskellDepends = [ - base binary bytestring conduit exceptions vector - ]; - testHaskellDepends = [ - base binary bytestring conduit hspec QuickCheck - quickcheck-assertions resourcet - ]; - description = "data serialization/deserialization conduit library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "binary-conduit_1_3_1" = callPackage - ({ mkDerivation, base, binary, bytestring, conduit, exceptions - , hspec, QuickCheck, quickcheck-assertions, resourcet, vector - }: - mkDerivation { - pname = "binary-conduit"; version = "1.3.1"; sha256 = "17yj8rn6fwzbv0z6lczrddv7mkr8906xg2pf2dlvmnwb97zw7004"; libraryHaskellDepends = [ @@ -34962,7 +34893,6 @@ self: { ]; description = "data serialization/deserialization conduit library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-derive" = callPackage @@ -41935,17 +41865,18 @@ self: { "cabal-rpm" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, time, unix + , http-client, http-client-tls, http-conduit, process, simple-cmd + , time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.5"; - sha256 = "0xz2qjj52m8pkazy3dbkh0pqhsg3727x9blka24naibgfl1h7vaa"; + version = "0.12.6"; + sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process time unix + http-client-tls http-conduit process simple-cmd time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; @@ -46622,8 +46553,8 @@ self: { ({ mkDerivation, base, criterion, QuickCheck, random }: mkDerivation { pname = "cl3"; - version = "1.0.0.3"; - sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj"; + version = "1.0.0.4"; + sha256 = "18q5r2m4sr7h8z35nivq2fndmxamyw3217j11na4gq361rq1340v"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -48366,23 +48297,6 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.1.5"; - sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_1_6" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; version = "0.1.6"; sha256 = "0s39djd1j0rq63g4sy0cnras14m263anr56nvijcbcy9zg41dyf8"; libraryHaskellDepends = [ base bytestring text ]; @@ -48392,7 +48306,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -52952,8 +52865,8 @@ self: { ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.3.0.0"; - sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28"; + version = "0.3.1.0"; + sha256 = "1x1rv1r05v725xbax2qig36h03gah7mx8r8vd1dcdcy6lm6lsc4i"; libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -53146,24 +53059,6 @@ self: { }: mkDerivation { pname = "control-dsl"; - version = "0.2.1.1"; - sha256 = "0nfbipf26kkkjbxb9mqbjxqg99z3dfmpada28ajqjvz6n3mg4grg"; - revision = "1"; - editedCabalFile = "11rjly75f57a1818hjzy18pms51jicnzn99kx2mqzf7c7lygnsgg"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers doctest doctest-discover temporary - ]; - description = "An alternative to monads for control flow DSLs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "control-dsl_0_2_1_3" = callPackage - ({ mkDerivation, base, containers, doctest, doctest-discover - , temporary - }: - mkDerivation { - pname = "control-dsl"; version = "0.2.1.3"; sha256 = "0rv9wpjnr3y957vd6l8vmn87f9gi97nhk07bkgpr8083avi9biz8"; libraryHaskellDepends = [ base ]; @@ -53172,7 +53067,6 @@ self: { ]; description = "An alternative to monads for control flow DSLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-event" = callPackage @@ -55487,27 +55381,12 @@ self: { }: mkDerivation { pname = "crypto-enigma"; - version = "0.0.2.13"; - sha256 = "0w82f9hbhhksqkgj3d846l3cgg210ra5133rji2k41mc74l0r0dl"; - libraryHaskellDepends = [ base containers MissingH mtl split ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_0_2_14" = callPackage - ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck - , split - }: - mkDerivation { - pname = "crypto-enigma"; version = "0.0.2.14"; sha256 = "12gvgpi7hichjq9ya77hm9q1x49qc1024zmr6pb1mv57nwwx599p"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -59381,15 +59260,15 @@ self: { }) {}; "data-timeout" = callPackage - ({ mkDerivation, base, data-textual, parsers, tagged, text-printer - , transformers-base + ({ mkDerivation, base, data-textual, parsers, stm, tagged + , text-printer, transformers-base }: mkDerivation { pname = "data-timeout"; - version = "0.3"; - sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah"; + version = "0.3.1"; + sha256 = "1pnynkk99d2bhg2l2qd9x4ksp8nc2l7zii3gk6sch1svnbg0liv6"; libraryHaskellDepends = [ - base data-textual parsers tagged text-printer transformers-base + base data-textual parsers stm tagged text-printer transformers-base ]; description = "64-bit timeouts of nanosecond precision"; license = stdenv.lib.licenses.bsd3; @@ -62196,8 +62075,8 @@ self: { }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.5.0"; - sha256 = "0c721d4vcar7h5alrigi9q63pwwvp0xqwwrvfh6pa9p2y90p820b"; + version = "0.5.2"; + sha256 = "16w7na8sh5fvwrps0wa3m80yzrdg7znx8jgw2i64glvjjs7d5c61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62510,21 +62389,6 @@ self: { ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.12"; - sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base dhall optparse-applicative text - ]; - description = "Template text using Dhall"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-text_1_0_13" = callPackage - ({ mkDerivation, base, dhall, optparse-applicative, text }: - mkDerivation { - pname = "dhall-text"; version = "1.0.13"; sha256 = "09bwhc2wrwliwrvd565wr0rgdxmi0g4i9691b8nb32nybb20l1ah"; isLibrary = false; @@ -62534,7 +62398,6 @@ self: { ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-to-cabal" = callPackage @@ -64322,6 +64185,8 @@ self: { pname = "discord-gateway"; version = "0.2.2"; sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy"; + revision = "1"; + editedCabalFile = "0aw47024gk2hvj0zzy7h01rvv6wxhnjqqjg8prb4x1pajjalg9l5"; libraryHaskellDepends = [ aeson base discord-types hslogger transformers url websockets wuss ]; @@ -64377,6 +64242,8 @@ self: { pname = "discord-rest"; version = "0.2.2"; sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3"; + revision = "1"; + editedCabalFile = "0hwiwzgh359cha0j97mwhdjmg1y2zppppbn538pn4ggfn6i7ma11"; libraryHaskellDepends = [ aeson base bytestring comonad data-default discord-types hashable hslogger http-client mtl req stm text time url @@ -64394,6 +64261,8 @@ self: { pname = "discord-types"; version = "0.2.2"; sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc"; + revision = "1"; + editedCabalFile = "015i65pzkxrx6pring1q0fv772r54xrbrbrwa339yqjgzm7c7z7w"; libraryHaskellDepends = [ aeson base hashable text time transformers unordered-containers vector @@ -67425,6 +67294,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dunai-core" = callPackage + ({ mkDerivation, base, MonadRandom, transformers, transformers-base + }: + mkDerivation { + pname = "dunai-core"; + version = "0.5.1.0"; + sha256 = "1p8161m671dgf13q0rnpp797nymdxpi5nf6xl9mh9zj495libbzz"; + libraryHaskellDepends = [ + base MonadRandom transformers transformers-base + ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "duplo" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , base64-bytestring, bytestring, containers, directory @@ -69861,22 +69744,6 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.7"; - sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_8" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; version = "2.3.2.8"; sha256 = "1lsf6x3hmic8anx9dw6dryvsdh128rprb6dxqkyjr17iqy5ww6yp"; libraryHaskellDepends = [ @@ -69885,7 +69752,6 @@ self: { testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -73452,8 +73318,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.5.0.1"; - sha256 = "00gr2x00byfc842p8b5apzc4qi8l0fx8cgrvsi73f1mshkiqs9sp"; + version = "0.6.2"; + sha256 = "11cqk78c0lfsa8mkq7ymxsral0g24p1im4r1ndqsf7rxczjmc37c"; libraryHaskellDepends = [ base containers data-default deepseq directory extensible-effects filepath lens logging-effect monad-control mtl parallel process @@ -73509,22 +73375,6 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.12"; - sha256 = "177m9f3hdc8sy6m791q6bmns01avzb0j9wj113rm4748k0bnqngz"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_13" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; version = "1.6.13"; sha256 = "0jc5g120ff97sayff10kqn66wz8aw2wymgwgh2livzkf7vqm5q50"; libraryHaskellDepends = [ @@ -73533,7 +73383,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -75299,8 +75148,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.5"; - sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy"; + version = "0.5.0.1"; + sha256 = "01rvg7y9c0jczypjgrq7b6cbl79n10flsllkbgm9z5hhymwga38s"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring Cabal containers data-default directory either errors filepath hashable haskell-src-exts lens mtl @@ -77693,6 +77542,8 @@ self: { pname = "fmt"; version = "0.6"; sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy"; + revision = "1"; + editedCabalFile = "0xmi4qxq12qfj4ry1ifb0za7jdlvj65v16bzdqi8r7p1xrxy5cki"; libraryHaskellDepends = [ base base64-bytestring bytestring containers formatting microlens text time time-locale-compat @@ -81101,8 +80952,8 @@ self: { }: mkDerivation { pname = "gauge"; - version = "0.2.3"; - sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs"; + version = "0.2.4"; + sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9"; libraryHaskellDepends = [ base basement deepseq directory process vector ]; @@ -82098,6 +81949,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generics-sop_0_4_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core + , template-haskell + }: + mkDerivation { + pname = "generics-sop"; + version = "0.4.0.0"; + sha256 = "0blx09k173qgaghqnsvz6v2r6san1kn62k5c57wilya94l1996ra"; + libraryHaskellDepends = [ + base ghc-prim sop-core template-haskell + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Generic Programming using True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { @@ -82935,8 +82806,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.1.2"; - sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d"; + version = "0.2.1"; + sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -85446,6 +85317,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gingersnap" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types + , postgresql-simple, resource-pool, snap-core + }: + mkDerivation { + pname = "gingersnap"; + version = "0.1.1.0"; + sha256 = "0aqb9ikh21q13mnwf6vcg6chv73vphyag62zhkd4mkhbnlpr816i"; + libraryHaskellDepends = [ + aeson base bytestring http-types postgresql-simple resource-pool + snap-core + ]; + description = "snap-core + aeson + postgresql-simple = delicious"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ginsu" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers , directory, hashable, hashtables, mtl, network, old-locale @@ -86019,8 +85906,8 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.1.0"; - sha256 = "14532rljfzlkcbqpi69wj31cqlzid0rwwy0kzlwvxp06zh8lq2a0"; + version = "0.1.2.0"; + sha256 = "0pwh0s4gfddy0ixx92ww00v9qam2cx047ivqcm373fw5h2h1vrq8"; libraryHaskellDepends = [ base bytestring directory filepath process template-haskell ]; @@ -90683,8 +90570,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.1.0.3"; - sha256 = "0yinjcd74hdxfvph760cvf319hnrb5skkc174ih7fqjjllrp5din"; + version = "0.1.0.4"; + sha256 = "1ivdh8l6snb2d3g1f7fb46fd9fz6ib2i94b1596pmp38hryl8in0"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -92680,56 +92567,6 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.7.3"; - sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype prettyprinter QuickCheck - quickcheck-instances resourcet semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unliftio-core unordered-containers zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib - ]; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hOpenPGP_2_7_4_1" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib - }: - mkDerivation { - pname = "hOpenPGP"; version = "2.7.4.1"; sha256 = "0fcm87rkf1c94w68ad2zkd3r2pbxzqa82kh3d2ky87rc1wqnia0s"; libraryHaskellDepends = [ @@ -95570,32 +95407,6 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.6.0"; - sha256 = "094jv3plkh515mn49hp5bylpxfn7c74n9bdk4843bm88q5hxlnk2"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_6_1" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; version = "0.3.6.1"; sha256 = "0g0i0n952zjvysjrsp4srhqgrq5fyy7kdinixsxazpccf01f229y"; isLibrary = true; @@ -95613,7 +95424,6 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -97721,8 +97531,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.8.0"; - sha256 = "1zj1lkvxhn7l9pgivl7bgzs5mzg8kbzriixwpf8si2nrfx20avkf"; + version = "0.0.9.0"; + sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -114589,8 +114399,8 @@ self: { }: mkDerivation { pname = "html-conduit"; - version = "1.3.1"; - sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi"; + version = "1.3.2"; + sha256 = "0l5hc7bf57p5jiqh3wvnqapc27ibnlv00zm6szc0nqbvknzvvz85"; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra containers resourcet text transformers xml-conduit xml-types @@ -117054,17 +116864,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json_0_9_0_0" = callPackage + "hw-json_0_9_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, criterion, directory, dlist, generic-lens - , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , bytestring, containers, criterion, directory, dlist, hspec + , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim , hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, resourcet, text, vector, word8 + , optparse-applicative, text, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.9.0.0"; - sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7"; + version = "0.9.0.1"; + sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117073,9 +116883,9 @@ self: { hw-rankselect-base mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring criterion dlist generic-lens hw-balancedparens - hw-bits hw-mquery hw-prim hw-rankselect hw-rankselect-base lens - mmap optparse-applicative resourcet vector + base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery + hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative vector ]; testHaskellDepends = [ attoparsec base bytestring containers hspec hw-balancedparens @@ -120495,28 +120305,6 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.3.1.1"; - sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz"; - revision = "1"; - editedCabalFile = "0g6haprqb1w06bazjj107frraxc6bbj8i98im16k66wlx7c9f99i"; - libraryHaskellDepends = [ base monoid-subclasses ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - description = "Generic parser library capable of providing partial results from partial input"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "incremental-parser_0_3_2" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "incremental-parser"; version = "0.3.2"; sha256 = "0rzm83mjbvaxa48yjs16c1v41l0yy1nfilc549z4vjgzqixy1pw6"; libraryHaskellDepends = [ base monoid-subclasses ]; @@ -121900,22 +121688,6 @@ self: { }) {}; "interpolatedstring-perl6" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-meta - , template-haskell, text - }: - mkDerivation { - pname = "interpolatedstring-perl6"; - version = "1.0.0"; - sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring haskell-src-meta template-haskell text - ]; - description = "QuasiQuoter for Perl6-style multi-line interpolated strings"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "interpolatedstring-perl6_1_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, haskell-src-meta, process , template-haskell, text }: @@ -121930,7 +121702,6 @@ self: { ]; description = "QuasiQuoter for Perl6-style multi-line interpolated strings"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolatedstring-qq" = callPackage @@ -122477,8 +122248,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.0.2"; sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "3"; - editedCabalFile = "03pwnb66mlx1b8z2d4mn262i2s5mprfr49m0crnssd2nlvm82ifa"; + revision = "4"; + editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -122793,25 +122564,6 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.5"; - sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_6" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; version = "1.7.6"; sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi"; libraryHaskellDepends = [ @@ -122823,7 +122575,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -126416,8 +126167,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.1.0"; - sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881"; + version = "0.2.0"; + sha256 = "1pq4v3xzbb9673rvr8qbvyln155v5ric712pf08vvkw1aihwgpa4"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector @@ -129702,6 +129453,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "language-docker_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process + , QuickCheck, split, template-haskell, text, th-lift, time + }: + mkDerivation { + pname = "language-docker"; + version = "7.0.0"; + sha256 = "0c63la3739fbcf50vy1cp245fk7x723gviyykd3dmggm1jwgm515"; + libraryHaskellDepends = [ + base bytestring containers free megaparsec mtl prettyprinter split + template-haskell text th-lift time + ]; + testHaskellDepends = [ + base bytestring containers directory filepath free Glob hspec HUnit + megaparsec mtl prettyprinter process QuickCheck split + template-haskell text th-lift time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -131389,25 +131163,12 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.7.5"; - sha256 = "01hmbcp5kn4k0mgv7y5jap54d65ljdd3sm954s5y28h4xvk6dn7g"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck_0_7_7" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; version = "0.7.7"; sha256 = "0ymzs3w7nfagpcyh4f57f1wi1gr72k7pbkh729jrxxqgqhd84bvd"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leankit-api" = callPackage @@ -133413,8 +133174,8 @@ self: { }: mkDerivation { pname = "lifted-stm"; - version = "0.1"; - sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0"; + version = "0.2"; + sha256 = "115yh4rpm7z97jrc088g5jb49amr31kz5sdllpydq3h1yi1wlmbq"; libraryHaskellDepends = [ array base monad-finally stm transformers transformers-abort transformers-base transformers-compat @@ -135137,8 +134898,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.8"; - sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2"; + version = "0.8.0.1"; + sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137280,10 +137041,8 @@ self: { }: mkDerivation { pname = "lucid"; - version = "2.9.10"; - sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0"; - revision = "1"; - editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah"; + version = "2.9.11"; + sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -139179,6 +138938,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; + revision = "1"; + editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -139657,27 +139418,6 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.2.1.0"; - sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq ghc-prim primitive - vector - ]; - testHaskellDepends = [ - base bytestring data-default deepseq hspec QuickCheck - safe-exceptions vector - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, data-default, data-default-class - , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions - , vector - }: - mkDerivation { - pname = "massiv"; version = "0.2.2.0"; sha256 = "1mw636d070icl2wanvgrr8k0a44fhzdmzkw3047442nvl3nyghbc"; libraryHaskellDepends = [ @@ -139690,7 +139430,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -140952,7 +140691,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_7_0_1" = callPackage + "megaparsec_7_0_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -140960,8 +140699,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.1"; - sha256 = "0b60gyd58n5ql7fnwmxvdz2n3h1nxmxjad52vh9b3ddzm1g3ifvb"; + version = "7.0.2"; + sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -144237,8 +143976,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.29"; - sha256 = "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv"; + version = "0.3.30"; + sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -145666,6 +145405,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monus" = callPackage + ({ mkDerivation, base, containers, smallcheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "monus"; + version = "0.2.0.0"; + sha256 = "1iyzq3ivw6brjf45d3023n8x7hq0ihy8gvjh8hjdsmc6pnm26gw9"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers smallcheck tasty tasty-quickcheck tasty-smallcheck + ]; + description = "a 'Monus' is a commutative monoid that allows a notion of substraction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monzo" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, hspec, http-client, http-client-tls, mtl, network @@ -146140,22 +145895,20 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, c2hs, criterion, monad-loops, openmpi, tasty - , tasty-hspec, tasty-hunit, unix + ({ mkDerivation, base, bytestring, c2hs, criterion, monad-loops + , openmpi, store }: mkDerivation { pname = "mpi-hs"; - version = "0.1.0.1"; - sha256 = "19by906z7ccfai23dr61ckzcvv3ccd8l1slf21r7g07zlmjkdrvf"; + version = "0.3.0.0"; + sha256 = "1a8vlsrpvgyzq4p0qa90l4ck3v9a0pncy9bmmn6kjf6j2wa5j9qx"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base bytestring monad-loops store ]; librarySystemDepends = [ openmpi ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base monad-loops tasty tasty-hspec tasty-hunit unix - ]; + testHaskellDepends = [ base monad-loops ]; benchmarkHaskellDepends = [ base criterion ]; description = "MPI bindings for Haskell"; license = stdenv.lib.licenses.asl20; @@ -148593,8 +148346,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.6.0.0"; - sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy"; + version = "0.6.1.0"; + sha256 = "0y6mvw10cbiqib309v38ldjq14xryccs8mhi41zkwpnqldmkyd1x"; libraryHaskellDepends = [ aeson aeson-casing async async-timer base bytestring conduit conduit-extra containers exceptions hashable http-client @@ -151051,8 +150804,8 @@ self: { ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.0.0"; - sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9"; + version = "0.1.1.0"; + sha256 = "1fjw3a9ypmqf7kl8s9mgwa9jlswz98igp830f1hsyc1hdh9xlrqw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; @@ -151807,6 +151560,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nixpkgs-update" = callPackage + ({ mkDerivation, base, directory, doctest, errors, filepath, github + , mtl, neat-interpolation, optparse-applicative, regex-applicative + , shelly, text, time, unix, vector + }: + mkDerivation { + pname = "nixpkgs-update"; + version = "0.2.0"; + sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory errors filepath github mtl neat-interpolation + optparse-applicative regex-applicative shelly text time unix vector + ]; + testHaskellDepends = [ + base directory doctest errors filepath github mtl + neat-interpolation optparse-applicative regex-applicative shelly + text time unix vector + ]; + description = "Tool for semi-automatic updating of nixpkgs repository"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "nkjp" = callPackage ({ mkDerivation, base, bytestring, containers, data-named, filepath , polysoup, tar, text, zlib @@ -156894,8 +156671,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.5"; - sha256 = "0iiai5f2n8f29p52h4fflhngbh8fj9rrgwfz4nnfhjbrdc0irmz8"; + version = "0.14.8"; + sha256 = "1zxd6n6lsfqdm5w64v2w6wnm70jj9d4n9nqw5pxnmclad1hc38zl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156919,41 +156696,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_7" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.14.7"; - sha256 = "18r0pqv170yrsvgarj4xlpgmanydycqq9akxlnp1pkinqhs24iyd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -157243,8 +156985,31 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.5.1"; - sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717"; + version = "1.17.5.2"; + sha256 = "0hppl6drhl4xqav35jybji8g8cpy336mqkp0zb66kdsjya9inpqb"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "pandoc-types_1_17_5_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.17.5.3"; + sha256 = "1yrbad67jz8mgdyhl2hvah42g31iwnbvldp16jw87v96y0cbdl72"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -157256,6 +157021,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -158944,8 +158710,8 @@ self: { }: mkDerivation { pname = "patch-image"; - version = "0.3.2"; - sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk"; + version = "0.3.2.1"; + sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160825,6 +160591,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_5_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.5.0"; + sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -161650,8 +161441,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.26.0"; - sha256 = "168qshbiawj1i7d676y2x5l2bmkhfvnf0fs2abr75v8g7hsa8imq"; + version = "0.0.27.0"; + sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163699,52 +163490,73 @@ self: { ({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal , approximate, array, async, atomic-primops, base, base-orphans , base16-bytestring, bits, bytestring, bytestring-lexing - , case-insensitive, cborg, comonad, compact, constraints - , containers, contravariant, contravariant-extras, deepseq - , distributive, dlist, double-conversion, Earley, envparse, erf - , exceptions, extra, fgl, filepath, foldl, free, gauge - , generic-aeson, half, hashable, heaps, hedgehog + , case-insensitive, cborg, comonad, compact, compactable + , constraints, containers, contravariant, contravariant-extras + , deepseq, Diff, distributive, dlist, double-conversion, Earley + , email-validate, erf, exact-pi, exceptions, extra, fast-digits + , fgl, filepath, foldl, free, generic-aeson, generic-lens, half + , hashable, heaps, ilist, insert-ordered-containers , integer-logarithms, lens, lens-aeson, list-transformer, logict , managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random - , network, network-info, network-uri, nf, optparse-applicative - , parallel, parser-combinators, pointed, prettyprinter - , prettyprinter-ansi-terminal, primitive, profunctors, psqueues - , reactive-banana, reflection, regex-applicative, scientific + , neat-interpolation, network, network-info, network-uri, nf + , optparse-applicative, parallel, parser-combinators, pointed + , prettyprinter, prettyprinter-ansi-terminal, primitive + , profunctors, psqueues, random-bytestring, reactive-banana + , reflection, regex-applicative, safe, say, scientific , semigroupoids, semigroups, semilattices, serialise, split, stm - , stm-chans, stm-containers, tagged, text, text-short, time - , transformers, transformers-base, transformers-compat - , typed-process, unagi-chan, unix, unliftio, unordered-containers - , utf8-string, uuid, uuid-types, vault, vector, vector-builder - , weigh, writer-cps-mtl + , stm-chans, stm-containers, stringsearch, tagged, text + , text-metrics, text-short, time, transformers, transformers-base + , transformers-compat, typed-process, unagi-chan, unique, unix + , unliftio, unordered-containers, utf8-string, uuid, uuid-types + , vault, vector, vector-builder, writer-cps-mtl }: mkDerivation { pname = "planet-mitchell"; - version = "0.0.0"; - sha256 = "1grz5vbcz169bw9w4b85w7g59hfsif99qg11x0nwm5jb9a6chkhp"; + version = "0.1.0"; + sha256 = "0i9fhv17q6i7gim7k3kklivyg5c4kmxfhlfsdljpdv5sy8hl3jh1"; libraryHaskellDepends = [ aeson aeson-pretty aeson-qq ansi-terminal approximate array async atomic-primops base base-orphans base16-bytestring bits bytestring bytestring-lexing case-insensitive cborg comonad compact - constraints containers contravariant contravariant-extras deepseq - distributive dlist double-conversion Earley envparse erf exceptions - extra fgl filepath foldl free gauge generic-aeson half hashable - heaps hedgehog integer-logarithms lens lens-aeson list-transformer - logict managed megaparsec mmorph monad-ste mtl multiset mwc-random - network network-info network-uri nf optparse-applicative parallel - parser-combinators pointed prettyprinter - prettyprinter-ansi-terminal primitive profunctors psqueues - reactive-banana reflection regex-applicative scientific - semigroupoids semigroups semilattices serialise split stm stm-chans - stm-containers tagged text text-short time transformers - transformers-base transformers-compat typed-process unagi-chan unix - unliftio unordered-containers utf8-string uuid uuid-types vault - vector vector-builder weigh writer-cps-mtl + compactable constraints containers contravariant + contravariant-extras deepseq Diff distributive dlist + double-conversion Earley email-validate erf exact-pi exceptions + extra fast-digits fgl filepath foldl free generic-aeson + generic-lens half hashable heaps ilist insert-ordered-containers + integer-logarithms lens lens-aeson list-transformer logict managed + megaparsec mmorph monad-ste mtl multiset mwc-random + neat-interpolation network network-info network-uri nf + optparse-applicative parallel parser-combinators pointed + prettyprinter prettyprinter-ansi-terminal primitive profunctors + psqueues random-bytestring reactive-banana reflection + regex-applicative safe say scientific semigroupoids semigroups + semilattices serialise split stm stm-chans stm-containers + stringsearch tagged text text-metrics text-short time transformers + transformers-base transformers-compat typed-process unagi-chan + unique unix unliftio unordered-containers utf8-string uuid + uuid-types vault vector vector-builder writer-cps-mtl ]; description = "Planet Mitchell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "planet-mitchell-test" = callPackage + ({ mkDerivation, gauge, hedgehog, hspec-expectations, tasty + , tasty-hedgehog, tasty-hunit, tasty-rerun, weigh + }: + mkDerivation { + pname = "planet-mitchell-test"; + version = "0.0.0"; + sha256 = "09nmdz34nz7gdq7x48pmimn966vrnlicg3q74a6m3r29vn9wh47d"; + libraryHaskellDepends = [ + gauge hedgehog hspec-expectations tasty tasty-hedgehog tasty-hunit + tasty-rerun weigh + ]; + description = "Planet Mitchell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plankton" = callPackage ({ mkDerivation, adjunctions, base, protolude }: mkDerivation { @@ -168981,8 +168793,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.4.1"; - sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd"; + version = "5.5.0"; + sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173761,8 +173573,10 @@ self: { ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.4.0"; - sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb"; + version = "1.4.1"; + sha256 = "0gm5jmi779niqsbgmkqqx6dsfw6yvfp4wlfibg9fzzmcc4i968g2"; + revision = "1"; + editedCabalFile = "01f3wf7q6117g2q5b9pp2rranxqyccmyl961r81151dpx21fiar7"; libraryHaskellDepends = [ base stm time time-units ]; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -175077,8 +174891,8 @@ self: { }: mkDerivation { pname = "records-sop"; - version = "0.1.0.1"; - sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc"; + version = "0.1.0.2"; + sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5"; libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; testHaskellDepends = [ base deepseq generics-sop hspec should-not-typecheck @@ -179202,19 +179016,6 @@ self: { ({ mkDerivation, base, bytestring, containers }: mkDerivation { pname = "rfc5051"; - version = "0.1.0.3"; - sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring containers ]; - description = "Simple unicode collation as per RFC5051"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rfc5051_0_1_0_4" = callPackage - ({ mkDerivation, base, bytestring, containers }: - mkDerivation { - pname = "rfc5051"; version = "0.1.0.4"; sha256 = "1lxkq414ni986ciml4gbvf463fn55z299knky7pq3ixb1qislpb1"; isLibrary = true; @@ -179222,7 +179023,6 @@ self: { libraryHaskellDepends = [ base bytestring containers ]; description = "Simple unicode collation as per RFC5051"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rgb-color-model" = callPackage @@ -186548,6 +186348,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-http2-client" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring + , case-insensitive, containers, data-default-class, exceptions + , http-media, http-types, http2, http2-client, mtl, servant + , servant-client-core, text, tls, transformers + }: + mkDerivation { + pname = "servant-http2-client"; + version = "0.1.0.1"; + sha256 = "0jlbczbgbkjx4hai24csnd07r074s36g5hbpizhdxiqr3dcjk8pw"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers exceptions + http-media http-types http2 http2-client mtl servant-client-core + text transformers + ]; + testHaskellDepends = [ + aeson async base binary bytestring case-insensitive containers + data-default-class exceptions http-media http-types http2 + http2-client mtl servant servant-client-core text tls transformers + ]; + description = "Generate HTTP2 clients from Servant API descriptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-iCalendar" = callPackage ({ mkDerivation, base, data-default, http-media, iCalendar, servant }: @@ -187329,34 +187153,6 @@ self: { }) {}; "servant-swagger" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal - , cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , QuickCheck, servant, singleton-bool, swagger2, text, time - , unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.1.5"; - sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; - revision = "5"; - editedCabalFile = "1c160wf4q0jyjg03w7hkwkbz0aprvmvzpwa5m944msik2kbvnyl5"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media insert-ordered-containers - lens QuickCheck servant singleton-bool swagger2 text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base directory doctest filepath hspec lens - QuickCheck servant swagger2 text time - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_1_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -187380,7 +187176,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui" = callPackage @@ -188890,31 +188685,6 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.18"; - sha256 = "1ny9j1p12c134q5y7k2lg8qgf8sqa328vrb8md9ib44w3xwy6wjr"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_19" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; version = "2.0.19"; sha256 = "0h1nmdpizw4bvpkxlnrwq02r3wnk01z4jqid12hp30bi577yqd5l"; libraryHaskellDepends = [ @@ -188929,7 +188699,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -191383,23 +191152,6 @@ self: { }: mkDerivation { pname = "size-based"; - version = "0.1.1.0"; - sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki"; - revision = "1"; - editedCabalFile = "1rw9ddw1vyv9k47p0d79qbvngym005fmz00hqrg3p1rq2vlfjdv2"; - libraryHaskellDepends = [ - base dictionary-sharing template-haskell testing-type-modifiers - ]; - description = "Sized functors, for size-based enumerations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "size-based_0_1_2_0" = callPackage - ({ mkDerivation, base, dictionary-sharing, template-haskell - , testing-type-modifiers - }: - mkDerivation { - pname = "size-based"; version = "0.1.2.0"; sha256 = "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp"; libraryHaskellDepends = [ @@ -191407,7 +191159,6 @@ self: { ]; description = "Sized functors, for size-based enumerations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sized" = callPackage @@ -191870,30 +191621,6 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.6"; - sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a"; - libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers - ]; - testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time - ]; - description = "Bindings for the Slack web API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "slack-web_0_2_0_7" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl - , servant, servant-client, servant-client-core, text, time - , transformers - }: - mkDerivation { - pname = "slack-web"; version = "0.2.0.7"; sha256 = "1jd8ca2d4bhq08ddqv87bnj2wqad89cqmsawvffl8mqki3hrca9x"; libraryHaskellDepends = [ @@ -194652,6 +194379,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sop-core" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "sop-core"; + version = "0.4.0.0"; + sha256 = "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3"; + libraryHaskellDepends = [ base deepseq ]; + description = "True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sophia" = callPackage ({ mkDerivation, base, binary, bindings-sophia, bytestring , criterion, directory, tasty, tasty-hunit @@ -199102,6 +198840,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_0_1" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.0.1"; + sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector clock containers contravariant + criterion cryptohash deepseq directory filepath free ghc-prim + hashable hspec hspec-smallcheck integer-gmp lifted-base + monad-control mono-traversable network primitive resourcet safe + semigroups smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant criterion cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -207331,8 +207121,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.1"; - sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd"; + version = "0.1.5.2"; + sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -211412,6 +211202,8 @@ self: { pname = "toodles"; version = "0.1.0.9"; sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7"; + revision = "3"; + editedCabalFile = "08zadf5r79dpw9g0hg6lsnyvcnpprzb9d0lfs67kpyigm5ih9w8w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -216497,22 +216289,6 @@ self: { }) {}; "union" = callPackage - ({ mkDerivation, base, criterion, deepseq, lens, profunctors - , tagged, vinyl - }: - mkDerivation { - pname = "union"; - version = "0.1.1.2"; - sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; - revision = "5"; - editedCabalFile = "0mphzzvvr8lh1x8mb6n9nzzskx32cmr6ycihdy68qw35ybrqb0aj"; - libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; - benchmarkHaskellDepends = [ base criterion deepseq lens ]; - description = "Extensible type-safe unions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "union_0_1_2" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, lens , profunctors, tagged, vinyl }: @@ -216526,7 +216302,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "union-find" = callPackage @@ -229632,8 +229407,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "6"; - editedCabalFile = "05bfjzmfvy4ir1bkky8iq4m988z4yww2k7h8s1na5i9w60c26d20"; + revision = "7"; + editedCabalFile = "1bj5ncrkwjpvjvrx0s23ksvwwsrybj7zl3sghl1d034wd9r89mxx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -229696,6 +229471,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yampa-test" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck + , normaldistribution, QuickCheck, random, Yampa + }: + mkDerivation { + pname = "yampa-test"; + version = "0.1.0.0"; + sha256 = "1d69qa8dzwsj6pawlg88vwv1r2ig2vnx11zbaq0pbl5hczfnknpd"; + libraryHaskellDepends = [ + base normaldistribution QuickCheck Yampa + ]; + testHaskellDepends = [ + base Cabal cabal-test-quickcheck QuickCheck random Yampa + ]; + description = "Testing library for Yampa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yampa2048" = callPackage ({ mkDerivation, base, gloss, random, Yampa }: mkDerivation { @@ -229979,24 +229772,6 @@ self: { }: mkDerivation { pname = "yeshql-core"; - version = "4.1.0.1"; - sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn"; - libraryHaskellDepends = [ - base containers convertible filepath parsec template-haskell - ]; - testHaskellDepends = [ - base containers stm tasty tasty-hunit tasty-quickcheck - ]; - description = "YesQL-style SQL database abstraction (core)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yeshql-core_4_1_0_2" = callPackage - ({ mkDerivation, base, containers, convertible, filepath, parsec - , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell - }: - mkDerivation { - pname = "yeshql-core"; version = "4.1.0.2"; sha256 = "1zhpccdqy8y5ynyn2ax7p9l2lvz573f559iqkip26ijq84pjmny0"; libraryHaskellDepends = [ @@ -230007,7 +229782,6 @@ self: { ]; description = "YesQL-style SQL database abstraction (core)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yeshql-hdbc" = callPackage @@ -230017,26 +229791,6 @@ self: { }: mkDerivation { pname = "yeshql-hdbc"; - version = "4.1.0.1"; - sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc"; - libraryHaskellDepends = [ - base containers convertible filepath HDBC parsec template-haskell - yeshql-core - ]; - testHaskellDepends = [ - base containers HDBC stm tasty tasty-hunit tasty-quickcheck - ]; - description = "YesQL-style SQL database abstraction (HDBC backend)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yeshql-hdbc_4_1_0_2" = callPackage - ({ mkDerivation, base, containers, convertible, filepath, HDBC - , parsec, stm, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, yeshql-core - }: - mkDerivation { - pname = "yeshql-hdbc"; version = "4.1.0.2"; sha256 = "1p2j0fys7kdgb9882hiifnc1r4768c8jp7qy69ns1nbhd4f55b7l"; libraryHaskellDepends = [ @@ -230048,7 +229802,6 @@ self: { ]; description = "YesQL-style SQL database abstraction (HDBC backend)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yeshql-postgresql-simple" = callPackage @@ -230208,34 +229961,6 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.4.1"; - sha256 = "1s1z39j7csp57py15w0il5bhi60y05b81abwfmccjllzzgs97m7j"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_5" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; version = "1.6.5"; sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr"; libraryHaskellDepends = [ @@ -230249,7 +229974,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -230794,42 +230518,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.8"; - sha256 = "010wjhf053bhivxascvlrxfmsqirhx6mf54aph3xblrkq8sx64hy"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_8_1" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; version = "1.6.8.1"; sha256 = "0kqgpcz1jihc80haidzx6cm75ak139q41195j8l3gz1vwbf94i9j"; libraryHaskellDepends = [ @@ -230851,7 +230539,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -231121,28 +230808,6 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.2"; - sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; version = "1.6.3"; sha256 = "15wvgrkqp57wrh8xv1ix86navy6llvagwp393w4b6azv758dims0"; libraryHaskellDepends = [ @@ -231154,7 +230819,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -231526,27 +231190,6 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.6.0"; - sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_6_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; version = "1.6.0.1"; sha256 = "0kxxm43d64lp4p7kmmpc9c0rany9nblf5dd1424m8wg3105cr2kl"; libraryHaskellDepends = [ @@ -231559,7 +231202,6 @@ self: { ]; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -231986,40 +231628,6 @@ self: { "yesod-static" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, containers - , cryptonite, cryptonite-conduit, css-text, data-default, directory - , exceptions, file-embed, filepath, hashable, hjsmin, hspec - , http-types, HUnit, memory, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.6.0"; - sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit containers cryptonite cryptonite-conduit - css-text data-default directory exceptions file-embed filepath - hashable hjsmin http-types memory mime-types old-time process - resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit containers - cryptonite cryptonite-conduit data-default directory exceptions - file-embed filepath hjsmin hspec http-types HUnit memory mime-types - old-time process resourcet template-haskell text transformers - unix-compat unordered-containers wai wai-app-static wai-extra - yesod-core yesod-test - ]; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-static_1_6_0_1" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, conduit, containers, cryptonite , cryptonite-conduit, css-text, data-default, directory, file-embed , filepath, hashable, hjsmin, hspec, http-types, HUnit, memory @@ -232048,7 +231656,6 @@ self: { ]; description = "Static file serving subsite for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-static-angular" = callPackage @@ -232139,31 +231746,6 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.5"; - sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_5_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, network, pretty-show - , semigroups, text, time, transformers, unliftio, wai, wai-extra - , xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; version = "1.6.5.1"; sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj"; libraryHaskellDepends = [ @@ -232178,7 +231760,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -233928,6 +233509,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip-stream_0_2_0_1" = callPackage + ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit + , conduit-extra, digest, directory, exceptions, filepath, mtl + , primitive, resourcet, text, time, transformers, transformers-base + , zlib + }: + mkDerivation { + pname = "zip-stream"; + version = "0.2.0.1"; + sha256 = "11x58s5w1lr8hw86grxijd94sw5r8k376b8n4dlm8lqz5xhmri5p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra digest + exceptions mtl primitive resourcet text time transformers-base zlib + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra directory filepath resourcet + text time transformers + ]; + description = "ZIP archive streaming using conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zipedit" = callPackage ({ mkDerivation, base, directory, mtl, process }: mkDerivation { diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 6155e158e9de..f4ebe549c502 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -245,12 +245,13 @@ rec { on hackage. This can be used as a test for the source distribution, assuming the build fails when packaging mistakes are in the cabal file. */ - buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { - unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' - echo "Source tarball is at ${src}/${tarname}.tar.gz" - tar xf ${src}/${tarname}.tar.gz - cd ${pkg.pname}-* - ''; + buildFromSdist = pkg: overrideCabal pkg (drv: { + src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz"; + + # Revising and jailbreaking the cabal file has been handled in sdistTarball + revision = null; + editedCabalFile = null; + jailbreak = false; }); /* Build the package in a strict way to uncover potential problems. diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index 1e234b3f6934..91ee174dadff 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -6,11 +6,10 @@ build-idris-package { name = "categories"; version = "2018-07-02"; - # https://github.com/danilkolikov/categories/pull/5 src = fetchFromGitHub { - owner = "infinisil"; + owner = "danilkolikov"; repo = "categories"; - rev = "9722d62297e5025431e91b271ab09c5d14867236"; + rev = "a1e0ac0f0da2e336a7d3900051892ff7ed504c35"; sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2"; }; diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7b6cb64cfe37..7f3164f3160d 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -10,12 +10,11 @@ build-idris-package { idrisDeps = [ contrib pruviloj ]; - # https://github.com/david-christiansen/derive-all-the-instances/pull/9 src = fetchFromGitHub { - owner = "infinisil"; + owner = "david-christiansen"; repo = "derive-all-the-instances"; - rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604"; - sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn"; + rev = "0a9a5082d4ab6f879a2c141d1a7b645fa73fd950"; + sha256 = "06za15m1kv9mijzll5712crry4iwx3b0fjv76gy9vv1p10gy2g4m"; }; meta = { diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 081f1a547d69..85794b09ae0b 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchzip, gnugrep }: stdenv.mkDerivation rec { name = "bats-${version}"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; }; - patchPhase = "patchShebangs ./install.sh"; + patchPhase = '' + patchShebangs ./install.sh + substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep + ''; installPhase = "./install.sh $out"; diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index d97d416bc27d..adbbbaff890b 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.7.3"; - sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa"; + version = "1.7.4"; + sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla"; minimumOTPVersion = "19"; } diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 7c6844fdec09..ea96e5ed334a 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -10,6 +10,9 @@ in stdenv.mkDerivation rec { sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; # Configure script only understands --includedir + buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; @@ -32,6 +35,7 @@ in stdenv.mkDerivation rec { export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out export PYTHON="${python2.interpreter}" + configureFlagsArray+=("--includedir=$dev/include") cd js/src @@ -49,6 +53,12 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + moveToOutput bin/js52-config "$dev" + # Nuke a static lib. + rm $out/lib/libjs_static.ajs + ''; + meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = https://developer.mozilla.org/en/SpiderMonkey; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index bca519c76283..f94e0a3ee780 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; - version = "2.14.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = "${pname}"; rev = "${version}"; - sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554"; + sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am"; }; buildInputs = [mpir gmp mpfr flint]; configureFlags = [ diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 77ce77dee5ad..96259dc66948 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { # patch to fix python-test ./darwin.patch + + # facebook/zstd#1385 + ./zstd136.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch new file mode 100644 index 000000000000..1bdeecaef990 --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/zstd136.patch @@ -0,0 +1,17 @@ +--- a/src/arrow/util/compression_zstd.cc ++++ b/src/arrow/util/compression_zstd.cc +@@ -35,8 +35,13 @@ namespace util { + + Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len, + uint8_t* output_buffer) { ++ void *safe_output_buffer = static_cast<void*>(output_buffer); ++ int dummy {}; ++ if ((output_len == 0) && (output_buffer == NULL)) { ++ safe_output_buffer = static_cast<void*>(&dummy); ++ } + int64_t decompressed_size = +- ZSTD_decompress(output_buffer, static_cast<size_t>(output_len), input, ++ ZSTD_decompress(safe_output_buffer, static_cast<size_t>(output_len), input, + static_cast<size_t>(input_len)); + if (decompressed_size != output_len) { + return Status::IOError("Corrupt ZSTD compressed data."); diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9afb03e0d0c6..a7c918ee01a2 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.5.17"; + version = "1.6.20"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z"; + sha256 = "0b6ahy748i29jqzzrjh8vybk7dv8qda3ir277mqflg4a8xxg9bj1"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 78fcad5c1fe2..b175250872f3 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capnproto-${version}"; - version = "0.6.1"; + version = "0.7.0"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "010s9yhq4531wvdfrdf2477zswhck6cjfby79w73rff3v06090l0"; + sha256 = "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix new file mode 100644 index 000000000000..8cc7a0bba62e --- /dev/null +++ b/pkgs/development/libraries/dqlite/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libuv, sqlite-replication }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "dqlite-${version}"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "CanonicalLtd"; + repo = "dqlite"; + rev = "v${version}"; + sha256 = "03dikhjppraagyvjx4zbp7f5jfg74jivighxkwrbzrcy0g8pmcvd"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libuv sqlite-replication ]; + + meta = { + description = "Expose a SQLite database over the network and replicate it across a cluster of peers"; + homepage = https://github.com/CanonicalLtd/dqlite/; + license = licenses.asl20; + maintainers = with maintainers; [ joko ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 01600f90f284..23d20f418c30 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -3,7 +3,7 @@ , enablePython ? false, pythonPackages , enablePosixThreads ? false , enableOpenMPThreads ? false}: -with stdenv.lib; +with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; version = "2.9.0"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z"; }; + postPatch = '' + substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ netcdf diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index e6d13a5915a1..e3367f661ca2 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchpatch, cmake}: let - version = "3.3.4"; + version = "3.3.5"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,18 +9,9 @@ stdenv.mkDerivation { src = fetchurl { url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2"; + sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04"; }; - patches = [ - # Remove for > 3.3.4 - # Upstream commit from 6 Apr 2018 "Fix cmake scripts with no fortran compiler" - (fetchpatch { - url = "https://bitbucket.org/eigen/eigen/commits/ba14974d054ae9ae4ba88e5e58012fa6c2729c32/raw"; - sha256 = "0fskiy9sbzvp693fcyv3pfq8kxxx3d3mgmaqvjbl5bpfjivij8l1"; - }) - ]; - nativeBuildInputs = [ cmake ]; postInstall = '' diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index c120f7c9b43f..fbe947e3afb1 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -3,29 +3,41 @@ stdenv.mkDerivation rec { version = "5.2.1"; name = "fmt-${version}"; + src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = "${version}"; sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk"; }; + + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DFMT_TEST=TRUE" + "-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}" + ]; + + enableParallelBuilding = true; + doCheck = true; # preCheckHook ensures the test binaries can find libfmt.so.5 preCheck = if enableShared then "export LD_LIBRARY_PATH=\"$PWD\"" else ""; - cmakeFlags = [ "-DFMT_TEST=yes" - "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ]; + meta = with stdenv.lib; { - homepage = http://fmtlib.net/; description = "Small, safe and fast formatting library"; longDescription = '' fmt (formerly cppformat) is an open-source formatting library. It can be used as a fast and safe alternative to printf and IOStreams. ''; + homepage = http://fmtlib.net/; + downloadPage = https://github.com/fmtlib/fmt/; maintainers = [ maintainers.jdehaas ]; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a7a4c2fbacdb..b77c450bdec1 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -133,7 +133,9 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ]; - buildInputs = lib.optionals withGd [ gd libpng ]; + # TODO make linuxHeaders unconditional next mass rebuild + buildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) linuxHeaders + ++ lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch new file mode 100644 index 000000000000..0aa2034e3996 --- /dev/null +++ b/pkgs/development/libraries/gsignond/conf.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index cb1e0df..d90c85c 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,6 +95,6 @@ endif + configure_file( + input: 'gsignond.conf.in', + configuration: conf_data, +- install_dir: sysconf_dir, ++ install_dir: 'etc/', + output: 'gsignond.conf' + ) diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix new file mode 100644 index 000000000000..11dcc2a2ee91 --- /dev/null +++ b/pkgs/development/libraries/gsignond/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking +, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl +, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper +, symlinkJoin, gsignondPlugins, plugins }: + +let +unwrapped = stdenv.mkDerivation rec { + pname = "gsignond"; + version = "39022c86ddb5062a10fb0503ad9d81a8e532d527"; + + name = "${pname}-2018-10-04"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = pname; + rev = version; + sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff"; + }; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + glib-networking + libsecret + ]; + + propagatedBuildInputs = [ sqlite ]; + + mesonFlags = [ + "-Dbus_type=session" + "-Dextension=desktop" + ]; + + LC_ALL = "en_US.UTF-8"; + + patches = [ + ./conf.patch + ./plugin-load-env.patch + ]; + + meta = with stdenv.lib; { + description = "D-Bus service which performs user authentication on behalf of its clients"; + homepage = https://gitlab.com/accounts-sso/gsignond; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +}; + +in if plugins == [] then unwrapped + else import ./wrapper.nix { + inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins; + gsignond = unwrapped; + } + diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch new file mode 100644 index 000000000000..5da2b4c157e8 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugin-load-env.patch @@ -0,0 +1,35 @@ +diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c +index 5497b32..979e1b4 100644 +--- a/src/gplugind/gsignond-plugin-loader.c ++++ b/src/gplugind/gsignond-plugin-loader.c +@@ -38,11 +38,10 @@ gsignond_load_plugin ( + gchar *plugin_filename; + GSignondPlugin *plugin; + +-# ifdef ENABLE_DEBUG + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + plugin_filename = g_module_build_path (plugin_path, plugin_type); + plugin = gsignond_load_plugin_with_filename (plugin_type, + plugin_filename); +diff --git a/src/gplugind/main.c b/src/gplugind/main.c +index 1c6cdb6..c85c623 100644 +--- a/src/gplugind/main.c ++++ b/src/gplugind/main.c +@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop) + static const gchar* _plugin_path(void) + { + const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR; +-# ifdef ENABLE_DEBUG ++ + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + return plugin_path; + } + diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix new file mode 100644 index 000000000000..a23c14878818 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-lastfm-${version}"; + version = "2018-05-07"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-lastfm"; + rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c"; + sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + json-glib + libsoup + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix new file mode 100644 index 000000000000..763e76c9cc94 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-mail-${version}"; + version = "2018-10-04"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-mail"; + rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346"; + sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix new file mode 100644 index 000000000000..ee45430122c5 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check +, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 +, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-oauth-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-oa"; + rev = "d471cebfd7c50567b1244277a9559f18f8d58691"; + sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gnutls + gsignond + json-glib + libsoup + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix new file mode 100644 index 000000000000..25f205579066 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-sasl-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-sasl"; + rev = "b304c70b7dad9368b23b1205122d10de684c896a"; + sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gsasl + gsignond + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix new file mode 100644 index 000000000000..a5df6bbeafb2 --- /dev/null +++ b/pkgs/development/libraries/gsignond/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }: + +symlinkJoin { + name = "gsignond-with-plugins-${gsignond.version}"; + + paths = [ gsignond ] ++ plugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/gsignond \ + --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins" + + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \ + --replace ${gsignond} $out + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \ + --replace ${gsignond} $out + ''; +} diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 769cc1c768c9..cf4069871d1d 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub }: stdenv.mkDerivation rec { name = "gtest-${version}"; version = "1.8.1"; @@ -10,24 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk"; }; - buildInputs = [ cmake ]; - - configurePhase = '' - mkdir build - cd build - cmake ../ -DCMAKE_INSTALL_PREFIX=$out - ''; - - installPhase = '' - mkdir -p $out/lib - cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib - ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a - mkdir -p $out/include - cp -v -r ../googlemock/include/gmock $out/include - cp -v -r ../googletest/include/gtest $out/include - mkdir -p $out/src - cp -v -r ../googlemock/src/* ../googletest/src/* $out/src - ''; + nativeBuildInputs = [ cmake ninja ]; meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 4da9db3ef047..f445f90f308f 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,30 +1,38 @@ -{stdenv, fetchurl -, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala_0_38 +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44 +, glib, systemd, libusb1, vala, hwdata }: stdenv.mkDerivation rec { name = "gusb-${version}"; - version = "0.2.11"; - enableParallelBuilding = true; + version = "0.3.0"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; + sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq"; }; - preConfigure = "./autogen.sh"; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext - gobjectIntrospection libxslt vala_0_38 ]; - buildInputs = [ systemd glib ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext + gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 + gobjectIntrospection vala + ]; + buildInputs = [ systemd glib ]; propagatedBuildInputs = [ libusb1 ]; - meta = { + mesonFlags = [ + "-Dusb_ids=${hwdata}/share/hwdata/usb.ids" + ]; + + doCheck = false; # tests try to access USB + + meta = with stdenv.lib; { description = "GLib libusb wrapper"; - homepage = https://people.freedesktop.org/~hughsient/releases/; - license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/hughsie/libgusb; + license = licenses.lgpl21; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix new file mode 100644 index 000000000000..175097ef7855 --- /dev/null +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "jitterentropy-${version}"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "smuellerDD"; + repo = "jitterentropy-library"; + rev = "v${version}"; + sha256 = "10yl1hi0hysr53wzy2i8brs0qqnxh46mz3dcjh5mk0ad03wvbfsl"; + }; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/include + ''; + + installFlags = [ + "PREFIX=$(out)" + ]; + + meta = { + description = "Provides a noise source using the CPU execution timing jitter"; + homepage = https://github.com/smuellerDD/jitterentropy-library; + license = with stdenv.lib.licenses; [ gpl2 bsd3 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + }; +} diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix new file mode 100644 index 000000000000..e63bfd20c797 --- /dev/null +++ b/pkgs/development/libraries/libaosd/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, cairo, pango, + libX11, libXcomposite, autoconf, automake }: + +stdenv.mkDerivation rec { + version = "0.2.7-9-g177589f"; + name = "libaosd-${version}"; + + src = fetchFromGitHub { + owner = "atheme-legacy"; + repo = "libaosd"; + rev = "${version}"; + sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ cairo pango libX11 libXcomposite ]; + enableParallelBuilding = true; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + longDescription = '' + libaosd is an advanced on screen display library. + + It supports many modern features like anti-aliased text and + composited rendering via XComposite, as well as support for + rendering Cairo and Pango layouts. + ''; + homepage = https://github.com/atheme-legacy/libaosd; + license = licenses.mit; + maintainers = with maintainers; [ unode ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index e3d5c7d6424e..516702e2afef 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.9.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00"; + sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 752d2ce5a1e7..6938cfd8c51d 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,31 +1,24 @@ -{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl -, libidn }: +{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls, + libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { - version = "7.54.1"; + version = "7.61.1"; name = "libgnurl-${version}"; src = fetchurl { - url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2"; - sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4"; + url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; + sha256 = "0y56k15vp3m2r8q6mnc6ivflwq9lv6npdhbbvxxcf4r8vwjhv91q"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ perl gnutls gss openssl zlib libidn ]; - - preConfigure = '' - sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure - ''; + nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; + + buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; configureFlags = [ - "--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn" - "--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl" - "--without-polarssl" "--without-ssl" "--without-winssl" - "--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap" - "--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp" - "--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher" - "--disable-file" "--disable-ftp" "--disable-smb" + "--disable-ntlm-wb" + "--without-ca-bundle" + "--with-ca-fallback" ]; meta = with stdenv.lib; { @@ -33,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://gnunet.org/gnurl; maintainers = with maintainers; [ falsifian vrthra ]; platforms = platforms.linux; - license = with licenses; [ bsdOriginal mit ]; + license = licenses.curl; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index e2d7d09b259c..87c6bb03d4bb 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p"; + sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index 2da8e5ebf738..de8baa7ad198 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libmd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj"; + sha256 = "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index ba267b797870..d4c324d4f23b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" - "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" + "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" + "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" "--enable-gtk-doc" ]; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 1304aff9e3b3..8c0094a3152b 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,17 +1,29 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libowfat-0.31"; + name = "libowfat-0.32"; src = fetchurl { url = "https://www.fefe.de/libowfat/${name}.tar.xz"; - sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i"; + sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; }; + # Dirty patch because 0.32 "moved headers to <libowfat/> upon install" + # but it breaks gatling-0.15 and opentracker-2018-05-26 ... + postPatch = '' + substituteInPlace GNUmakefile --replace \ + 'install -d $(DESTDIR)$(INCLUDEDIR)/libowfat' \ + 'install -d $(DESTDIR)$(INCLUDEDIR)' + substituteInPlace GNUmakefile --replace \ + 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat' \ + 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)' + ''; + makeFlags = "prefix=$(out)"; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.fefe.de/libowfat/; + homepage = https://www.fefe.de/libowfat/; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 8cca5333d084..2f20150ad164 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.3.0.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"; + sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1ac4a7185122..154e84cfd0a2 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -46,7 +46,7 @@ in { }; libressl_2_8 = generic { - version = "2.8.1"; - sha256 = "0hnga8j7svdbwcy01mh5pxssk7rxq4g5fc5vxrzhid0x1w2zfjrk"; + version = "2.8.2"; + sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq"; }; } diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 38e5ffcb4de0..fa27a80e22ed 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ m4]; - meta = { + meta = with stdenv.lib; { homepage = https://libsigcplusplus.github.io/libsigcplusplus/; description = "A typesafe callback system for standard C++"; branch = "1.2"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix new file mode 100644 index 000000000000..2c0ef60bc635 --- /dev/null +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }: + +stdenv.mkDerivation rec { + pname = "libsignon-glib"; + version = "3639a2e90447e4640a03a44972560afe8f61aa48"; + + name = "${pname}-2018-10-24"; + + outputs = [ "out" "dev" "devdoc" "py" ]; + + src = fetchgit { + url = "https://gitlab.com/accounts-sso/${pname}"; + rev = version; + fetchSubmodules = true; + sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_412 + docbook_xml_dtd_43 + docbook_xsl + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + python3.pkgs.pygobject3 + ]; + + mesonFlags = [ + "-Dintrospection=true" + "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + postPatch = '' + chmod +x build-aux/gen-error-map.py + patchShebangs build-aux/gen-error-map.py + ''; + + meta = with stdenv.lib; { + description = '' + A library for managing single signon credentials which can be used from GLib applications + ''; + homepage = https://gitlab.com/accounts-sso/libsignon-glib; + license = licenses.lgpl21; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index ad8120d3591a..51b6cbd4ed52 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.35"; + rev = "0.7.0"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq"; + sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e608ea300d1a..68c35c49ef37 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/libuv/libuv; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; + license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; } diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 6e7005195bf0..6ca7b11321ba 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: let - version = "2.6.0"; + version = "2.7.0"; in stdenv.mkDerivation { name = "libversion-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "repology"; repo = "libversion"; rev = version; - sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601"; + sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index eed0c77af804..bf685862adf1 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with stdenv.lib; { description = "WMF library from wvWare"; - platforms = stdenv.lib.platforms.unix; + homepage = http://wvware.sourceforge.net/libwmf.html; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 49012f8bddf8..736b1a45fa20 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -2,19 +2,22 @@ stdenv.mkDerivation rec { name = "libwpd-0.8.14"; - + src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.gz"; sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01"; }; - + patches = [ ./gcc-0.8.patch ]; buildInputs = [ glib libgsf libxml2 ]; nativeBuildInputs = [ pkgconfig bzip2 ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for importing WordPerfect documents"; + homepage = http://libwpd.sourceforge.net; + license = with licenses; [ lgpl21 mpl20 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 9d262910e14f..99808be2b216 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ libwpd zlib librevenge ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = http://libwpg.sourceforge.net; description = "C++ library to parse WPG"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ lgpl21 mpl20 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 7b672aebe445..b2fba7df509b 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -15,5 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; + license = licenses.lgpl21; + homepage = http://log4cpp.sf.net; }; } diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index aecd75656dae..cad5d0d7ecad 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -18,11 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "A lightweight C library for the Jabber protocol"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; downloadPage = "http://mcabber.com/files/loudmouth/"; downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; updateWalker = true; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 3b6102715391..064f04f220cd 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; homepage = http://martyr.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 573215227369..f28ff1b0a21f 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.12"; + name = "matio-1.5.13"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6"; + sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 11bd437d377e..e1dd7586f921 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"; }; - meta = { + meta = with stdenv.lib; { homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix index 8ff1d6d5e9a2..2b61668d5c67 100644 --- a/pkgs/development/libraries/mdds/0.7.1.nix +++ b/pkgs/development/libraries/mdds/0.7.1.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy"; }; - meta = { + meta = with stdenv.lib; { homepage = https://gitlab.com/mdds/mdds/; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 43fee9ccead8..3b0a0441cc4e 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { checkInputs = [ boost ]; - meta = { + meta = with stdenv.lib; { inherit version; homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 345c6e51f0b7..ca72557242f1 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { and for creating libraries which extend those applications. ''; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index d96f90b4bfd6..37195d385627 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A cross platform Zero Configuration Networking library for Mono and .NET"; homepage = http://www.mono-project.com/archived/monozeroconf/; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index cfb02ddbf9dd..601e70427a13 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Mediastreamer plugin for the iLBC audio codec"; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index dd40a3962449..28888e551ef6 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://hunspell.sourceforge.net/; description = "Thesaurus library from Hunspell project"; + license = stdenv.lib.licenses.bsd3; inherit (hunspell.meta) platforms; }; } diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index f50b64fca3ed..8f72b333aa48 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.1.5"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl"; + sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index d0f992efb2bc..87f9b5effacd 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 7aad5be36f70..61a40753a56f 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 7d0e934d911c..0c597fc4b335 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -43,5 +43,8 @@ in stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; homepage = https://www.unidata.ucar.edu/software/netcdf/; + license = { + url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; + }; }; } diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index d3a4b21b4b61..cc5a115ed71e 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: -let version = "5.0.0"; in +let version = "6.0.0"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv"; + sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index c7e133d94b23..3c5ae8537a41 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9cb7d701b9da..cdbd57d785f8 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3089e6da23ae..8a3de28b7842 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.38"; + version = "3.39"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz"; - sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c"; + url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz"; + sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb"; }; buildInputs = [ perl zlib sqlite ] @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { preConfigure = "cd nss"; makeFlags = [ - "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr" + "NSPR_INCLUDE_DIR=${nspr.dev}/include" "NSPR_LIB_DIR=${nspr.out}/lib" "NSDISTMODE=copy" "BUILD_OPT=1" diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 63a51a90ccd2..cd3034e86122 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { name = "ntl-${version}"; - version = "11.3.0"; + version = "11.3.1"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s"; + sha256 = "08a1v92js13ij6lpf75xkjc8iy2w89igd7hy58abll6wnjj107zs"; }; buildInputs = [ diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 44c8f51e856a..25e084bfb74a 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; - meta = { + meta = with stdenv.lib; { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = https://launchpad.net/ntrack; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index b67288296606..aa1886508609 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; - meta = { + meta = with stdenv.lib; { description = "Open Dynamics Engine"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/opende; + platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index f86e4d120976..1658e831ddd1 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ptlib srtp libtheora speex ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; - propagatedBuildInputs = [ speex ]; + propagatedBuildInputs = [ speex ]; configureFlags = [ "--enable-h323" ]; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98"; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - + meta = with stdenv.lib; { description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; }; passthru = { diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index aad6911036ed..3835822673ce 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ stdenv, fetchFromGitHub, cmake , alsaSupport ? !stdenv.isDarwin, alsaLib ? null , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , CoreServices, AudioUnit, AudioToolbox @@ -10,12 +10,14 @@ assert alsaSupport -> alsaLib != null; assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.19.1"; name = "openal-soft-${version}"; - src = fetchurl { - url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2"; - sha256 = "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi"; + src = fetchFromGitHub { + owner = "kcat"; + repo = "openal-soft"; + rev = name; + sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 6af15d90cefd..4a12217443c5 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = http://www.opencascade.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 2724976c5ae8..e0a6c6a5705e 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { cp license.txt "$out/share/doc/opencsg" ''; - meta = { + meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; homepage = http://www.opencsg.org/; - platforms = with stdenv.lib.platforms; - linux; - maintainers = with stdenv.lib.maintainers; - [raskin]; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a073a29b507d..f954aaf72457 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -15,4 +15,10 @@ stdenv.mkDerivation rec { ''; buildInputs = [ readline mysql.connector-c postgresql sqlite ]; + + meta = with stdenv.lib; { + description = "Extremely lightweight but extensible database access library written in C"; + license = licenses.lgpl21; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.x.nix index d18c971dc112..d18c971dc112 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 7d84392d204a..339f60649997 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; - meta = { + meta = with lib; { homepage = https://www.openpam.org; description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 86015abb9817..973f83042737 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.cstrahan ]; + license = licenses.openssl; priority = 10; # resolves collision with ‘man-pages’ }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 87751188a03a..2ad4b8d904bf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -51,6 +51,8 @@ let configureScript = { "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; + "armv6l-linux" = "./Configure linux-armv4 -march=armv6"; + "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix new file mode 100644 index 000000000000..3b0354b9fe8e --- /dev/null +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + name = "opentracing-cpp-${version}"; + version = "1.5.0"; + src = fetchFromGitHub { + owner = "opentracing"; + repo = "opentracing-cpp"; + rev = "v${version}"; + sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg"; + }; + buildInputs = [ cmake ]; + + meta = { + description = "C++ implementation of the OpenTracing API"; + homepage = http://opentracing.io; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ rob ]; + }; + +} + diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index aae6ed0f688a..b69ded648397 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { pango ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; + homepage = https://sourceforge.net/projects/pangopdf; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index b29388790d02..67f343d60380 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21; }; src = fetchurl { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 0487886a8966..773478f4dc03 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl2Plus ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index acf531390226..1704703f8012 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index 54e10b965926..b13335561ac0 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index edec0b7f0699..592a1f1470a4 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { + meta = with stdenv.lib; { description = "Command line option parsing library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 29ff988a2266..d40b4442e38e 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - maintainers = [ ]; + license = stdenv.lib.licenses.mit; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index ae60a6f69d63..d425de243f50 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ beerware bsdOriginal mpl10 ]; }; passthru = { diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 018a57ad0571..b5a01698e5e9 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "libupnp-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; + sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx"; }; + outputs = [ "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix new file mode 100644 index 000000000000..4668839ebb9c --- /dev/null +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "QuadProgpp-${version}"; + version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f"; + + src = fetchFromGitHub { + owner = "liuq"; + repo = "QuadProgpp"; + rev = version; + sha256 = "02r0dlk2yjpafknvm945vbgs4sl26w2i1gw3pllar9hi364y8hnx"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ]; + + meta = with stdenv.lib; { + homepage = https://github.com/liuq/QuadProgpp; + license = licenses.mit; + description = '' + A C++ library for Quadratic Programming which implements the + Goldfarb-Idnani active-set dual method. + ''; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix new file mode 100644 index 000000000000..537fcb93a87e --- /dev/null +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, gfortran, suitesparse, openblas }: +let + suitesparse_ = suitesparse; +in let + # SuiteSparse must use the same openblas + suitesparse = suitesparse_.override { inherit openblas; }; +in stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + pname = "cholmod-extra"; + version = "1.2.0"; + + src = fetchFromGitHub { + repo = pname; + owner = "jluttine"; + rev = version; + sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; + }; + + buildInputs = [ suitesparse gfortran openblas ]; + + buildFlags = [ + "BLAS=-lopenblas" + ]; + + installFlags = [ + "INSTALL_LIB=$(out)/lib" + "INSTALL_INCLUDE=$(out)/include" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/jluttine/cholmod-extra; + description = "A set of additional routines for SuiteSparse CHOLMOD Module"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ jluttine ]; + platforms = with platforms; unix; + }; + +} diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix new file mode 100644 index 000000000000..3cf5c3619a9e --- /dev/null +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, gmp}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lrs"; + version = "7.0"; + + src = fetchurl { + url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz"; + sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9"; + }; + + buildInputs = [ gmp ]; + + preBuild = '' + export makeFlags="$makeFlags prefix=$out"; + ''; + + meta = { + inherit version; + description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html"; + }; +} diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix new file mode 100644 index 000000000000..5294c779a32b --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub, cmake, google-gflags, which +, lsb-release, glog, protobuf, cbc, zlib }: + +stdenv.mkDerivation rec { + name = "or-tools-${version}"; + version = "v6.9.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "or-tools"; + rev = version; + sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c"; + }; + + # The original build system uses cmake which does things like pull + # in dependencies through git and Makefile creation time. We + # obviously don't want to do this so instead we provide the + # dependencies straight from nixpkgs and use the make build method. + configurePhase = '' + cat <<EOF > Makefile.local + UNIX_GFLAGS_DIR=${google-gflags} + UNIX_GLOG_DIR=${glog} + UNIX_PROTOBUF_DIR=${protobuf} + UNIX_CBC_DIR=${cbc} + EOF + ''; + + buildPhase = '' + make cc + ''; + + installPhase = '' + make install_cc prefix=$out + ''; + + patches = [ + # In "expected" way of compilation, the glog package is compiled + # with gflags support which then makes gflags header transitively + # included through glog. However in nixpkgs we don't compile glog + # with gflags so we have to include it ourselves. Upstream should + # always include gflags to support both ways I think. + # + # Upstream ticket: https://github.com/google/or-tools/issues/902 + ./gflags-include.patch + ]; + + nativeBuildInputs = [ + cmake lsb-release which zlib + ]; + propagatedBuildInputs = [ + google-gflags glog protobuf cbc + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/google/or-tools; + license = licenses.asl20; + description = '' + Google's software suite for combinatorial optimization. + ''; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/science/math/or-tools/gflags-include.patch b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch new file mode 100644 index 000000000000..08f76180638b --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch @@ -0,0 +1,12 @@ +diff --git a/ortools/data/jobshop_scheduling_parser.cc b/ortools/data/jobshop_scheduling_parser.cc +index cb0a360b..c2f055eb 100644 +--- a/ortools/data/jobshop_scheduling_parser.cc ++++ b/ortools/data/jobshop_scheduling_parser.cc +@@ -14,6 +14,7 @@ + #include "ortools/data/jobshop_scheduling_parser.h" + + #include <cmath> ++#include <gflags/gflags.h> + + #include "google/protobuf/wrappers.pb.h" + #include "ortools/base/filelineiter.h" diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 03a801a32405..37ef0ce75271 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis +{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage , IOKit, Foundation, AppKit, OpenAL }: let - version = "2.5.0"; + version = "2.5.1"; in stdenv.mkDerivation rec { name = "sfml-${version}"; - src = fetchurl { + + src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; - sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab"; + sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay"; }; - buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew libXrandr libXrender xcbutilimage ] ++ stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" "-DSFML_BUILD_FRAMEWORKS=no" "-DSFML_USE_SYSTEM_DEPS=yes" ]; + meta = with stdenv.lib; { homepage = http://www.sfml-dev.org/; description = "Simple and fast multimedia library"; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index c903b041fd4d..f3cfc1e56e87 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.2.0"; + version = "3.2.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "1yck1qjw5pw5i58x762vc0adg4g53lsan9xv92hbby5dxjpr1dnj"; + sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; }; preConfigure = '' diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index b74c58a2e38c..6577ebeae28e 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "szip-${version}"; version = "2.1.1"; src = fetchurl { - url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz"; - sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9"; + url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; + sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1"; }; meta = { diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 67db6e5097d0..a2cb103a1821 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; }) + + (fetchpatch { + # https://github.com/taglib/taglib/pull/869 + name = "CVE-2018-11439.patch"; + url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch"; + sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72"; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index c716ae7f8dbb..03f8e20b38d0 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }: +{ stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.6"; + version = "0.9.0"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; - sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287"; + sha256 = "0b2yagxzhq9ghpszci6a9xlqg0yl7vq9j5r8dwbar3nszqsfnrzc"; }; - nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ]; + nativeBuildInputs = [ pkgconfig gtest doxygen graphviz ]; doCheck = true; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a4c2b3297145..4aff60631834 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,39 +1,83 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu +, libpng, ffmpeg_4 +, python3Packages # TODO: Temporary }: -let pname = "wlroots"; - version = "unstable-2018-03-16"; +let + pname = "wlroots"; + version = "0.1"; + meson480 = meson.overrideAttrs (oldAttrs: rec { + name = pname + "-" + version; + pname = "meson"; + version = "0.48.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc"; + }; + patches = builtins.filter # Remove gir-fallback-path.patch + (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str)) + oldAttrs.patches; + }); in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; - rev = "9cc875429b40e2567b219f8e9ffd23316d136204"; - sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq"; + rev = version; + sha256 = "0xfipgg2qh2xcf3a1pzx8pyh1aqpb9rijdyi0as4s6fhgy4w269c"; }; - # $out for the library and $bin for rootston - outputs = [ "out" "bin" ]; + patches = [ (fetchpatch { # TODO: Only required for version 0.1 + url = https://github.com/swaywm/wlroots/commit/be6210cf8216c08a91e085dac0ec11d0e34fb217.patch; + sha256 = "0njv7mr4ark603w79cxcsln29galh87vpzsx2dzkrl1x5x4i6cj5"; + }) ]; + + # $out for the library, $bin for rootston, and $examples for the example + # programs (in examples) AND rootston + outputs = [ "out" "bin" "examples" ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson480 ninja pkgconfig ]; buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu + libpng ffmpeg_4 + ]; + + mesonFlags = [ + "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled" + "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled" ]; - # Install rootston (the reference compositor) to $bin postInstall = '' - mkdir -p $bin/bin - cp rootston/rootston $bin/bin/ - mkdir $bin/lib - cp libwlroots* $bin/lib/ - patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston - mkdir $bin/etc - cp ../rootston/rootston.ini.example $bin/etc/rootston.ini + # Install rootston (the reference compositor) to $bin and $examples + for output in "$bin" "$examples"; do + mkdir -p $output/bin + cp rootston/rootston $output/bin/ + mkdir $output/lib + cp libwlroots* $output/lib/ + patchelf \ + --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ + $output/bin/rootston + mkdir $output/etc + cp ../rootston/rootston.ini.example $output/etc/rootston.ini + done + # Install ALL example programs to $examples: + # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle + # screenshot output-layout multi-pointer rotation tablet touch pointer + # simple + mkdir -p $examples/bin + cd ./examples + for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do + patchelf \ + --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ + "$binary" + cp "$binary" "$examples/bin/wlroots-$binary" + done ''; meta = with stdenv.lib; { @@ -42,8 +86,5 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; - # Marked as broken until the first official/stable release (upstream - # request). See #38344 for the public discussion. - broken = true; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 9c307b2d15ae..040273e28b99 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,60 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes -, derez, rez, setfile +, cf-private, derez, rez, setfile , AGL, Cocoa, Kernel }: -with stdenv.lib; - stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.0.4"; name = "wxmac-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d"; + src = fetchzip { + url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz"; + sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; - patches = - [ # Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems - # with abiguous overloads for clang-3.8 and gcc6. - (fetchpatch { - name = "patch-stc-abs.diff"; - url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch; - sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq"; - }) - - # Various fixes related to Yosemite. Revisit in next stable release. - # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well - # Theoretically the above linked patch should still be needed, but it isn't. - # Try to find out why. - (fetchpatch { - name = "patch-yosemite.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff; - sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb"; - }) - - # Remove uncenessary <QuickTime/QuickTime.h> includes - # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets - (fetchpatch { - name = "patch-quicktime-removal.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff; - sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y"; - }) - - # Patch for wxOSXPrintData, custom paper not applied - # http://trac.wxwidgets.org/ticket/16959 - (fetchpatch { - name = "wxPaperCustomPatch.patch"; - url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch; - sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl"; - }) - ]; - buildInputs = [ expat libiconv libjpeg libpng libtiff zlib derez rez setfile Cocoa Kernel + + # Needed for CFURLGetFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + cf-private ]; propagatedBuildInputs = [ AGL ]; @@ -98,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 9d0065277172..12fb076d946b 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7.5"; + version = "2.8"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww"; + sha256 = "0s4n1swg1hgv81l8hvf0ny0fn305vf6l6dakbj452304p6ihxd83"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index b43deeceb867..4cb612523dc5 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -15,12 +15,12 @@ buildRustPackage rec { cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 2a101da74d55..ce9ddeea0c43 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181026" else "20140422" }@args: let - sha256 = - if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a" - else throw ("menhir: unknown version " ++ version); + src = fetchurl ( + if version == "20140422" then { url = "http://cristal.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz"; sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"; } + else if version == "20170712" then { url = "http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz"; sha256 = "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"; } + else if version == "20181026" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181026/archive.tar.gz"; sha256 = "1zhacw60996i9b88kbnfvrvjk3ps9p9n9syjk9np545jp8l0582g"; } + else throw ("menhir: unknown version " ++ version) + ); in -import ./generic.nix (args // { inherit version sha256; }) +import ./generic.nix (args // { inherit version src; }) diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index d52da82d6d76..bac6cd707940 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,12 +1,9 @@ -{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ version, src, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "menhir-${version}"; - src = fetchurl { - url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz"; - inherit sha256; - }; + inherit src; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 8a8668df74ee..582b2dc8a2c0 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -11,7 +11,7 @@ let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; - version = "0.9.0"; + version = "0.9.1"; webpage = "http://erratique.ch/software/${pname}"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; + sha256 = "07h9a464v0x066mjg3ldkaq94ah47b7rvh54z4rndrg7v6bk7kyp"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { module. An API allows to implement new renderers. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms or []; - license = licenses.bsd3; + inherit (ocaml.meta) platforms; + license = licenses.isc; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix new file mode 100644 index 000000000000..a792877e0590 --- /dev/null +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zmq-${version}"; + version = "20180726"; + src = fetchFromGitHub { + owner = "issuu"; + repo = "ocaml-zmq"; + rev = "d312a8458d6b688f75470248f11875fbbfa5bb1a"; + sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; + }; + + patches = [ + ./ocaml-zmq-issue43.patch + ]; + + buildInputs = [ ocaml findlib dune czmq ]; + + propagatedBuildInputs = [ stdint ]; + + buildPhase = "dune build -p zmq"; + + inherit (dune) installPhase; + + meta = with stdenv.lib; { + description = "ZeroMQ bindings for OCaml"; + license = licenses.mit; + maintainers = with maintainers; [ akavel ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix new file mode 100644 index 000000000000..80c934b44d64 --- /dev/null +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -0,0 +1,12 @@ +{ stdenv, ocaml, findlib, dune, zmq, ocaml_lwt }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zmq-lwt-${version}"; + inherit (zmq) version src installPhase meta; + + buildInputs = [ ocaml findlib dune ]; + + propagatedBuildInputs = [ zmq ocaml_lwt ]; + + buildPhase = "dune build -p zmq-lwt"; +} diff --git a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch b/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch new file mode 100644 index 000000000000..0d01e8b45f39 --- /dev/null +++ b/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch @@ -0,0 +1,11 @@ +--- source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 ++++ source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 +@@ -35,7 +35,7 @@ + #include "socket.h" + #include "msg.h" + +-#include <uint64.h> ++#include <ocaml_stdint/uint64.h> + + /** + * Version diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix new file mode 100644 index 000000000000..711f0f5457ba --- /dev/null +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }: + +buildPythonPackage rec { + pname = "Logbook"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n8wzm2nc99gbvb44y2fbb59sy3c4awkwfgy4pbwv7z892ykw2iw"; + }; + + checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; + + propagatedBuildInputs = [ brotli ]; + + checkPhase = '' + find tests -name \*.pyc -delete + py.test tests + ''; + + meta = { + homepage = https://pythonhosted.org/Logbook/; + description = "A logging replacement for Python"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 63eb93a207cd..6c4a2d310da7 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MechanicalSoup"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "22423efd025c3eedb06f41d3ff1127174a59f40dc560e82dce143956976195bf"; + sha256 = "0k59wwk75q7nz6i6gynvzhagy02ql0bv7py3qqcwgjw7607yq4i7"; }; checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index d0045c9fb7fd..bf4171dd3f97 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -25,30 +25,39 @@ , markdown , phpserialize , jinja2 +, Babel +, freezegun +, pyyaml +, toml +, notebook }: buildPythonPackage rec { pname = "Nikola"; - version = "7.8.15"; + version = "8.0.1"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the # other hand doesn't support Python 3.3). So, just disable Python 2. disabled = !isPy3k; - checkInputs = [ pytest pytestcov mock glibcLocales ]; + checkInputs = [ pytest pytestcov mock glibcLocales freezegun ]; propagatedBuildInputs = [ pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen Logbook blinker setuptools natsort requests piexif markdown phpserialize - jinja2 doit + jinja2 doit Babel pyyaml toml notebook ]; src = fetchPypi { inherit pname version; - sha256 = "182b4b9254f0d710603ba491853429ad6ef3f955f3e718191336b44cfd649000"; + sha256 = "18bq68f9v7xk9ahjl6x4k77yysq5g6g07ng2ndbg35kcsdnw4nk6"; }; + checkPhase = '' + LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test . + ''; + meta = { homepage = https://getnikola.com/; description = "A modular, fast, simple, static website and blog generator"; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 8b7caef8eda5..41318347e53c 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "15yhjbx1xwdbfkg0l1c1wgjayb55zgm8rywjymj655yaqiammm5r"; + sha256 = "0dmznx6q3b5xkvlqpw4vqinxh5ynzz8i7hlpz9syiff51y56a8mf"; }; meta = { diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index ab9839a21031..003bd5166570 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.0.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce"; + sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index ec76d840a56b..14fca8dfe82f 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.3.2"; + version = "3.4.4"; src = fetchPypi { inherit pname version; - sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; + sha256 = "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index b8ee673e66bb..163e2c9b2099 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "3.0.2"; + version = "4.0.1"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; @@ -15,6 +15,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802"; + sha256 = "15cwnadw2xdczdi13k9grrgqq67hxgys4l155dqsl2zh3glhsmp7"; }; } diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index acbd7c2ec65b..84b43fbcfa9a 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.0.4"; + version = "3.0.5"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f5d37d20632ba74bd0b12a85179c12f64a9ea037ffc916d8a2de3be4f4656c76"; + sha256 = "0xldn6mh97pnkq915bacj8my9gy2kx58rrdm44496qla5i1gzlc2"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index ee15be954186..aabf30183d56 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287"; + sha256 = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"; }; # Circular dependency on aiohttp diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index def46c7fccc1..de041c0f4c80 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }: buildPythonPackage rec { pname = "augeas"; - version = "1.0.2"; + version = "1.0.3"; name = pname + "-" + version; src = fetchFromGitHub { owner = "hercules-team"; repo = "python-augeas"; rev = "v${version}"; - sha256 = "1xk51m58ym3qpf0z5y98kzxb5jw7s92rca0v1yflj422977najxh"; + sha256 = "1fb904ym8g8hkd82zlibzk6wrldnfd5v5d0rkynsy1zlhcylq4f6"; }; # TODO: not very nice! diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix new file mode 100644 index 000000000000..6bbcd1703822 --- /dev/null +++ b/pkgs/development/python-modules/awkward/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + version = "0.3.0"; + pname = "awkward"; + + src = fetchPypi { + inherit pname version; + sha256 = "fc3080c66987f2a03aa9ba0809e51227eb7aa34198da4b1ee4deb95356409693"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/awkward-array; + description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch new file mode 100644 index 000000000000..e1019115ac74 --- /dev/null +++ b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch @@ -0,0 +1,106 @@ +From c636f0cc386c9ded9f31947bbd74affccc93c21a Mon Sep 17 00:00:00 2001 +From: yoch <yoch.melka@gmail.com> +Date: Mon, 14 May 2018 21:55:00 +0300 +Subject: [PATCH] Adding buffer protocol support for Python 3 + +--- + bitarray/_bitarray.c | 12 ++++++++++-- + bitarray/test_bitarray.py | 14 +++++++------- + 2 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/bitarray/_bitarray.c b/bitarray/_bitarray.c +index d2c19cb..be6b379 100644 +--- a/bitarray/_bitarray.c ++++ b/bitarray/_bitarray.c +@@ -48,7 +48,7 @@ int PyIndex_Check(PyObject *o) + #define Py_SIZE(ob) (((PyVarObject *) (ob))->ob_size) + #endif + +-#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7 ++#if PY_MAJOR_VERSION == 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7) + /* (new) buffer protocol */ + #define WITH_BUFFER + #endif +@@ -2787,6 +2787,8 @@ static PyTypeObject BitarrayIter_Type = { + + /********************* Bitarray Buffer Interface ************************/ + #ifdef WITH_BUFFER ++ ++#if PY_MAJOR_VERSION == 2 + static Py_ssize_t + bitarray_buffer_getreadbuf(bitarrayobject *self, + Py_ssize_t index, const void **ptr) +@@ -2831,6 +2833,8 @@ bitarray_buffer_getcharbuf(bitarrayobject *self, + return Py_SIZE(self); + } + ++#endif ++ + static int + bitarray_getbuffer(bitarrayobject *self, Py_buffer *view, int flags) + { +@@ -2857,14 +2861,18 @@ bitarray_releasebuffer(bitarrayobject *self, Py_buffer *view) + } + + static PyBufferProcs bitarray_as_buffer = { ++#if PY_MAJOR_VERSION == 2 // old buffer protocol + (readbufferproc) bitarray_buffer_getreadbuf, + (writebufferproc) bitarray_buffer_getwritebuf, + (segcountproc) bitarray_buffer_getsegcount, + (charbufferproc) bitarray_buffer_getcharbuf, ++#endif + (getbufferproc) bitarray_getbuffer, + (releasebufferproc) bitarray_releasebuffer, + }; ++ + #endif /* WITH_BUFFER */ ++ + /************************** Bitarray Type *******************************/ + + static PyTypeObject Bitarraytype = { +@@ -2898,7 +2906,7 @@ static PyTypeObject Bitarraytype = { + 0, /* tp_as_buffer */ + #endif + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS +-#ifdef WITH_BUFFER ++#if defined(WITH_BUFFER) && PY_MAJOR_VERSION == 2 + | Py_TPFLAGS_HAVE_NEWBUFFER + #endif + , /* tp_flags */ +diff --git a/bitarray/test_bitarray.py b/bitarray/test_bitarray.py +index 44de2f0..b72b554 100644 +--- a/bitarray/test_bitarray.py ++++ b/bitarray/test_bitarray.py +@@ -2113,10 +2113,10 @@ def test_read1(self): + a = bitarray('01000001' '01000010' '01000011', endian='big') + v = memoryview(a) + self.assertEqual(len(v), 3) +- self.assertEqual(v[0], 'A') +- self.assertEqual(v[:].tobytes(), 'ABC') ++ #self.assertEqual(v[0], 'A') ++ self.assertEqual(v[:].tobytes(), b'ABC') + a[13] = 1 +- self.assertEqual(v[:].tobytes(), 'AFC') ++ self.assertEqual(v[:].tobytes(), b'AFC') + + def test_read2(self): + a = bitarray([randint(0, 1) for d in range(8000)]) +@@ -2131,14 +2131,14 @@ def test_write(self): + a.setall(0) + v = memoryview(a) + self.assertFalse(v.readonly) +- v[50000] = '\xff' ++ v[50000] = 255 if is_py3k else '\xff' + self.assertEqual(a[399999:400009], bitarray('0111111110')) + a[400003] = 0 + self.assertEqual(a[399999:400009], bitarray('0111011110')) +- v[30001:30004] = 'ABC' +- self.assertEqual(a[240000:240040].tobytes(), '\x00ABC\x00') ++ v[30001:30004] = b'ABC' ++ self.assertEqual(a[240000:240040].tobytes(), b'\x00ABC\x00') + +-if sys.version_info[:2] == (2, 7): ++if sys.version_info[:2] >= (2, 7): + tests.append(BufferInterfaceTests) + + # --------------------------------------------------------------------------- diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix new file mode 100644 index 000000000000..c413303dd21d --- /dev/null +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.8.3"; + pname = "bitarray"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pl9p4j3dhlyffsqra6h28q7jph6v3hgppg786lkmnqdh45x6305"; + }; + + # Delete once https://github.com/ilanschnell/bitarray/pull/55 is merged + patches = [ ./0001-Buffer-Protocol-Py3.patch ]; + + meta = with lib; { + description = "Efficient arrays of booleans"; + homepage = https://github.com/ilanschnell/bitarray; + license = licenses.psfl; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 22243edea9e3..4a4a4a86d5ec 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bjoern"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "1w5z9agacci4shmkg9gh46ifj2a724rrgbykdv14830f7jq3dcmi"; + sha256 = "1lbwqmqrl32jlfzhffxsb1fm7xbbjgbhjr21imk656agvpib2wx2"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 4855a07a479b..567ea4518f88 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "0.13.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d0cf59774d7c74b7173b82ce36bde35b8fe9da0f960364ba3c4df0d1fbd874d6"; + sha256 = "1h1g3jw53srcvbgl1jb9p2rfi7kjz6c91hbqxfbr3s2wx1f67ahn"; }; disabled = isPyPy; @@ -48,6 +48,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest pillow selenium ]; propagatedBuildInputs = [ + pillow flask jinja2 markupsafe diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix new file mode 100644 index 000000000000..56036fc97b34 --- /dev/null +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, spglib +, numpy +, scipy +, matplotlib +, ase +, netcdf4 +, pytest +, pythonOlder +, cython +, cmake +}: + +buildPythonPackage rec { + version = "18.9.1"; + pname = "BoltzTraP2"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "b828ad2b3b3a40956ef866e462e4c82faf83be79348af3945d4e7cede8a53913"; + }; + + buildInputs = [ cython cmake ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ]; + + # pypi release does no include files for tests + doCheck = false; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://www.boltztrap.org/; + description = "Band-structure interpolator and transport coefficient calculator"; + license = licenses.gpl3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix new file mode 100644 index 000000000000..5366eeb9c232 --- /dev/null +++ b/pkgs/development/python-modules/brotli/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "brotli"; + version = "1.0.5"; + + # PyPI doesn't contain tests so let's use GitHub + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "0ssj7mnhpdpk7qnwr49qfd4gxhkmvbli5mhs274pz55cx1xp7xja"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest python/tests + ''; + + meta = { + homepage = https://github.com/google/brotli; + description = "Generic-purpose lossless compression algorithm"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index df260b3adb7d..13038c5803cc 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -15,11 +15,11 @@ let in buildPythonPackage rec { pname = "celery"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f"; + sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"; }; # Skip test_RedisBackend.test_timeouts_in_url_coerced diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 1a2811b50b67..104bdb86bf00 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "2.25"; + version = "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb"; + sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index ed27464d1fe0..5cfa1862f48b 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -1,16 +1,16 @@ { lib, buildPythonPackage, fetchPypi -, translationstring, iso8601 }: +, translationstring, iso8601, enum34 }: buildPythonPackage rec { pname = "colander"; - version = "1.4"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72"; + sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq"; }; - propagatedBuildInputs = [ translationstring iso8601 ]; + propagatedBuildInputs = [ translationstring iso8601 enum34 ]; meta = with lib; { description = "A simple schema-based serialization and deserialization library"; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index a32c9ebb429c..42443c873d7d 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "colored"; - version = "1.1.5"; + version = "1.3.93"; src = fetchPypi { inherit pname version; - sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3"; + sha256 = "0xbhq9nd9xz3b6w0c4q33jfgnv8jid023v2fyhi7hsrz1scym5l2"; }; # No proper test suite diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 6df19e4c94be..a77e98dae4c8 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -11,11 +11,12 @@ buildPythonPackage rec { pname = "cypari2"; - version = "1.2.1"; + # upgrade may break sage, please test the sage build or ping @timokau on upgrade + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0v2kikwf0advq8j76nwzhlacwj1yys9cvajm4fqgmasjdsnf1q4k"; + sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r"; }; # This differs slightly from the default python installPhase in that it pip-installs diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix index 195b20c27e4f..70b0da89d5ba 100644 --- a/pkgs/development/python-modules/d2to1/default.nix +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { pname = "d2to1"; - version = "0.2.12"; + version = "0.2.12.post1"; checkInputs = [ nose ]; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "embray"; repo = pname; rev = version; - sha256 = "1q04ab8vjvx7fmq9ckkl8r9hlwwbqiyjbzaa4v1mv5zicfssxwsi"; + sha256 = "1hzq51qbzsc27yy8swp08kf42mamag7qcabbrigzj4m6ivb5chi2"; }; meta = with lib;{ diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix new file mode 100644 index 000000000000..c9e56017447e --- /dev/null +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "dj-email-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "84f32673156f58d740a14cab09f04ca92a65b2c8881b60e31e09e67d7853e544"; + }; + + checkPhase = '' + ${python.interpreter} test_dj_email_url.py + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/migonzalvar/dj-email-url; + description = "Use an URL to configure email backend settings in your Django Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix new file mode 100644 index 000000000000..b66f6b8f73a3 --- /dev/null +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1"; + pname = "dj-search-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "424d1a5852500b3c118abfdd0e30b3e0016fe68e7ed27b8553a67afa20d4fb40"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/dstufft/dj-search-url; + description = "Use Search URLs in your Django Haystack Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix new file mode 100644 index 000000000000..4cff6f2a69b0 --- /dev/null +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + version = "3.0.0"; + pname = "django-cache-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "235950e2d7cb16164082167c2974301e2f0fb2313d40bfacc9d24f5b09c3514b"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/ghickman/django-cache-url; + description = "Use Cache URLs in your Django application"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix new file mode 100644 index 000000000000..0ca6c400df28 --- /dev/null +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django-discover-runner +, mock +, dj-database-url +, dj-email-url +, dj-search-url +, django-cache-url +, six +, django +}: + +buildPythonPackage rec { + version = "2.1"; + pname = "django-configurations"; + + src = fetchPypi { + inherit pname version; + sha256 = "71d9acdff33aa034f0157b0b3d23629fe0cd499bf4d0b6d699b9ca0701d952e8"; + }; + + checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ]; + + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + export DJANGO_SETTINGS_MODULE="tests.settings.main" + export DJANGO_CONFIGURATION="Test" + ${django}/bin/django-admin.py test + ''; + + # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://django-configurations.readthedocs.io/; + description = "A helper for organizing Django settings"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix new file mode 100644 index 000000000000..d25d9e79947b --- /dev/null +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + version = "1.0"; + pname = "django-discover-runner"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe"; + }; + + propagatedBuildInputs = [ django ]; + + # tests not included with release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/jezdez/django-discover-runner; + description = "A Django test runner based on unittest2's test discovery"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 3548e930ab3d..30ef1a104188 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.0.7"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a"; + sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy"; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 1634e676952b..bdf503cd8492 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -3,7 +3,7 @@ }: buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.5"; + version = "2.1.9"; name = pname + "-" + version; # the pypi packages don't include everything required for the tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "arteria"; repo = "django-hijack"; rev = "v${version}"; - sha256 = "1paiyxhc034336xcd9yzf3azpsapsv26j7w2baxiby71z2hhg0sj"; + sha256 = "109xi93xj37ycdsvainybhg89pcb5sawv6w80px4r6fjvaq4732c"; }; checkInputs = [ django_nose ]; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 7037f23b071c..694b11c6ca87 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "1.0.0"; + version = "1.1.0"; meta = { description = "A pickled object field for Django"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354"; + sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf"; }; } diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 2cd112d8150e..3a33960faf88 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "django-polymorphic"; - version = "2.0.2"; + version = "2.0.3"; # PyPI tarball is missing some test files src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "18p84kdwpfp423vb2n38h840mj3bq0j57jx3cry7c8dznpi0vfi2"; + sha256 = "08qk3rbk0xlphwalkigbhqpmfaqjk1sxmlfh8zy8s8dw7fw1myk4"; }; checkInputs = [ dj-database-url ]; diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 15eafa6dd855..1e5936e6089a 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.4.0"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh"; + sha256 = "1ylw16v5z46ckn8ynbx2zjam6nvipl0xxcr6icrf6driv02q8bzf"; }; # The testsuite fails to modify the base environment diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix index 9d16ee343d6a..02aeb9b204e2 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django_nose/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-nose"; - version = "1.4.4"; + version = "1.4.5"; src = fetchPypi { inherit pname version; - sha256 = "1fm47fkza2lk0xgc6qpi9vs78zg7q8cgl6mdan69sbycgy909ff0"; + sha256 = "0sp78839s8yba6vlj9ab4r364skf1s5gzhaar1b1vw15rcc3yrl7"; }; # vast dependency list diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 18372fc113aa..d75fc90eda77 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.8.2"; + version = "3.9.0"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; + sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix index 79ec94a2c828..a947faec4537 100644 --- a/pkgs/development/python-modules/elpy/default.nix +++ b/pkgs/development/python-modules/elpy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elpy"; - version = "1.9.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0"; + sha256 = "10n20lw7n728ahnfrx03vgx9zim7jb8s1zqhw8yivksm9c1a6i12"; }; propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ] diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix index 70462e5f4033..8aec63689d90 100644 --- a/pkgs/development/python-modules/enum/default.nix +++ b/pkgs/development/python-modules/enum/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "enum"; - version = "0.4.4"; + version = "0.4.7"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff"; + sha256 = "001iq0yqs9f5bslvl793bhkcs71k5km9kv8yrj5h0lfsgrcg6z4c"; }; doCheck = !isPyPy; diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 2deb16924d20..c4543032c2b3 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.0.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "be0288ef1125bf1c539bb8f3079ef4aa5fb813af28f0c5294a4e744ee554398a"; + sha256 = "0l837gm9cjdp3lybnam38ip0q3n1xy0j6vzgx11hdrr0ps8p5mid"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 814cac3c9e6e..317c16d52754 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { - version = "0.8.1"; + version = "0.8.8"; pname = "ezdxf"; src = fetchFromGitHub { owner = "mozman"; repo = "ezdxf"; rev = "v${version}"; - sha256 = "1c20j96n3rsgzaakfjl0wnydaj2qr69gbnnjs6mfa1hz2fjqri22"; + sha256 = "0ap6f6vy71s3y0a048r5ca98i7p8nc9l0mx3mngvvpvjij7j3fcf"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 3642d4e55b90..809871b50de0 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j"; + sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q"; }; # The pypi package does not include tests diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index 3dbcbe594425..424cceab4cba 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "filebytes"; - version = "0.9.12"; + version = "0.9.17"; src = fetchPypi { inherit pname version; - sha256 = "6cd1c4ca823f6541c963a317e55382609789802dedad08209f4d038369e3f0ac"; + sha256 = "0nkwrw3qnii346xd87gb9xdy5pjpmg7ncjxsmb08mhmy1i0libcl"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 1f4f914968f6..caaf0a61152b 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.11.2"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0"; + sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix index 2d34ce8583e6..587057514156 100644 --- a/pkgs/development/python-modules/flask-oauthlib/default.nix +++ b/pkgs/development/python-modules/flask-oauthlib/default.nix @@ -3,13 +3,13 @@ , mock, nose}: buildPythonPackage rec { pname = "Flask-OAuthlib"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "lepture"; repo = "flask-oauthlib"; rev = "v${version}"; - sha256 = "1vnr2kmbwl6mv2fsv92jjxzfibq2m3pnbcs6ba9k32jr1ci7wfh7"; + sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d2e806e43b90..ce847b81de63 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "4.4.3"; + version = "5.3.0"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + sha256 = "0zybd0ypxhb83bgdbwzi120n02328v4j0ndm6bgkb6wg2gah59qb"; }; propagatedBuildInputs = [ html5lib wcwidth ]; diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index 0f6d10c3c523..f2e92d96f573 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "fudge"; - version = "1.1.0"; + version = "1.1.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb"; + sha256 = "1p7g6hv9qxscbzjv2n5pczpkkp55mp3s56adfc912w9qpf3rv4nr"; }; buildInputs = [ nose nosejs ]; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 74ab0fc01a69..80ca5099f344 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fusepy"; - version = "2.0.4"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h"; + sha256 = "1gg69qfi9pjcic3g98l8ya64rw2vc1bp8gsf76my6gglq8z7izvj"; }; propagatedBuildInputs = [ pkgs.fuse ]; diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index faf557735399..91b8d455cdef 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "geojson"; - version = "2.4.0"; + version = "2.4.1"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "0r9pc8hgnc5hf5rq98vinbrncn08v4kgzdfmfs14rfypvacsmfpj"; + sha256 = "12k4g993qqgrhq2mgy5k8rhm5a2s2hbn769rs5fwbc5lwv4bbgxj"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 2feab78f6a83..b690faccf069 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "6.3.3"; + version = "6.3.8"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2"; + sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq"; }; buildInputs = [ pkgs.ncurses ]; diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index a58177e7544c..035545e0de2d 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-gnutls"; - version = "3.0.0"; + version = "3.1.1"; # https://github.com/AGProjects/python-gnutls/issues/2 disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc"; + sha256 = "0ncsz72i6vrhvxpd90y9k74qdfw3pfcj39pvn5dxp6m834ani4l8"; }; propagatedBuildInputs = [ pkgs.gnutls ]; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index ded728bdc0d6..899a315da653 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.3.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "ac85fc7f6687bb0271f2f70ca298da90f35789f9de1fe3a11e8caeb571332b77"; + sha256 = "16ximavy7zgg0427790fmyma03xnkywar9krp4lx6bcphvyiahh3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index c11bcaa5baa5..d812d58b74ca 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "grip"; - version = "4.4.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "joeyespo"; repo = "grip"; rev = "v${version}"; - sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag"; + sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm"; }; patches = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index d6c6a41ae084..6f07725520fa 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.5.4"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "0ce73a9bc7b79968a2b96cc2b0934e2cbe11700adbd02b4b492fea1e3d4d51f4"; + sha256 = "1p1akwirxq809apxia6b9ndalpdfgv340ssnli78h74bkqnw1376"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 492c4da6fcc9..cf206472cd3b 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "i3ipc"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + sha256 = "06d7g4d7cnh0vp5diavy3x9wz1w5nwdrb7ipc4g1c3a2wc78862d"; }; propagatedBuildInputs = [ enum-compat ]; diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix index 22b809c46c20..dcf39dd24f02 100644 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "IBMQuantumExperience"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "c5dbcc140344c7bdf545ad59db87f31a90ca35107c40d6cae1489bb997a47ba9"; + sha256 = "0szn743sbm3cs80982cf4994c1xcg6iz5xkhdbpm1kfv5qn1phja"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix new file mode 100644 index 000000000000..db0b8301f008 --- /dev/null +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ipaddress +, python +, pythonOlder +}: + +buildPythonPackage rec { + version = "0.1.4"; + pname = "ifaddr"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b"; + }; + + # ipaddress is provided in python stdlib > 3.3 + postPatch = if pythonOlder "3.4" then "" else '' + sed -i "s/'ipaddress'//" setup.py + ''; + + propagatedBuildInputs = [ ipaddress ]; + + checkPhase = '' + ${python.interpreter} ifaddr/test_ifaddr.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pydron/ifaddr; + description = "Enumerates all IP addresses on all network adapters of the system"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 100ca5b0ff9a..0d6828bff72b 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "4.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz"; + sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v"; }; # ImportError: No module named tests diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index 4325e6ea8844..6aecf5959ff8 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "ipaddr"; - version = "2.1.11"; + version = "2.2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; + sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index a469ad468838..7ce312287054 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.2.2"; + version = "6.2.3"; src = fetchPypi { inherit pname version; - sha256 = "02b225966d5c20f12b1fba0b6b10aa5d352a6b492e075f137ff0ff6e95b9358e"; + sha256 = "1k9701r120gv0an0wxvcjrbmhns8lq3zj6px5y2izly56j2dafqy"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index c07a4bf3a358..6971393b80c9 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "1.9"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308"; + sha256 = "0qjkjy1qlyc1nl3k95wd03ssxac0a717x8889ypgs1cfcj3bm4n1"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index ae9d15dd7866..f7712ff62006 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kazoo"; - version = "2.2.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj"; + sha256 = "1963l6994vzzy7bjh77y5wnf8lh8zwwibcpcgpfd1rzcppvp9dwd"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 540542da10eb..e7b78edbb3a0 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "144awjkc169z2n1ffirs697y6m97izh3pbh3sjhy3nji7jszh592"; + sha256 = "0aa7j9b4f9gz198j8svxdrffwva1ai8vc55v6xbb2a3lfzmpsf9n"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index fdaec0d817df..455368e58d47 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "kerberos"; - version = "1.2.4"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "11q9jhzdl88jh8jgn7cycq034m36g2ncxds7mr3vqkngpcirkx6n"; + sha256 = "19663qxmma0i8bfbjc2iwy5hgq0g4pfb75r023v5dps68zfvffgh"; }; buildInputs = [ pkgs.kerberos ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 96490c8f0a01..58f2d2a9694c 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2016.05.06"; + version = "2018.09.09"; src = fetchPypi { inherit pname version; - sha256 = "09kbii5559d09jjb6cryj8rva1050r54dvb67hlcvxhy8g3gr1y3"; + sha256 = "077v4gsl0fimsqxir1mpzn2kvw01fg6fa0nnf33nlfa0xzdn241y"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index d46b51e27d3f..a7767be6dc48 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.92"; + version = "0.94"; src = fetchPypi { inherit pname version; - sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx"; + sha256 = "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww"; }; # Some sort of mysterious failure with lmdb.tool diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index a7e92e0b5b8e..9ba6698e4a0f 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mahotas"; - version = "1.4.2"; + version = "1.4.5"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "1d2hciag5sxw00qj7qz7lbna477ifzmpgl0cv3xqzjkhkn5m4d7r"; + sha256 = "0dm34751w1441lxq00219fqlqix5qrgc18wp1wgp7xivlz3czzcz"; }; # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index d797190cb896..63a255c941c8 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.3.5"; + version = "0.3.7"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl"; + sha256 = "1licf3wiy21pncg8hkx58r7xj4ylrqa8jcfh9n4rh23rmykf2rpf"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index 12b518484bc2..018a634a43a6 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "meld3"; - version = "1.0.0"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b"; + sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp"; }; doCheck = false; diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 5f40ce0f1aad..7587e5f33c95 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,19 +1,27 @@ { stdenv , buildPythonPackage , fetchPypi +, psutil +, python }: buildPythonPackage rec { pname = "memory_profiler"; - version = "0.41"; + version = "0.54.0"; src = fetchPypi { inherit pname version; - sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10"; + sha256 = "d64342a23f32e105f4929b408a8b89d9222c3ce8afbbb3359817555811448d1a"; }; + propagatedBuildInputs = [ psutil ]; + + checkPhase = '' + make test PYTHON=${python.interpreter} + ''; + # Tests don't import profile - doCheck = false; + # doCheck = false; meta = with stdenv.lib; { description = "A module for monitoring memory usage of a python program"; diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index fd8cd516a922..bef1202182e7 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "musicbrainzngs"; - version = "0.5"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489"; + sha256 = "1dddarpjawryll2wss65xq3v9q8ln8dan7984l5dxzqx88d2dvr8"; }; buildInputs = [ pkgs.glibcLocales ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 2cd2e2484e67..854866f659bd 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.630"; + version = "0.641"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1p8rnap4ngczfm2q4035mcmn5nsprbljnhksx2jxzxrb9immh137"; + sha256 = "0ma4l7px96zzb8x89dk9mkrrdzdhdqckvfsbld4fj9n25k1iw1wf"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 4af0c6487b3f..579fc4631f66 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.12"; + version = "8.0.13"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1i3148dka4zfqzz4n4n5k0qaqbc585bdpmjwgx5vp6iiv7pgvrxp"; + sha256 = "1qb6m3cp6zxmr49bp6g5g5b75yszgac1h26i2hza61mrvd235688"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index a3e67fa7b985..b5150382b362 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -1,17 +1,21 @@ { stdenv , buildPythonPackage , fetchPypi +, glibcLocales }: buildPythonPackage rec { pname = "nameparser"; - version = "0.3.4"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag"; + sha256 = "c7eeeffbf16e263452b17b5f4b544d366c3364e966721f39d490e6c7c8b44b7f"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "A simple Python module for parsing human names into their individual components"; homepage = https://github.com/derek73/python-nameparser; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 8ff7bbe24167..ae7043c826ab 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.2"; pname = "nipy"; disabled = pythonOlder "2.6"; src = fetchPypi { inherit pname version; - sha256 = "1hnbn2i4fjxflaaz082s2c57hfp59jfra1zayz1iras5p2dy21nr"; + sha256 = "1pn731nsczrx198i2gadffqmfbhviglrclv6xxwhnbv6w5hfs2yk"; }; buildInputs = stdenv.lib.optional doCheck [ nose ]; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 20ae56fdbc79..13db15668879 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.2"; pname = "node-semver"; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "d8a3906e7677f8ab05aeb3fc94c7a2fa163def5507271452ce6831282f23f1cb"; + sha256 = "0p1in8lw0s5zrya47xn73n10nynrambh62ms4xb6jbadvb06jkz9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 9d5c1675359e..e708ff2ee3e7 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , six +, pythonOlder +, mock +, coverage }: buildPythonPackage rec { pname = "nose2"; - version = "0.5.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr"; + sha256 = "9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six coverage ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ]; + # AttributeError: 'module' object has no attribute 'collector' doCheck = false; diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix index 5d54b0928b6f..efbd1eec35a3 100644 --- a/pkgs/development/python-modules/ntfy/default.nix +++ b/pkgs/development/python-modules/ntfy/default.nix @@ -2,26 +2,32 @@ , buildPythonPackage , fetchFromGitHub , appdirs -, pyyaml +, ruamel_yaml , requests -, dbus-python , emoji , sleekxmpp , mock +, psutil +, python +# , dbus-python }: buildPythonPackage rec { - version = "1.2.0"; + version = "2.6.0"; pname = "ntfy"; src = fetchFromGitHub { owner = "dschep"; repo = "ntfy"; rev = "v${version}"; - sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc"; + sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1"; }; - propagatedBuildInputs = [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ]; + propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ]; + + checkPhase = '' + HOME=$(mktemp -d) ${python.interpreter} setup.py test + ''; meta = with stdenv.lib; { description = "A utility for sending notifications, on demand and when commands finish"; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 55eb4e7c97eb..67e2782b53a4 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.5.25"; + version = "0.6.0.4"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa"; + sha256 = "01vm8mqhpdrwlxw6rxbg3wz51njq69yn862141mja00mllg3j7pg"; }; buildInputs = stdenv.lib.optionals doCheck [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index 9525be4cb341..dc06ab63d2d9 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "outcome"; - version = "0.1.0"; + version = "1.0.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "d54e5d469088af53022f64a753b288d6bab0fe42e513eb7146137d560e2e516e"; + sha256 = "0wdcakx1r1317bx6139k9gv6k272fryid83d1kk0r43andfw0n4x"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 721385f3ed6a..bc4c4b20aa4a 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.4.2"; + version = "4.4.3"; nativeBuildInputs = [ sphinx manuel ]; propagatedBuildInputs = [ zope_interface ]; src = fetchPypi { inherit pname version; - sha256 = "451c756b4f4faa5f06f87d57f5928758bb3a16a586ceaa8773c35367188eddf9"; + sha256 = "05hi8yfvxl5ns7y7xhbgbqp78ydaxabjp5b64r4nmrfdfsqylrb7"; }; meta = { diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 01c387928f59..915c48f069a6 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.15"; + version = "8.9.16"; src = fetchPypi { inherit pname version; - sha256 = "8e9664ce0a838c81f4fb3e4d271c76859d26bde57242d64fe1632ab636f5319f"; + sha256 = "1camfcbvbl0xljxmd4h8smcfg3ris19jjznjv5zcbrxr28fafq74"; }; meta = { diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 30293e9798b3..e2fb97d20d48 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.1.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "2e565c8907ea6f9c517423cf5452e4f4b85635bd0dd400aae943339c826d4176"; + sha256 = "1bsjk4crf9p08lmgmiibmk8w8kmlrfadyly5l12zz1d330acijl1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index bb8e0ed8ce58..0cfe2dd1b605 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "podcastparser"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "gpodder"; repo = "podcastparser"; rev = version; - sha256 = "1mhg7192d6s1ll9mx1b63yfj6k4cnv4i95jllbnydyjv9ykkv0k1"; + sha256 = "10bk93fqsws360q1gkjvfzjda3351169zbr6v5lq9raa3mg1ln52"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 841e003bc897..b35c9de19dcc 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -9,14 +9,14 @@ # the executables of git, mercurial and bazaar. buildPythonPackage rec { - version = "2.6"; + version = "2.7"; pname = "powerline"; name = pname + "-" + version; src = fetchurl { url = "https://github.com/powerline/powerline/archive/${version}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272"; + sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5"; }; propagatedBuildInputs = [ psutil pygit2]; diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index 5a05f2dcafa4..26dcd244c510 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.2"; pname = "poyo"; src = fetchPypi { inherit pname version; - sha256 = "1f48ffl0j1f2lmgabajps7v8w90ppxbp5168gh8kh27bjd8xk5ca"; + sha256 = "07fdxlqgnnzb8r6lasvdfjcbd8sb9af0wla08rbfs40j349m8jn3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 8f43cbfb4a8c..f8f3d5458a08 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "praw"; - version = "5.4.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; + sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i"; }; postPatch = '' diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index b59327cd0590..950d478b30f8 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "prawcore"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "prawcore"; rev = "v${version}"; - sha256 = "0v16n6bzf483i00bn0qykrg3wvw9dbnfdl512pw8n635ld1g7cb8"; + sha256 = "1j905wi5n2xgik3yk2hrv8dky318ahfjl5k1zs21mrl81jk0907f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 0c76974e5d99..028af67b9af8 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2016.2"; + version = "2018.1"; src = fetchPypi { inherit pname version; - sha256 = "0njhi49d9fxbwh5p8yjx8m3jlfyzfm00b5aff6bz473pn7vxfn79"; + sha256 = "0vl7rbqyxa2vfa02dg7f5idf1j7awpfcj0dg46ks59xp8539g2wd"; }; propagatedBuildInputs = [ pygments urwid ]; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 8ebb88fa6a73..d588ebb12e47 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,12 +13,13 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ pandas pytest pytestrunner JPype1 ]; + checkInputs = [ pandas pytest ]; PYARROW_BUILD_TYPE = "release"; PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; preCheck = '' + rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py rm pyarrow/tests/test_cuda.py @@ -43,6 +44,14 @@ buildPythonPackage rec { setupPyBuildFlags = ["--with-parquet" ]; + checkPhase = '' + mv pyarrow/tests tests + rm -rf pyarrow + mkdir pyarrow + mv tests pyarrow/tests + pytest -v + ''; + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = https://arrow.apache.org/; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 23633ce248db..cd9c054ddcaa 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi -, nose, pyparsing, decorator, six }: +, nose, pyparsing, decorator, six, future }: buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.3"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d"; + sha256 = "8b6ad8750bbb712b1c7b8f89772b42baeefd35b3c7085233e8027b92f277e073"; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ pyparsing decorator six ]; + propagatedBuildInputs = [ pyparsing decorator six future ]; meta = with stdenv.lib; { description = "Allows to declare constraints on function parameters and return values"; diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 90d573aaaa77..c1a7f19b1260 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "1.17"; + version = "18.5.26"; src = fetchPypi { inherit pname version; - sha256 = "1qvhq0c9xsh6d4apcvjphfzl6xnwhnk4jvhr8x2fdfnmb034lc26"; + sha256 = "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 0770c78b674b..cbadd5188977 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydub"; - version = "0.22.1"; + version = "0.23.0"; # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; repo = pname; rev = "v${version}"; - sha256 = "0xqyvzgdfy01p98wnvsrf6iwdfq91ad377r6j12r8svm13ygx5bv"; + sha256 = "1ijp9hlxi2d0f1ah9yj9j8cz18i9ny9jwrf2irvz58bgyv29m8bn"; }; diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index c463ab8823c8..474728835e22 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pylama"; - version = "7.5.5"; + version = "7.6.5"; src = fetchPypi { inherit pname version; - sha256 = "1zg7wca9s5srvbj3kawalv4438l47hg7m6gaw8rd4i43lbyyqya6"; + sha256 = "0277pr066vg1w8ip6kdava7d5daiv7csixpysb37ss140k222iiv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 1a3eb0475105..a331f5e11755 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,19 +5,15 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.4.3"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3"; + sha256 = "c262ceca4dac67b8b523956833c52443420eabc3321a07185990b358b8ba13a7"; }; - # Remove test asizeof.flatsize(), broken and can be missed as - # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22 - patchPhase = '' - substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize" - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n," - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e" + postPatch = '' + rm test/asizeof/test_asizeof.py ''; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index 7130e8b499f3..7c01e3e093bd 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyramid_multiauth"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1lq292qakrm4ixi4vaif8dqywzj08pn6qy0wi4gw28blh39p0msk"; + sha256 = "0lprqjyg3zcji6033p1l3s4nigjigc5423wgivkfhz46vq0jmniy"; }; propagatedBuildInputs = [ pyramid ]; diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index ddc47dfc2959..ba72bf4be94b 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyRFC3339"; - version = "0.2"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "1pp648xsjaw9h1xq2mgwzda5wis2ypjmzxlksc1a8grnrdmzy155"; + sha256 = "06jv7ar7lpvvk0dixzwdr3wgm0g1lipxs429s2z7knwwa7hwpf41"; }; propagatedBuildInputs = [ pytz ]; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f004ab1054dd..7d592c7b450b 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180908"; + version = "18-08-3"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "50dc113e99d82e70e84fc2e812333733708be4ed"; - sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k"; + rev = version; + sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg"; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index db17d60b6280..481e4154ddb3 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,27 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, django, setuptools_scm -, fetchpatch +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, django +, setuptools_scm +, django-configurations +, pytest_xdist +, six }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.1.2"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"; + sha256 = "b379282feaf89069cb790775ab6bbbd2bd2038a68c7ef9b84a41898e0b551081"; }; buildInputs = [ pytest setuptools_scm ]; + checkInputs = [ django-configurations pytest_xdist six ]; propagatedBuildInputs = [ django ]; - patches = [ - # Unpin setuptools-scm - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; - sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws"; - }) - ]; - # Complicated. Requires Django setup. doCheck = false; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 508f18e6da00..0c4d77612b0b 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-jsonrpc-server"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "0p5dj1hxx3yz8vjk59dcp3h6ci1hrjkbzf9lr3vviy0xw327409k"; + sha256 = "1xp6xipslw8d1yv05mjmhql07kz04ibci5psjrv6rapqi6jp4bgk"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix new file mode 100644 index 000000000000..d245d472a007 --- /dev/null +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, pytz +, glibcLocales +}: + +buildPythonPackage rec { + version = "0.6.3"; + pname = "python-rapidjson"; + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085"; + }; + + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + + # buildInputs = [ ]; + checkInputs = [ pytest pytz ]; + # propagatedBuildInputs = [ ]; + + checkPhase = '' + pytest tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-rapidjson/python-rapidjson; + description = "Python wrapper around rapidjson "; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 88a2dd2abbf1..451138fa38d8 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "python-sql"; - version = "0.9"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c"; + sha256 = "05ni936y0ia9xmryl7mlhbj9i80nnvq1bi4zxhb96rv7yvpb3fqb"; }; meta = { homepage = http://python-sql.tryton.org/; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5bb20ae8e77c..5af4383d44b3 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }: +{ stdenv +, fetchPypi +, buildPythonPackage +, certifi +, future +, urllib3 +, tornado +, pytest +}: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "10.1.0"; + version = "11.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639"; + sha256 = "cca4e32ebb8da7fdf35ab2fa2b3edd441211364819c5592fc253acdb7561ea5b"; }; prePatch = '' @@ -16,10 +24,14 @@ buildPythonPackage rec { --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + + touch LICENSE.dual ''; - propagatedBuildInputs = [ certifi future urllib3 ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ certifi future urllib3 tornado ]; + # tests not included with release doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 654b851b6635..b7744ce79c3b 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "python-utils"; - version = "2.2.0"; + version = "2.3.0"; name = pname + "-" + version; src = fetchFromGitHub { owner = "WoLpH"; repo = "python-utils"; rev = "v${version}"; - sha256 = "1i3q9frai08nvrcmh4dg4rr0grncm68w2c097z5g1mfwdf9sv7df"; + sha256 = "14gyphcqwa77wfbnrzj363v3fdkxy08378lgd7l3jqnpvr8pfp5c"; }; checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 016266dd8544..69dd88f6a6c5 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.4.4"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "12l71wh9fcd79d6c7qfzp029iph6gv4daxpg2ddpzr9lrvcw3yah"; + sha256 = "15n6ywfkx5vap0bvayh6n572kw5fkqnzpq5ga4a4d7v52nnxbba1"; }; propagatedBuildInputs = [ qtpy six pyside ]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index e433d922e10f..a2e261284d83 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.4.2"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "1d1a4343540433a203280f162d43226e4c87489155fe4a9a6f1923ba11362bf9"; + sha256 = "1kdbr8kwryjskhs6mp11jj02h4jdxvlzbzdn1chw30kcb280ysac"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index d6c333ce36de..2e8693fae41f 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "readme_renderer"; - version = "21.0"; + version = "22.0"; src = fetchPypi { inherit pname version; - sha256 = "422404013378f0267ee128956021a47457db8eb487908b70b8a7de5fa935781a"; + sha256 = "1lj3k3x7wm0w5xdy82jwl0fmchqmlkdh24g41n3lka7ybxqahz13"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 565e6ef5bbf4..d5305781ef5c 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "0.9.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1sw516ihfrb7i9bfl1n3049akvb23mpsk3llh7w3xfnbvkfrpip0"; + sha256 = "162rad86slg4gmzxy33pnyyzm4hhcszcpjpw1vk79f3gxzvy8j8x"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 6d1264dee67e..8062834e1803 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -6,18 +6,18 @@ buildPythonPackage rec { pname = "requests_download"; - version = "0.1.1"; + version = "0.1.2"; format = "wheel"; #src = pkgs.fetchurl { - # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; - # sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl; + # sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; #}; src = fetchPypi { inherit pname version format; - sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index b0a761567f2d..e7ce3b5b50d6 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rply"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "alex"; repo = "rply"; rev = "v${version}"; - sha256 = "0v05gdy5dval30wvz96lywvz2jyf000dp0pnrd1lwdx3cyywq659"; + sha256 = "0a9r81kaibgr26psss02rn2nc6bf84a8q9nsywkm1xcswy8xrmcx"; }; buildInputs = [ appdirs ]; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index c6cd2521292a..a8997e279b27 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv +, buildPythonPackage +, fetchurl +, glibcLocales +}: buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.3"; - name = "${pname}-${version}"; + version = "0.5.5"; src = fetchurl { - url = "https://releases.pagure.org/${pname}/${name}.tar.xz"; - sha256 = "1i45f012ngpxs83m3dpmaj3hs8z7r9sbf05vnvzgs3hpgsbhxa7r"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "lightweight way of building RPMs, and sabotaging them"; homepage = https://pagure.io/rpmfluff; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index f907f72ff244..61447e740265 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = if isPy27 then "2.8.6" # python2 support dropped in 2.9.x else - "2.9.3"; + "2.9.4"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = if isPy27 then "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x else - "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; # 2.9.x + "0bl1d2qhavmlrvalir9hmkjh74w21vzkvc2sg3cbb162s10zfmxy"; # 2.9.x }; buildInputs = [ readline diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 7f8ba49e0274..6183596ef7dd 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rx"; - version = "1.6.0"; + version = "1.6.1"; # There are no tests on the pypi source src = fetchFromGitHub { owner = "ReactiveX"; repo = "rxpy"; rev = version; - sha256 = "174xi2j36igxmaqcgl5p64p31a7z19v62xb5czybjw72gpyyfyri"; + sha256 = "14bca67a26clzcf2abz2yb8g9lfxffjs2l236dp966sp0lfbpsn5"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 79ad778e048a..ee86d8869fe8 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "0.3.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1h0waw4jd5ql68y5kxb9irwapkbkwfs1w0asvbl24fq5f8czdijm"; + sha256 = "0nrkbbmr9k1bqfmv9wg5aslxzkkifcd62fm04n6844nf5mya00qh"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index 45db62db8e55..191e79a4556b 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.11.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "ea095dd1d0e131874bc9930c3965bce3d1d70be5adb2a30d811fcaea4708a9ee"; + sha256 = "0cjyc19v46lwrhdyc18f87z589rhqg7zjg0s8a05w6mv3262b6ai"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index cd4a6389a351..b64b53fb2fbb 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , buildPythonPackage , geckodriver +, urllib3 , xorg }: @@ -22,17 +23,17 @@ in buildPythonPackage rec { pname = "selenium"; - version = "3.8.1"; + version = "3.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1lqm2md84g11g7lqi94xqb5lydm93vgmlznfhf27g6sy9ayjvgcs"; + sha256 = "ab192cd046164c40fabcf44b47c66c8b12495142f4a69dcc55ea6eeef096e614"; }; buildInputs = [xorg.libX11]; propagatedBuildInputs = [ - geckodriver + geckodriver urllib3 ]; patchPhase = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 57cafe2624c5..6fa265517dfa 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.2.6"; + version = "1.2.7"; src = fetchPypi { inherit pname version; - sha256 = "0x1hja3jzvh7xmd0sxnfw9hi3k419s95vb7jjzh76yydzvss1r2q"; + sha256 = "06biyiwq9571mryzbr50am3mxpc3blscwqhiq8c66ac4xm3maszm"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 831cfede950a..ca304fc10f67 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "simpleeval"; - version = "0.9.6"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "848fdb9ee5f30cf93b9f0d840db6e7562633d20abf7d67c2382a0a2162a79410"; + sha256 = "00fzwbjg98lsnmfzmbgzg1k8q8iqbahcxjnnlhzhb44phrhcxql5"; }; meta = { homepage = https://github.com/danthedeckie/simpleeval; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index f1a5bf6ed9f2..5896437e61d6 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.6.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "c2c2b44125a03d6e96efdf3e53e28be99e1f548e8a4fa8035f8fab448bbdbbda"; + sha256 = "0lwlvvz7qndq89i8bhjv4zfkhg0lbd5yjhccb7svszf30k8niiap"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index b80e5655ff99..dcb49a43413e 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sortedcollections"; - version = "0.4.2"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "12dlzln9gyv8smsy2k6d6dmr0ywrpwyrr1cjy649ia5h1g7xdvwa"; + sha256 = "12q1gf81l53mv634hk259aql69k9572nfv5gsn8gxlywdly2z63b"; }; buildInputs = [ sortedcontainers ]; diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix new file mode 100644 index 000000000000..badc99f5e377 --- /dev/null +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, click +}: + +buildPythonPackage rec { + pname = "spark_parser"; + version = "1.8.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c5e6064afbb3c114749016d585b0e4f9222d4ffa97a1854c9ab70b25783ef48"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + description = ''An Early-Algorithm Context-free grammar Parser''; + homepage = "https://github.com/rocky/python-spark"; + license = licenses.mit; + maintainers = with maintainers; [raskin]; + }; + +} diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 6d5d9df0a6fb..36042a72ea88 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "statsd"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3fa92bf0192af926f7a0d9be031fe3fd0fbaa1992d42cf2f07e68f76ac18288e"; + sha256 = "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 1df139ab29ce..d867f94a310b 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stem"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp"; + sha256 = "1awiglfiajnx2hva9aqpj3fmdvdb4qg7cwnlfyih827m68y3cq8v"; }; postPatch = '' diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f667f17f77df..a4130502e4b9 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -3,34 +3,30 @@ , fetchPypi , fetchpatch , pytest +, python-rapidjson , pretend , freezegun +, twisted , simplejson , six +, pythonAtLeast }: buildPythonPackage rec { pname = "structlog"; - version = "17.2.0"; + version = "18.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; + sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4"; }; - patches = [ - # Fix tests for pytest 3.3 - (fetchpatch { - url = "https://github.com/hynek/structlog/commit/22f0ae50607a0cb024361599f84610ce290deb99.patch"; - sha256 = "03622i13ammkpyrdk48kimbz94gbkpcmdpy0kj2z09m1kp6q2ljv"; - }) - ]; - - checkInputs = [ pytest pretend freezegun simplejson ]; + checkInputs = [ pytest pretend freezegun simplejson twisted ] + ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; propagatedBuildInputs = [ six ]; checkPhase = '' - rm tests/test_twisted.py* + # rm tests/test_twisted.py* py.test ''; diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index f42a4a02be80..31481e0ba172 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "transaction"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "f2242070e437e5d555ea3df809cb517860513254c828f33847df1c5e4b776c7a"; + sha256 = "1nak7cwyavrc3pdr6nxp2dnhrkkv9ircaii765zrs3kkkzgwn5zr"; }; propagatedBuildInputs = [ zope_interface mock ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index ab816cde8355..215f39da30b4 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -9,22 +9,24 @@ , pyopenssl , trustme , sniffio +, jedi +, pylint }: buildPythonPackage rec { pname = "trio"; - version = "0.7.0"; + version = "0.9.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0df152qnj4xgxrxzd8619f8h77mzry7z8sp4m76fi21gnrcr297n"; + sha256 = "6d905d950dfa1db3fad6b5ef5637c221947123fd2b0e112033fecfc582318c3b"; }; - checkInputs = [ pytest pyopenssl trustme ]; + checkInputs = [ pytest pyopenssl trustme jedi pylint ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. checkPhase = '' - py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname' + HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid' ''; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 5a32a64c2962..4abc8af50374 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.8.0"; + version = "6.19.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1vi3m6kvbmv643jbz95q59rcn871y0sss48kw2nqziyr5iswfx8c"; + sha256 = "09c95xyfcjmsjcklz829ariayvdy08zs1p5v8zay7zwxkm017qsm"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index dfcce835e658..4c031c20aa1e 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -6,18 +6,19 @@ , requests_toolbelt , tqdm , pyblake2 +, readme_renderer }: buildPythonPackage rec { pname = "twine"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g"; + sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c"; }; - propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ]; + propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; # Requires network doCheck = false; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 2fb7e83c3b16..a17ecc0e592c 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.0.2"; + version = "18.3.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ce50fdd00abb8b490b72809a2c664684f67f3c9467f392642d36f58309395a87"; + sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an"; }; # Skip a failing test until fixed upstream: diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index de06ddbe2ce5..55be51362f42 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.6.5"; + version = "3.6.6"; src = fetchPypi { inherit pname version; - sha256 = "09xxykw8mk30r0g33r2gy5qlqw3sqj5vkp6h7nh0flp59hxqw2hw"; + sha256 = "07vhddjnd3mhdijyc3s0mwi9jgfjp3rr056nxqiavydbvkrvgrsi"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 89edc8f184ca..f0428f176034 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -3,19 +3,30 @@ , fetchPypi , spark_parser , xdis +, nose +, pytest +, hypothesis +, six }: buildPythonPackage rec { pname = "uncompyle6"; - version = "2.8.3"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1"; + sha256 = "bd882f3c979b49d28ba7accc5ce7380ced8cab12e782e9170769ca15f0b81f8a"; }; + checkInputs = [ nose pytest hypothesis six ]; propagatedBuildInputs = [ spark_parser xdis ]; + # six import errors (yet it is supplied...) + checkPhase = '' + pytest ./pytest --ignore=pytest/test_build_const_key_map.py \ + --ignore=pytest/test_grammar.py + ''; + meta = with stdenv.lib; { description = "Python cross-version byte-code deparser"; homepage = https://github.com/rocky/python-uncompyle6/; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix new file mode 100644 index 000000000000..b3c2ce714ce4 --- /dev/null +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, awkward +}: + +buildPythonPackage rec { + version = "0.2.5"; + pname = "uproot-methods"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d5563b3335af414a12caf5b350c952fdc7576abb17630382de5564a7c254ae6"; + }; + + propagatedBuildInputs = [ numpy awkward ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/uproot-methods; + description = "Pythonic mix-ins for ROOT classes"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e2cc1105f093..120f728365d3 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,17 +1,30 @@ -{lib, fetchPypi, buildPythonPackage, numpy}: +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, python-lz4 +, uproot-methods +, awkward +, cachetools +, pythonOlder +, pytestrunner +, pytest +, backports_lzma +}: buildPythonPackage rec { pname = "uproot"; - version = "2.9.11"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "da71e9e239129ec2ae7a62f9d35aebd46456f05e000ef14f32fe2c9fa8ec92c2"; + sha256 = "af0a093f0788b8983d07b88fac3094b26c3e28358bc10cdb8d757cc07956f8d4"; }; - propagatedBuildInputs = [ - numpy - ]; + buildInputs = [ pytestrunner ]; + checkInputs = [ pytest ] + ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ]; + propagatedBuildInputs = [ numpy python-lz4 cachetools uproot-methods awkward ]; meta = with lib; { homepage = https://github.com/scikit-hep/uproot; diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index 10808bffaab2..c27d13ab8f12 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "validictory"; - version = "1.0.0a2"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "c02388a70f5b854e71e2e09bd6d762a2d8c2a017557562e866d8ffafb0934b07"; + sha256 = "1fim11vj990rmn59qd67knccjx1p4an7gavbgprpabsrb13bi1rs"; }; doCheck = false; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index e0e842a773d0..13f7753831b4 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "1.13.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7031f9c78a70b9586d2db4a2ec135c4e04194cabff58695ef0cc95e7cd66bc01"; + sha256 = "0kws7l3hci1dvjv01nxw3805q9v2mwldw58bgl8s90wqism69gjp"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 0f75be8be177..46a5bd533b28 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "warlock"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0npgi4ks0nww2d6ci791iayab0j6kz6dx3jr7bhpgkql3s4if3bw"; + sha256 = "01kajxvjp5n1p42n1kvv7rfcj2yyr44zmmzk48pywryfixr3yh6p"; }; propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 89be87e18491..498c1c401f81 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -1,14 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales }: buildPythonPackage rec { pname = "whichcraft"; - version = "0.4.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd"; + sha256 = "fecddd531f237ffc5db8b215409afb18fa30300699064cca4817521b4fc81815"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 5973414f8dc5..76e424cf0118 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,20 +1,25 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytest , six +, click }: buildPythonPackage rec { pname = "xdis"; - version = "3.2.4"; + version = "3.8.8"; src = fetchPypi { inherit pname version; - sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk"; + sha256 = "4d212df8a85ab55a35f6ad71b2c29818d903c3e6a95e31eb26d5f3fc66a4e015"; }; - propagatedBuildInputs = [ nose six ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six click ]; + + # newest release moves to pytest (tests not packaged with release) + doCheck = false; meta = with stdenv.lib; { description = "Python cross-version byte-code disassembler and marshal routines"; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index f9a735c97ab3..5ca6e03fbf45 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "xdot"; - version = "0.9"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3"; + sha256 = "18a2ri8vggaxy7im1x9hki34v519y5jy4n07zpqq5br9syb7h1ky"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index d72b1999030a..f9db994ba72c 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.11.1"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "e9b7dec24921ef13180902e5dbcaae9157c773e3e3e2780ef77d3a4dd67d799f"; + sha256 = "18syqspsal0w8s2lp49q6wmx02wf6wh1n0fscf5vcr53k8q8drn6"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 06c5fe3a1be0..b77215a2d246 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,16 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi -, netifaces, six, enum-compat }: +{ stdenv +, buildPythonPackage +, fetchPypi +, ifaddr +, typing +, isPy27 +, pythonOlder +, python +}: buildPythonPackage rec { pname = "zeroconf"; - version = "0.20.0"; + version = "0.21.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb"; + sha256 = "5b52dfdf4e665d98a17bf9aa50dea7a8c98e25f972d9c1d7660e2b978a1f5713"; }; - propagatedBuildInputs = [ netifaces six enum-compat ]; + propagatedBuildInputs = [ ifaddr ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + # tests not included with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} test_zeroconf.py + ''; meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8640d43775dc..b5aa0933c2e8 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,8 +21,8 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl -, msgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx +, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem +, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file }@args: let @@ -69,7 +69,7 @@ in }; capybara-webkit = attrs: { - buildInputs = [ qt48 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ qt59.qtbase qt59.qtwebkit ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; }; @@ -218,6 +218,14 @@ in ]; }; + magic = attrs: { + buildInputs = [ file ]; + postInstall = '' + installPath=$(cat $out/nix-support/gem-meta/install-path) + sed -e 's@ENV\["MAGIC_LIB"\] ||@ENV\["MAGIC_LIB"\] || "${file}/lib/libmagic.so" ||@' -i $installPath/lib/magic/api.rb + ''; + }; + msgpack = attrs: { buildInputs = [ msgpack ]; }; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 9c2419b53589..cd2fb21209c4 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { patchShebangs . ''; + # TODO: remove this preConfigure hook after 5.2.0 since it is fixed upstream + # see https://github.com/mozilla/rr/issues/2269 + preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto @@ -49,7 +53,7 @@ stdenv.mkDerivation rec { time the same execution is replayed. ''; - license = "custom"; + license = with stdenv.lib.licenses; [ mit bsd2 ]; maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; platforms = stdenv.lib.platforms.x86; }; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 95ee4e93f2a8..8d2b1d17b2d5 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,15 +3,15 @@ , go-md2man }: let - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { rev = "v${version}"; - owner = "projectatomic"; + owner = "containers"; repo = "buildah"; - sha256 = "0pc7bzcaafrz56glygzhnbilgaz4ca2kmklw8njfgamffbw4d54p"; + sha256 = "0b9pfi22qcqyp0im8vp02ibrwd49ghgi64d5l98z01cj52n2j2dz"; }; - goPackagePath = "github.com/projectatomic/buildah"; + goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { name = "buildah-${version}"; @@ -45,7 +45,7 @@ in buildGoPackage rec { meta = { description = "A tool which facilitates building OCI images"; - homepage = https://github.com/projectatomic/buildah; + homepage = https://github.com/containers/buildah; maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 9981bca3b68e..2331bbbe55fa 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.3.1"; + version = "11.4.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "13w8fjjc087klracv4ggjifj08vx3b549mhy220r5wn9aga5m549"; + sha256 = "1vzp9d7dygb44b9x6vfl913fggjkiimzjj9arybn468rc2kh0si6"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "10s2g6mqy7p5dmjmlxggsfqqqf4bfrqjri7m2nd11l1lf4mmr2kk"; + sha256 = "1krfd6ffzc78g7k04bkk32vzingplhn176jhw4p1ys19f4sqf5sw"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1k978zsvsvr7ys18zqjg6n45cwi3nj0919fwj442dv99s95zyf6s"; + sha256 = "0nhqnw6nk5q716ir0vdkqy0jj1vbxz014jx080zk44cdj7l62lrm"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix new file mode 100644 index 000000000000..8def71568e79 --- /dev/null +++ b/pkgs/development/tools/database/cdb/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, writeText }: + +let + version = "0.75"; + sha256 = "1iajg55n47hqxcpdzmyq4g4aprx7bzxcp885i850h355k5vmf68r"; + # Please don’t forget to update the docs: + # clone https://github.com/Profpatsch/cdb-docs + # and create a pull request with the result of running + # ./update <version> + # from the repository’s root folder. + docRepo = fetchFromGitHub { + owner = "Profpatsch"; + repo = "cdb-docs"; + rev = "359b6c55c9e170ebfc88f3f38face8ae2315eacb"; + sha256 = "1y0ivviy58i0pmavhvrpznc4yjigjknff298gnw9rkg5wxm0gbbq"; + }; + +in stdenv.mkDerivation { + name = "cdb-${version}"; + + src = fetchurl { + url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "bin" "doc" "out" ]; + + postPatch = '' + # A little patch, borrowed from Archlinux AUR, borrowed from Gentoo Portage + sed -e 's/^extern int errno;$/#include <errno.h>/' -i error.h + ''; + + postInstall = '' + # don't use make setup, but move the binaries ourselves + mkdir -p $bin/bin + install -m 755 -t $bin/bin/ cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest + + # patch paths in scripts + function cdbmake-subst { + substituteInPlace $bin/bin/$1 \ + --replace /usr/local/bin/cdbmake $bin/bin/cdbmake + } + cdbmake-subst cdbmake-12 + cdbmake-subst cdbmake-sv + + # docs + mkdir -p $doc/share/cdb + cp -r "${docRepo}/docs" $doc/share/cdb/html + ''; + + meta = { + homepage = "https://cr.yp.to/cdb"; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.Profpatsch ]; + platforms = [ lib.platforms.unix ]; + }; +} diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix new file mode 100644 index 000000000000..5e1a69a16929 --- /dev/null +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-junit-report-unstable-${version}"; + version = "2018-06-14"; + rev = "385fac0ced9acaae6dc5b39144194008ded00697"; + + goPackagePath = "github.com/jstemmer/go-junit-report"; + + src = fetchFromGitHub { + inherit rev; + owner = "jstemmer"; + repo = "go-junit-report"; + sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; + }; + + meta = with stdenv.lib; { + description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; + homepage = "https://${goPackagePath}"; + maintainers = with maintainers; [ cryptix ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 64921ec6e10e..bb44074dfc75 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,9 +1,9 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gocode-${version}"; - version = "20180727-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "00e7f5ac290aeb20a3d8d31e737ae560a191a1d5"; + name = "gocode-unstable-${version}"; + version = "2018-10-22"; + rev = "e893215113e5f7594faa3a8eb176c2700c921276"; goPackagePath = "github.com/mdempsky/gocode"; @@ -13,12 +13,15 @@ buildGoPackage rec { allowGoReference = true; src = fetchFromGitHub { + inherit rev; + owner = "mdempsky"; repo = "gocode"; - inherit rev; - sha256 = "0vrwjq4r90za47hm88yx5h2mvkv7y4yaj2xbx3skg62wq2drsq31"; + sha256 = "1zsll7yghv64890k7skl0g2lg9rsaiisgrfnb8kshsxrcxi1kc2l"; }; + goDeps = ./deps.nix; + preBuild = '' # getting an error building the testdata because they contain invalid files # on purpose as part of the testing. diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix new file mode 100644 index 000000000000..4eefdd9c6d04 --- /dev/null +++ b/pkgs/development/tools/gocode/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6fe81c087942f588f40c3f67b41ce284f2f70eee"; + sha256 = "04yl7rk2lf94bxz74ja5snh7ava9gcnf2yx6y002pfkk538r6w5d"; + }; + } +] diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index c11e6f15ce96..1a421cc47ed6 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.2"; + version = "2.6.3"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "1q96z0pvkqgb4194m52z89q56cbc0g3faflyfpy55z099f655rx9"; + sha256 = "000ax5vzirrhiykk86fmy4hibhl3pab0gkh5y35hiwhzhw5rwzk8"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix new file mode 100644 index 000000000000..25bc79340001 --- /dev/null +++ b/pkgs/development/tools/kind/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +with stdenv.lib; + +buildGoPackage rec { + name = "kind-${version}"; + version = "2018-10-03-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2ae73f8ef93609991b0e47a67825390ceec95b3f"; + + src = fetchFromGitHub { + rev = rev; + owner = "kubernetes-sigs"; + repo = "kind"; + sha256 = "0bg3y35sc1c73z4rfq11x1jz340786q91ywm165ri7vx280ffjgh"; + }; + + goPackagePath = "sigs.k8s.io/kind"; + excludedPackages = "images/base/entrypoint"; + + meta = { + description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; + homepage = https://github.com/kubernetes-sigs/kind; + maintainers = with maintainers; [ offline ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix new file mode 100644 index 000000000000..2ea69a0c56b5 --- /dev/null +++ b/pkgs/development/tools/kube-prompt/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kube-prompt-${version}"; + version = "1.0.4"; + rev = "v${version}"; + + goPackagePath = "github.com/c-bata/kube-prompt"; + + src = fetchFromGitHub { + inherit rev; + owner = "c-bata"; + repo = "kube-prompt"; + sha256 = "09c2kjsk8cl7qgxbr1s7qd9br5shf7gccxvbf7nyi6wjiass9yg5"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "An interactive kubernetes client featuring auto-complete using go-prompt"; + license = lib.licenses.mit; + homepage = https://github.com/c-bata/kube-prompt; + maintainers = [ lib.maintainers.vdemeester ]; + }; +} diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix new file mode 100644 index 000000000000..393b69a2a331 --- /dev/null +++ b/pkgs/development/tools/kube-prompt/deps.nix @@ -0,0 +1,309 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "aad3f485ee528456e0768f20397b4d9dd941e755"; + sha256 = "1cgabmg76axkbpm7zip3ym2mym6kwgc9cw9kil0inmckkh3x1ky8"; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; + fetch = { + type = "git"; + url = "https://github.com/c-bata/go-prompt"; + rev = "c52492ff1b386e5c0ba5271b5eaad165fab09eca"; + sha256 = "14k8anchf0rcpxfbb2acrajdqrfspscbkn47m4py1zh5rkk6b9p9"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4"; + sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; + sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "9cad4c3443a7200dd6400aef47183728de563a38"; + sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "ab8a2e0c74be9d3be70b3184d9acc634935ded82"; + sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; + sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; + sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + }; + } + { + goPackagePath = "github.com/petar/GoLLRB"; + fetch = { + type = "git"; + url = "https://github.com/petar/GoLLRB"; + rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; + sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; + sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "cda20d4ac917ad418d86e151eff439648b06185b"; + sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; + sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; + sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "ef147856a6ddbb60760db74283d2424e98c87bff"; + sha256 = "1q1vm1z40fx1grlrm7az4rln6v5pj9xi5n1cjqg5xgq4dsk9132y"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; + sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; + sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "072894a440bdee3a891dea811fe42902311cd2a3"; + sha256 = "1hlbfwak4adwkj74jdiw8kmapri9rqmmjssncqiq0xnwlkcyn0ig"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; + sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65"; + sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s"; + }; + } +] \ No newline at end of file diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ce297df13c3a..15ae07962c59 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -3,9 +3,9 @@ buildGoPackage rec { name = "kustomize-${version}"; - version = "1.0.8"; + version = "1.0.9"; # rev is the 1.0.8 commit, mainly for kustomize version command output - rev = "58492e2d83c59ed63881311f46ad6251f77dabc3"; + rev = "ec86b30d2b01a8fa62e645f024f26bfea5dcd30d"; goPackagePath = "sigs.k8s.io/kustomize"; @@ -17,7 +17,7 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx"; + sha256 = "06a0iic8sp745q71bh0k2zbcdhppp85bx9c3fwwr4wl77dlybz4f"; rev = "v${version}"; repo = "kustomize"; owner = "kubernetes-sigs"; @@ -32,6 +32,6 @@ buildGoPackage rec { ''; homepage = https://github.com/kubernetes-sigs/kustomize; license = licenses.asl20; - maintainers = [ maintainers.carlosdagos maintainers.vdemeester ]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis ]; }; } diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 8c210cb93601..59f60d4046ad 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.2.0"; + version = "2.2.1"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "05is1r5y06jfqwvka90dn2ffxnvbgyswaxl00aqz6455hnggnxvm"; + sha256 = "1i11lan7fqs3lg0s6jfr8sflzwn5nk1ln5j6afjrkrdb08291dr7"; }; # meta is all the information about the package.. diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index f6ff4ad3650d..7810ba6349ce 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ php makeWrapper flex ]; unpackPhase = '' - cp -R ${libphutil} libphutil - cp -R ${arcanist} arcanist + cp -aR ${libphutil} libphutil + cp -aR ${arcanist} arcanist chmod +w -R libphutil arcanist ''; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 8f5948c3c112..3f42e71e7783 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: let - version = "0.13.0"; + version = "0.12.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "13r9q8c209gkgcmbjhj9z4r5bmi90rxahdsiqm5jx8sr2pia5xbh"; + sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix new file mode 100644 index 000000000000..e0b744c83593 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, ocamlPackages, dune }: + +with ocamlPackages; + +if !stdenv.lib.versionAtLeast ocaml.version "4.05" +then throw "ocamlformat is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "0.8"; + pname = "ocamlformat"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "ocaml-ppx"; + repo = pname; + rev = version; + sha256 = "1i7rsbs00p43362yv7z7dw0qsnv7vjf630qk676qvfg7kg422w6j"; + }; + + buildInputs = [ + ocaml + dune + findlib + base + cmdliner + fpath + ocaml-migrate-parsetree + stdio + ]; + + configurePhase = '' + patchShebangs tools/gen_version.sh + tools/gen_version.sh src/Version.ml version + ''; + + buildPhase = '' + dune build -p ocamlformat + ''; + + inherit (dune) installPhase; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ stdenv.lib.maintainers.Zimmi48 ]; + license = stdenv.lib.licenses.mit; + inherit (ocamlPackages.ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 1d23f5426a55..7d4a58d0e394 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.10.9"; + version = "2018.10.13"; src = fetchPypi { inherit pname version; - sha256 = "0b0safavjxq6malmv44acmgds21m2sp1wqa7gs0qz621v6gcgq4j"; + sha256 = "0qwflq00rwk3pnldndb30f3avnbi4hvv6c8mm6l5xxnxy9dj71d7"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix index b2497633a680..a2d98bcf2387 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "pyprof2calltree"; - version = "1.4.3"; + version = "1.4.4"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "pwaller"; repo = "pyprof2calltree"; rev = "v" + version; - sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5"; + sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; }; meta = with lib; { diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index fe80d0d9dd19..970ace229e20 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1m1chwmfgj74xrmn4gb9yz5kx8c408a1hlqmpcq780kqj0k927i9"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; homepage = https://github.com/eqrion/cbindgen; diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix new file mode 100644 index 000000000000..bd8a013fe2d0 --- /dev/null +++ b/pkgs/development/tools/scalafix/default.nix @@ -0,0 +1,43 @@ +{ stdenv, jdk, jre, coursier, makeWrapper }: + +let + baseName = "scalafix"; + version = "0.9.0"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0"; + }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + buildInputs = [ jdk makeWrapper deps ]; + + doCheck = true; + + phases = [ "installPhase" "checkPhase" ]; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/${baseName} \ + --add-flags "-cp $CLASSPATH scalafix.cli.Cli" + ''; + + checkPhase = '' + $out/bin/${baseName} --version | grep -q "${version}" + ''; + + meta = with stdenv.lib; { + description = "Refactoring and linting tool for Scala"; + homepage = https://scalacenter.github.io/scalafix/; + license = licenses.bsd3; + maintainers = [ maintainers.tomahna ]; + }; +} diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix new file mode 100644 index 000000000000..56d290dd7248 --- /dev/null +++ b/pkgs/development/tools/skaffold/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "skaffold-${version}"; + version = "0.16.0"; + # rev is the 0.16.0 commit, mainly for skaffold version command output + rev = "78e443973ee7475ee66d227431596351cf5e2caf"; + + goPackagePath = "github.com/GoogleContainerTools/skaffold"; + subPackages = ["cmd/skaffold"]; + + buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in '' + -ldflags= + -X ${t}/version.version=v${version} + -X ${t}/version.gitCommit=${rev} + -X ${t}/version.buildDate=unknown + ''; + + src = fetchFromGitHub { + owner = "GoogleContainerTools"; + repo = "skaffold"; + rev = "v${version}"; + sha256 = "0vpjxyqppyj4zs02n8b0k0qd8zidrrcks60x6qd5a4bbqa0c1zld"; + }; + + meta = { + description = "Easy and Repeatable Kubernetes Development"; + homepage = https://github.com/GoogleContainerTools/skaffold; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ vdemeester ]; + }; +} diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix new file mode 100644 index 000000000000..ad556606c9ae --- /dev/null +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, buildGoPackage +, go +, makeWrapper +, nix-prefetch-git +, fetchFromGitHub +}: + +buildGoPackage rec { + name = "vgo2nix-${version}"; + version = "unstable-2018-10-14"; + goPackagePath = "github.com/adisbladis/vgo2nix"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + owner = "adisbladis"; + repo = "vgo2nix"; + rev = "a36137a2b9675f5e9b7e0a7840bc9fe9f2414d4e"; + sha256 = "1658hr1535v8w3s41q0bcgk8hmisjn8gcw7i3n2d2igszn1dp0q4"; + }; + + goDeps = ./deps.nix; + + allowGoReference = true; + + postInstall = with stdenv; let + binPath = lib.makeBinPath [ nix-prefetch-git go ]; + in '' + wrapProgram $bin/bin/vgo2nix --prefix PATH : ${binPath} + ''; + + meta = with stdenv.lib; { + description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; + homepage = https://github.com/adisbladis/vgo2nix; + license = licenses.mit; + maintainers = with maintainers; [ adisbladis ]; + }; + +} diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix new file mode 100644 index 000000000000..b8327cd6069f --- /dev/null +++ b/pkgs/development/tools/vgo2nix/deps.nix @@ -0,0 +1,12 @@ +[ + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "ded554d0681e"; + sha256 = "04rlq9hc3ccww9sbsrl48fl6wbjprb136rqxyr7dmgfj444aml56"; + }; + } +] diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 20c9a71aadd5..dade09ee5f6e 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/WebAssembly/wabt; license = licenses.asl20; maintainers = with maintainers; [ ekleog ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 69545a764c52..47a11e1b7f4d 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Fast, reliable, and secure dependency management for javascript"; license = licenses.bsd2; maintainers = [ maintainers.offline ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 09478001fb72..c0b07814aa57 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "rocksndiamonds"; - version = "4.1.0.0"; + version = "4.1.1.0"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0bmszf2hqyh76p3lzmhljcjwlx7jzpirwx9zyzgfvwqcapf5i6af"; + sha256 = "1k0m6l5g886d9mwwh6q0gw75qsb85mpf8i0rglh047app56nsk72"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix new file mode 100644 index 000000000000..1ccb351af4ab --- /dev/null +++ b/pkgs/games/scummvm/games.nix @@ -0,0 +1,125 @@ +{ stdenv, lib, fetchurl, makeDesktopItem, unzip, writeText +, scummvm }: + +let + desktopItem = name: short: long: description: makeDesktopItem { + categories = "Game;AdventureGame;"; + comment = description; + desktopName = long; + exec = "@out@/bin/${short}"; + genericName = description; + icon = "scummvm"; + name = name; + }; + + run = name: short: code: writeText "${short}.sh" '' + #!${stdenv.shell} -eu + + exec ${scummvm}/bin/scummvm \ + --path=@out@/share/${name} \ + --fullscreen \ + ${code} + ''; + + generic = { plong, pshort, pcode, description, version, files, docs ? [ "readme.txt" ], ... } @attrs: + let + attrs' = builtins.removeAttrs attrs [ "plong" "pshort" "pcode" "description" "docs" "files" "version" ]; + pname = lib.replaceStrings [ " " ":" ] [ "-" "" ] (lib.toLower plong); + in stdenv.mkDerivation ({ + name = "${pname}-${version}"; + + nativeBuildInputs = [ unzip ]; + + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/{applications,${pname},doc/${pname}} + + ${lib.concatStringsSep "\n" (map (f: "mv ${f} $out/share/doc/${pname}") docs)} + ${lib.concatStringsSep "\n" (map (f: "mv ${f} $out/share/${pname}") files)} + + substitute ${run pname pshort pcode} $out/bin/${pshort} \ + --subst-var out + substitute ${desktopItem pname pshort plong description}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop \ + --subst-var out + + chmod 0755 $out/bin/${pshort} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://www.scummvm.org; + license = licenses.free; # refer to the readme for exact wording + maintainers = with maintainers; [ peterhoeg ]; + inherit description; + inherit (scummvm.meta) platforms; + }; + } // attrs'); + +in { + beneath-a-steel-sky = generic rec { + plong = "Beneath a Steel Sky"; + pshort = "bass"; + pcode = "sky"; + description = "2D point-and-click science fiction thriller set in a bleak vision of the future"; + version = "1.2"; + src = fetchurl { + url = "mirror://sourceforge/scummvm/${pshort}-cd-${version}.zip"; + sha256 = "14s5jz67kavm8l15gfm5xb7pbpn8azrv460mlxzzvdpa02a9n82k"; + }; + files = [ "sky.*" ]; + }; + + drascula-the-vampire-strikes-back = generic rec { + plong = "Drascula: The Vampire Strikes Back"; + pshort = "drascula"; + pcode = "drascula"; + description = "Spanish 2D classic point & click style adventure with tons of humor and an easy interface"; + version = "1.0"; + # srcs = { + src = fetchurl { + url = "mirror://sourceforge/scummvm/${pshort}-${version}.zip"; + sha256 = "1pj29rpb754sn6a56f8brfv6f2m1p5qgaqik7d68pfi2bb5zccdp"; + }; + # audio = fetchurl { + # url = "mirror://sourceforge/scummvm/${pshort}-audio-flac-2.0.zip"; + # sha256 = "1zmqhrby8f5sj1qy6xjdgkvk9wyhr3nw8ljrrl58fmxb83x1rryw"; + # }; + # }; + sourceRoot = "."; + docs = [ "readme.txt" "drascula.doc" ]; + files = [ "Packet.001" ]; + }; + + flight-of-the-amazon-queen = generic rec { + plong = "Flight of the Amazon Queen"; + pshort = "fotaq"; + pcode = "queen"; + description = "2D point-and-click adventure game set in the 1940s"; + version = "1.1"; + src = fetchurl { + url = "mirror://sourceforge/scummvm/FOTAQ_Talkie-${version}.zip"; + sha256 = "1a6q71q1dl9vvw2qqsxk5h1sv0gaqy6236zr5905w2is01gdsp52"; + }; + sourceRoot = "."; + files = [ "*.1c" ]; + }; + + lure-of-the-temptress = generic rec { + plong = "Lure of the Temptress"; + pshort = "lott"; + pcode = "lure"; + description = "2D point-and-click adventure game with a fantasy theme"; + version = "1.1"; + src = fetchurl { + url = "mirror://sourceforge/scummvm/lure-${version}.zip"; + sha256 = "0201i70qcs1m797kvxjx3ygkhg6kcl5yf49sihba2ga8l52q45zk"; + }; + docs = [ "README" "*.txt" "*.pdf" "*.PDF" ]; + files = [ "*.vga" ]; + }; +} diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 694274053bfe..ac24f0c15a53 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -4,1746 +4,1737 @@ { amd64 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64"; - sha256 = "03yfjxzsyf14zqwxb43piyh78xxap7yxh5f4gx649qv28h7ygfrm"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64"; + sha256 = "074vbkdxaylb36ljkxz586jfcn7ghxzfivyiz703li1dw54jaq87"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64"; - sha256 = "1wi5fad0f7nqps55isvbb42njqssbhyzmd38q8413afjyhmm6icc"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt5_amd64"; + sha256 = "08mpxxd12c2kwlab47nfz25vpn7ag2xkmxp2zn48ymxab7qhvr5r"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64"; - sha256 = "1za8f7wkwcww4wacydqq3fvi5p1ivgcr2n3npirqir1gr25cbxaj"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; + sha256 = "1iknyb54mn8l1gcm9pg47hlra7y5x9awrgd431hzvig44c34vv9m"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64"; - sha256 = "03y4239swznwlgdx6yc58sj6w5irqq7432hxcmcw8608m3w0m29h"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt5_amd64"; + sha256 = "1w2aaddcrfg37fw7bl2jcbx14bp7ar8lyaq25j9pi8298wvbikly"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64"; - sha256 = "1iwmgzkdxjvr2q2kz5bjz64r4qjqbcf6ynz3sy5y81dl254pjnmh"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64"; + sha256 = "0fqbm6502zqw64lbzywz0cllxkj9n44fxb2gg8q160vcqzyvb8jf"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - sha256 = "0md5vjz8wnayppcxkl5x7874w2z4w7pjz96gprv24hid4azmyci8"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; + sha256 = "05d43583lj3ffskvmzcr6yb8a3jz1l8gc12mrmaix8w71bv81nr1"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+srt6_amd64"; - sha256 = "02xwrfzspf58j9lr6b128jq1klkvd4b69lrclpqzwm9cqddg6mr5"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb"; + name = "libacl1_2.2.51-5ubuntu1+srt7_amd64"; + sha256 = "199r529wahl2947iwnwf4qazv6jqipsjaj2dqvplacmm197rsvdc"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_amd64.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64"; - sha256 = "08m1w5mhzl613gbjg6lvf7wcm7bs00xddaaci8f1944icl8pdibb"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64"; + sha256 = "19s3s3fc4vcj5cg7fh40w35vjyhi7097vv83lwjzrzhz5jlgczmp"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0m69ar6w3lzsggn79lyc3614p9rr2dy29vwqvl4w3gmshp6aqhs4"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0mib9hy38mbiz40dr7x7c9c0liqswmnnykij7xpp7kbfqlvlshb8"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64"; - sha256 = "1bh911nx5a2abn38h9sa90ji358r6is2n7ymm10v94yibdf63rwg"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64"; + sha256 = "05d4ijlc20ss4rm2jxr5lxkgwbn0qcv5a7pj9aizl66klpbzsgay"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64"; - sha256 = "1l36hxgnml9pglrihm17vkgqp3jpqslicg1mpycixzz9cpgfyxbz"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64"; + sha256 = "1dsa9z7ssf39c039a60axh36wgykyapv65gmlxnvxpkhqnw4zywm"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt4_amd64"; - sha256 = "154bh8mpslr4xwf54h1xds4v2yjf8rbyvv1lc0azl9gnkan1y0an"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb"; + name = "libasyncns0_0.8-4+srt5_amd64"; + sha256 = "00nglm7sryy3y1pagjhv1mq6rvqiawmhf3kgwv0g7bqwgxcpia7p"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64"; - sha256 = "0kky7mfkx38lj4gafrv886z0vbf17xnpymq6qas59x8f35bzx742"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64"; + sha256 = "1rs9k9pcxmpwlwbxgalsqhiv7baqylaxpkhy4524a4b8dw1qx0k4"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+srt4_amd64"; - sha256 = "11hn8q45pddm4khq0qp1qj19c1syfawscnvrl6cv1xmahpb3nm3i"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64"; + sha256 = "1d7xlyz5phsgka2psf6hwa393lgmlyjl3cd7a8dbzs9862h5f2v8"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64"; - sha256 = "0yrgvh80i1gpcq2w64hkqnmiymgrn7r2v67wyd1iijc2zyb4x0c3"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64"; + sha256 = "04rkaiapl13rxlr2bwxz2q7z6i0091nm1c49kjnl1yckg64d7548"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64"; - sha256 = "1r1rqpqdqmqxn3g1iifc77jgrhfkr5275s7d5h3p1hvkmlzyvwd2"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64"; + sha256 = "1a2x57s3072na65gr7ys0wl5cm2f1j2m5kkhlhq4i8ms6hxssgrk"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "09fwqr29dxhxkkf1gd9f9sph2jgv0qx3p7k6qxxwq3bg4lh2971n"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "0wpmnsnq5njv65iwq2g6819m2j5fda7jm8450qs3lmyc963ds0i2"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0fynn6g6mc4raj144hg9r7qbiz7b2s4p7aidjpy34xkbxcn2vq45"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1xpxmhhhgc7ap7f2ijlsgx9p58qqyvk2lgfn61dhlibq046px816"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0qdfr19xfxwab9q5w4bvwgv873cs8zgm4s10hwg6741xr6qifnhg"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "0b8vx5lhsbynivm58zhxd0w6g7c7bqjvsr891wbqizbi325yja2b"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0pfgxnrf1jjlb7gvwklwn7m61n591yfzqfzzqb76gyr20r6v6dzw"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1g3bdnfs0rgwnzrnwpj5hamynj1z0qs8wmxlfd0iqkah74ymgaaa"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt4_amd64"; - sha256 = "13rsp2cyayvnh2755kjbs6g6j85rdpl6cwlx22b97hid5pq5nk60"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb"; + name = "libbz2-1.0_1.0.6-1+srt5_amd64"; + sha256 = "046y04ynczpydlrablks51mx4jc1313k89hsi8x4sj2a355819nz"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64"; - sha256 = "0iv16gfc1b8n4p088jbask9i8i56agip8dd5b1r22r52hg28gi9y"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt5_amd64"; + sha256 = "1j82gzl9hfxsrk2s3nxx1dpq6jlmkz5y5mkvxw9d166v0mlvxkq4"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "19gl25hjzxw375qqbckmgfr14qd48zaccnny4zbddlz8aj5w4wig"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "1x36zmsb7wcmgli75sfqamw5gmsv47if56f1vljjgak3jn2vlmm2"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "1kgq90l6rafqk7zfxafvzkh8msys5mlc95qr3rcv6l0f03w785dy"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "0g68j9w3xn0vnjgznq2avmzk8rykas0a6749ldq99yq9afccjfcp"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "01x6y4gq1ivpdywglx418gr4m56qvm05nicmavwimnafxga3c5sk"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "0qzyjrr5nmc72pfbalh9s22s51c5c10f0h23viyjrk77kk0ysc3f"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt4_amd64"; - sha256 = "1rhfhq1n45fq40p6c2aipkica2dw8w95w7bsdrxfby48gdppgzy7"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb"; + name = "libcap2_2.22-1ubuntu3+srt5_amd64"; + sha256 = "0bsjpbv2p7ir6w7dpjvs8y25skha72406mhgjrff9dvdvc9mwwpy"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt4_amd64"; - sha256 = "0yifiwr2hc7rvvd6snf530gma05v2qpiyl652drdc9rvcfjrj9zi"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt5_amd64"; + sha256 = "1d4lc4krkphvmlvmd4z60l6cg37gd62x9m700s83jxbsz0fhwmrb"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; - sha256 = "1cll5iwdply1lz211j83n22aidsxfx2jvy09a02qa79a7g1qv6c3"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+srt1_amd64"; + sha256 = "0ar9lzaxlmhqxpp6v2b3jz3lblkqhqwy0ywbwkdq4zs5za69kh1b"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64"; - sha256 = "1xaxim0df5713hj4kq141rnf51zvyhvpv015q4q41c3nh4d9bz7w"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb"; + name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64"; + sha256 = "12ihcwb2qlkms5si1sz7an61ndhxqhd2dxrx9likm07bz2c9mq9b"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - sha256 = "0vwdpkiisnbrm1j22qzjj2g5vsiv4wdja3j34j16pc30088f4c3i"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+srt1_amd64"; + sha256 = "1nzbxzrkqnnzhml2fyjzpaifsm3whq78bxjqnhs9ljs3jwhl59p5"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - sha256 = "0rvrjcxpmnbq42aq6x31gxxglwiccm059r2q78hqiw82i86b7j28"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64"; + sha256 = "0mgxy0vninsv7yi3wiqjkdz8ap52y4zlkzxwyijcvbwkxp33rq68"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; - sha256 = "1nkzsi04m1icwb3b1nky15d0frnc0hpfsyrm3xx1hriv02iqwgvw"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64"; + sha256 = "1m1q2q2s6b98x1zbk31hnd80dakfqg2g8yaj662vxrdrr85j6nza"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64"; - sha256 = "19xnslykd4y22ff5mfs2rg4rjppmcrmrbwynzx4v2rvxckvvq77f"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64"; + sha256 = "1f36vyq505hrfqmhizgplvvk17zhf1230wlrzibdwi04j275sahk"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64"; - sha256 = "1x1szx7m6y6i0d6ahffnrdhs693rk4wi4hrhbmmn2g1sizr9qhmb"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64"; + sha256 = "064wwqbjrdvwkjpyi0k6vj7rrwkwcy49mrlsgrv3q4gckiqhjhbz"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64"; - sha256 = "0nrydq0mjjsx1v9gk78j5xcgdaay5dhxn5rj9ydkbkw7ih4xm2m1"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64"; + sha256 = "0vagal7jh6biarjf9sy219p2njb5k8ycv4v7glni8prli0c1zzxq"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64"; - sha256 = "09pjkyjykvsmddx20ji4wgr5gnqbshj1hpm77129ini9qp61wxig"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt5_amd64"; + sha256 = "15rk2yfvsy16azpcwl8xsxigmrdhl0pkg6dvyq2pknp08c72r5r7"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; - sha256 = "0axky1v55yalkng9mn22ignmapv100gkcfb0xs82pllzaws32yhb"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64"; + sha256 = "0pdn5f20pbmklnvsyl83x0rjafsjy8vxn4zd2nl7h0aabzng9vy2"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt4_amd64"; - sha256 = "1brqpwjbf6dd6crvs32b7q73m11anlq1s1r1m0p5cv17sc89q3q4"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb"; + name = "libffi6_3.0.11~rc1-5+srt5_amd64"; + sha256 = "0i428a37s9lma09psy0d7vj2amnimwgx4izmmac4dlzyy6qpfn9s"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+srt4_amd64"; - sha256 = "1sdbbm4gdq0mw103z3nwhywvix1z21gdq6lc5xf4s12zpj1zq2gc"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "13hkikwbxsm3nf91rc1xa98apwx9y4mr9h20cd0206gm43qfyvh2"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt4_amd64"; - sha256 = "0x5xxxkkj7g5wyhxl1rv846irn3r8hh744fqyn8hgmbp4mdgils0"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb"; + name = "libfltk1.1_1.1.10-10+srt5_amd64"; + sha256 = "0zrx2mb5rl5hcyh6p0sglark6rh7s993sg26klizkswn2w53rv8j"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64"; - sha256 = "0mcdd9x8dc153sk2dqixxy4rxvl9hvc7dz0msfwiywrgbilzfbl4"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64"; + sha256 = "047sq7342mqvc84qx8dayf282yh84zdj4azqp1c0h4hczc73jwv9"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; - sha256 = "08x0fg01qbycdwdgqj3xal0fi676pnkkgsk0kbvxfg3i4ln944l1"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64"; + sha256 = "01z4dwib9d7i7187yw1b0vji587hrj354cz6ll2iybrbg25w510w"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "05pg02l16fj7fdv8gkx95jy4j4cikqwmdkyq65a8qf20in3qs04m"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "1300z3mjxxcl718mjdfppv53s42ba88gm0izbfn6wqvrj7wrz5wq"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64"; - sha256 = "0mmgmnzyi9rlk7k6ir3f127brml366bbk7v5aq75y90z6qdp5h62"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64"; + sha256 = "163jbgkz66crkkjdqc0axj4sjfmd6kfkglwlk3d52rf3bc7mvimb"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64"; - sha256 = "0qpxrm37js3pgi8hwcfqyqgkipypb0gw6nvsbz5dd112hmnpkp37"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64"; + sha256 = "0p1vywfx5l9zhibr8c20by9w646przfjfaci5c6ifi7f4v5nn9hc"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64"; - sha256 = "00kq05jzlrvd4gx8pz54k1i8sm9v8l07vih4if6wanr45ifsjqlp"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64"; + sha256 = "1km2w0haybwal9zkhwsrx4i9yi2zkhbbfhh2xljhfw5m5g6s4mq5"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt4_amd64"; - sha256 = "0ybry9jiyp0bgfm9b0bznf5qllyf7jc6avd8rcc20ai7yf719mwc"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb"; + name = "libglew1.10_1.10.0-3+srt6_amd64"; + sha256 = "19w95wfzzr909jgjg8w6fqff8x00izawqicw896fqbf44zmsc2l0"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+srt4_amd64"; - sha256 = "1y4ywi4lp5df3nasxz8p5rmybl2vbv8bbww1s8alin5waidl7qav"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb"; - source = fetchurl { - inherit url sha256; - name = "libglew1.6.deb"; - }; - } - rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64"; - sha256 = "1imdb4wyy7qndg8xmlrfnj0x3a6fg7dv0izn2rajp5q77ivry51v"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64"; + sha256 = "1zhb0cpyl3vq5hg63j7wgw6bmwrn8xnq1ybnbigw439c0nq4f333"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64"; - sha256 = "1bgks33ck18asizisa5d7wj4wsv8hxccpshl0f2ihdvs6qgxgs76"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64"; + sha256 = "02fywg8h5jlkrh1qiqd0hpjv4v1hxggm3vjhnfn5rdj3xxmbvr2y"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64"; - sha256 = "1la9938zrqrf8v4bcn5063xxxwwankhzh69m0sy8csixfg480c1a"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb"; + name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64"; + sha256 = "0vmx8ybnbf4rilylk1kxhq6c1z5wbxh77garwf79jm0jx3xamzrh"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64"; - sha256 = "1zrrprip93m9r2c7zd54pz8f5jvdgb0jir6ifvqbl60d521lfbl7"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64"; + sha256 = "19jl1ril1h2r66ilwi45j49g2ag9b4x5090ld0gqp4hbx6f67x9g"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "094y3af19hg7s0hklh9slhmb19h2hhbfl4fpfpqcvbagkh6gwxl1"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "06x5j6rvv5g8brsmgpxikjb9fs6gjpd31g2iw3b313k9c6fl7z9x"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0zw0zrl50y86y292zjcgpxiqjwyw0krnrmi28qvb0ba2ahp18f7v"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt5_amd64"; + sha256 = "1pgv5svrqvsyiakqqnbb1ph6sk5yd6lgk53k2isyyz44vdjch9py"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "1mmd16fh58gnyyjwg9ac1br0xia670xc0ag65bfgxwnpfnkr7nyj"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1nv973s0h9vmnmslxyddd28p4yv8k47d685m8lxv1irc4skqxzzc"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "063k09yyr9mn0lacp29cgwagpiix220p7ahs5shpyigkjk5bp174"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "02h7fqwwg7jpz8b86dbjhh067ah34x3ys9n5df1rksbzpvmqcbiy"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64"; - sha256 = "0r60n1xym2alg4jr1icgzvd8x614p7vky0zxfvn8x9qd2hzr8k5q"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64"; + sha256 = "186hxj0jvgbxki0v6fx499pp796kcwiz86gqfhkd94k434aaqz1f"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64"; - sha256 = "0xynq7jgb0x8npb6apj58ag5zccl0gh4npyrfvs0ys4hzlv2fkmm"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64"; + sha256 = "1ddfd661703jgd8xai2ysh2gdvf0pkbvg46iazlg5jqr17i1b1sx"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - sha256 = "0zbsr09xam3sl5qpnl34hgiir98g3rcfg2nblzwp8yr9kkrsb7zk"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; + sha256 = "1bb7yf3ld99a9amdb6r8slw7g3xnj72za2nbpsrm6cwlw9nyxli0"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; + sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64"; - sha256 = "1bv962vi9x8m41ss6g73q91xlxhf1pd733wsywflllkxa5qyabpl"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64"; + sha256 = "1i8k7y464zj3vb17kwim69kh57y9hnlx40xfs0hrfvjjlj3ih30w"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "1s67jx924c06arhf18dpqncphlih26a7frshzd4ndwzp8xp87xyc"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "1ihzd3ihylrbrwxqx8sam6lwkhkk2c9ys7vxah2yvj43fl8piiz8"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0zchyajpd78rflfh4md3i0cvzd0gbkwf6l8kqcyavvib42mmdga8"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "1z4h6zdh5h9yvq4dfizy8ndskny94c86m5b4g9lpypfpzj259kpi"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0lz83zkg4f1rjhf0sigk09s4kbksm9j2lalf7k04bci1sxs2wj2y"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "13fgm887ycb1l5w1hxvlf906wr4k834drykg36ink6g9fi1smn79"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0bcn57af9g4psxfiqqfsmfv7z3a713z86760lspgl63xfxlsm4d5"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0alagksf7h181r86iiddvb9sil9zwf7d8lhnikq2x1i1ncxnwbj9"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt4_amd64"; - sha256 = "0lygkw0my7diasqyw7m5a0rfcpp38pb8jq7iqks195j21sy95h0s"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb"; + name = "libice6_1.0.7-2build1+srt5_amd64"; + sha256 = "0v1a4dbs6by8n3yi23xqs4qqvjjdhh1qqmacc2bybjd2qi8dps8y"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.23-2+steamrt1+srt4_amd64"; - sha256 = "0530ygdsq840kmqm1mlqk19a7wxpvwgrbary2dpflzqvclx4gfr1"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb"; + name = "libidn11_1.23-2+steamrt1+srt5_amd64"; + sha256 = "19s5pm1w8idc52hcj07fd52hw4fxl8hda9rm5gdbgginrl1naibp"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64"; - sha256 = "0j89i9hgdh93a6m71ji3rrhlnyanjb7dbxy460shn38v4f3ax735"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64"; + sha256 = "0fcj1fmk70y8j1jcbr9dian2zrwf5m7yis4zpq8cc77838cdx0pg"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64"; - sha256 = "0l7h8z8fx0pqkbdh5x3v6azz6ddxdlzchgs97h5babrknkfkiar4"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64"; + sha256 = "0qpipr1anfy4y6m1syznmarsh3ni6db9dc7a1w0n11zfhp8lpihg"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64"; - sha256 = "0z2df70v2ggw2la3yr4ll926wj6pc84li1x2bxwz9ysw7xsgalg0"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64"; + sha256 = "10r393m5xxqjd6hpvlnfvnba081crhs88x1knhi3s6mhg2xhg35y"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64"; - sha256 = "0n6qsfk42nhwvg8r9win7a90zvb31ba7cp7jvbbc4bhv7ygxxm7f"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt5_amd64"; + sha256 = "0wn9lgqc95gvck5k8qds9908j5ip3s3bz85a8l2bdprgg1q4rsrl"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt2_amd64"; - sha256 = "10r817kzxcviqvrajmi33pdbqss1qxpkmjxda7cclamnnawbcd17"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt3_amd64"; + sha256 = "1pqncc63z9w3jg41xqklappyirajfrchdjp81bldrnmbpbj69xha"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "1xsl1nwsm6r1gjfkl7x71h8p9qkq7gi624277cj3k68b31qh3g4z"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "18xfi5c04s3z9brj1rrmvl9s67apd4d6ax7vfwwjzwh7ygnkp8h8"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt4_amd64"; - sha256 = "0khwz7jqw9yq157r675sjii3bqk2i66dh6wn43b7vhh0wjz6nbdc"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb"; + name = "libkeyutils1_1.5.2-2+srt5_amd64"; + sha256 = "14mv4r05r0fzkbl3r4jaa7wwmmaprv3q5w36pyf3xqc3iynxnj2p"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0lfhwqsxpzaapz71rldi2zhsxkdy55krcmfbli06qs4mqx9mf691"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0xhz42f7lnsc69sfnj2w0917jwm82nbc9i56qq3s1g2sw7z6kb3q"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "0aqwf07c818apd5md4gxwzx67xvbvv8s6fm890vibqhsrmymi621"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1k3d1775ran10y79s7n5lmdlqlr7kscvxmj1887bnn4yxbwlgy73"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "04wacj307jcy8ykyq6w3xw9phmprmfz6cpwv1wyfarxf4gr7nyii"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1xml3gfn253lydqaqk27209sr1x0vvrbbkmb63z5cyy4i1yfpvmr"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64"; - sha256 = "12kva7qrghlj65khzcmj6xqszij9186ly0iwjjqjs5xl5821aic4"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64"; + sha256 = "0wj24yi2ws12lfs0pi0bq9rbr1gyk2nv30rf46bav41mpn2fj9mg"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "1xnhh3s2cm4vjny964bsznnk2a6zj9n8ygkxfyrraib3wy61lidv"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64"; + sha256 = "1pakk71qcjdp28v5cbfvrkbknhjhnbkk7ywr6czarmhldipsyifp"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64"; - sha256 = "069s7km994c2z89jndwwrpspq0z7jyxr56ma057hbrilfpp4r7yd"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt5_amd64"; + sha256 = "0ly9p5xilsf0d214mrx96nc3gn1xm1b68dzizsimhqa3bfpckzbb"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt4_amd64"; - sha256 = "11flm0w3vwf66yi9mqf43ma3bc6jwg6xcz71h4a3jgqahsg3skfb"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb"; + name = "libmikmod2_3.1.12-2+srt5_amd64"; + sha256 = "1i6kwzy1dz0a78jm0vpa0hjqahkwnj8yab8aky2srsf07y8bz2r8"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libncurses5_5.9-4+srt4_amd64"; - sha256 = "08wb0y9dizj7ngsivl2rpikjfl246q1jib6r0nqg7c6r05h8k46m"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb"; + name = "libncurses5_5.9-4+srt5_amd64"; + sha256 = "1b4j17npqdhj6afcw7cj37k6dr2kmbgpjyv7c0viq82165bjacfp"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt4_amd64"; - sha256 = "1gv0w7jrx9zd59zg7z38qzlcp48h7yyfj4jrbfsifl54ryn4fgwh"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb"; + name = "libncursesw5_5.9-4+srt5_amd64"; + sha256 = "0gavz5rh8hz6ir3x09p57balxl8zprjsglgf2craq340qpgqw4s6"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "0f3h1hh4vn0ysr099lgwk8dx3462cpvmz3ig8r6d4vhxyzyh5a9z"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; + sha256 = "0dw0mfwia3z6icj01558xgdjmi7g6g4nig4vrjbmlz05f9l2rck3"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "1dlfym38qs8m3g38z776vvpxg77xx2mjab7qipsc0lnppjn8gnss"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; + sha256 = "1r9qw0mx38zisj6lr9bk8yv9f3yf2l80y4rvgxq6k28ccz5sahvs"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt4_amd64"; - sha256 = "1d61w65qxs93hpn4a8awzhjqcv7yva96n65309630axsm48cqxbd"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb"; + name = "libnotify4_0.7.5-1+srt5_amd64"; + sha256 = "15ny5m925wrn0m394gn88288zgdjf99m5jg9pxyfirhvjmpp8pmf"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64"; - sha256 = "1k08330f3fhr7c6bpm4b5qdyc2kkmz8fa5bgk1a8psxqvfdlsyap"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64"; + sha256 = "11y0nj7pc94gs3ndxph50whs1yx8lys48c44vj1207m2mkw3xdq7"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64"; - sha256 = "1bxg7wk179gwi7s4xrn1bkl2amnbqrf11qsdw384cyq9c2hwfagr"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64"; + sha256 = "0a5mqk6fry96jgpn27fv66mzg7s7mn00jhiayh73q4ddlv52p1r6"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64"; - sha256 = "0829hivgxzmhck0l16lg16qbphkhsrnqb2px4ksrzbspmg6b5rb1"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb"; + name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64"; + sha256 = "1r06qcfw2hmm1lxgvndzjw24nawxc2qd2qd3lh7w8qmj2zrgp3zd"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64"; - sha256 = "08gj208gfh37lfnxz1xksbmm1g78ax812z0rk12ahl4w72jm1yjy"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libopenal1_1.16.0-3+srt1_amd64"; + sha256 = "02dc0xfwh1jmhm0l4wig3ybs2yy48hdarnbfjv69m9aryjpbh6gj"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64"; - sha256 = "0pgiha65y3rrqm095vmwc27498drqcgadiqyh4zyq2h2zi2ki60j"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64"; + sha256 = "13s7ni24igdkvmcs3d13ncll36clfmm14ggjqd23dsgyzmip5n18"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64"; - sha256 = "1hsncmfp6h3ca5w2bhaxbr6y2ck8fpzp0zhjijgfnyaqvsjc6wwa"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb"; + name = "libp11-kit0_0.12-2ubuntu1+srt5_amd64"; + sha256 = "00x01l29gh4zl0nfsyh90ixgvln6kcs2963vmmjaql4h1cgvi27g"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64"; - sha256 = "16hwn8a30ydarlw3rvpda48m0z0k5y1qw5vdg6syjaqcbwx15mll"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64"; + sha256 = "0dcimf6vsiv51lkavwbw980fll3vpki86i3rqm8vr37iz59798zf"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu5+srt4_amd64"; - sha256 = "041hxfsk0r7rh02h16igcr0141gmci4ljadljcxsa1yiyn41b4rr"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt1_amd64"; + sha256 = "167a5rgzyss746s07fkal7vy89i0m5syjm2vdwfiln3ncil4s86y"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+srt4_amd64"; - sha256 = "1m53qvhqbicybi43zjjblhaqxfnlvq1m61mkvdhwskcxh1y5zpic"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; + sha256 = "0x3yzmxvlg2xyy2sm03vvr4c46r7ywbns7gqbshzgn656zqdid00"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+srt4_amd64"; - sha256 = "0dv8a32dsvklrnvw66rxb7xim9ylhr9w4qvns527v6fl98rvg08l"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; + sha256 = "1rlkj982w99x0mz008snkyqr1v13h165yj2z4jwdczpd1bsrra9h"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; - sha256 = "0bljhrivr6dw181gisvy8dz6y9mjn0g9w3d5s2f5h8772g80mx7f"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64"; + sha256 = "15sa863fia26lclp821j0c747dv8a8igz5l86n5ff1m3dmlb5hp3"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64"; - sha256 = "00wis5q2xpdfh5z42rfl95j63lbsz5l3i5hvsyvim8r2h1r2nyn0"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64"; + sha256 = "0gnjsh72c9w1229fk5fx753lpmcqzizx7dizrdh3wk1qmivhddl1"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64"; - sha256 = "150gpmn1gb0ykd3cgggc9zkb070figgwrcdqx89qa2kwvkxlg6vl"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64"; + sha256 = "17d3f6gwbdyn058bbd8f0hj4ywp8rmhy9wsf2pnfkh219r5b98h2"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "07ldw9iyy9akp5zq2h7l85q3x8ggsx2hah51d0j41lfqrysyig63"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "16j666k8l85icbgy9ds9hdmcm60axsp8nxjc1n11jd64d9slb792"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64"; - sha256 = "0lzgsydisj6z7dgjgkmr42mzv11j61r9wny1m31vgm990p5zkh7n"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64"; + sha256 = "0g07a8vxxglsh7sswqznsi7lmq5ibchhkhrmfywcdinxniwcr7ha"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt4_amd64"; - sha256 = "1g6nh8p3q8bsqw9w0ifpl86gql9lqqwxk7zn9bl62pq393h107mg"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb"; + name = "libsamplerate0_0.1.8-4+srt5_amd64"; + sha256 = "1xr5k6zyfw8lc5s6sbg57d7v33045hg9l6a1rh5f46v99hi8k1rr"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64"; - sha256 = "0sp76gcpw1zgqpyq7bp3gmavlncflkrxiyg738nsf9mb65xy4v94"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64"; + sha256 = "1i7hh43fiadg1y35dmjm03s8mcbanv8jfnnjrcccabahsk8fpdj0"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt4_amd64"; - sha256 = "0jhlbn5jfap15d8nr2fz2hcwlv32ax29gddd5jg08vmfga767sqi"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb"; + name = "libsdl-image1.2_1.2.10-3+srt5_amd64"; + sha256 = "180sia6zc48y2f3l1sywp8am0gqzc9swm711fq8b2kdd4rn3wicm"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64"; - sha256 = "0cb84d0x3fjsl3w48jmxjzc7xq9c6g73p99baxdg50vhqssr7dmw"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64"; + sha256 = "0z3zxvsvlnvzsvprvy5q4y99irjkzm4ilv0znaic5x967k3zpjp0"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64"; - sha256 = "1dqp16qi413xpv8nmyrbgx2x3dcxsyk2giifz7pa6jyvawcx7ghv"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64"; + sha256 = "11ks71izg46k2pjnd5jdk03xkzz7jmxm5k3mkwq8b42grdiadd6a"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64"; - sha256 = "1zcy3njzkahd5rq4yh7i07q3x1wyfpzl6kzynbsqkx9cnf53342k"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64"; + sha256 = "1i2072wzjmrz97pqxm9mfdqqvx6q6x6w8xqa5f4jxmhm9sb7x7wb"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.4+steamrt2+srt1_amd64"; - sha256 = "04v4znqksg9qj4hnz20czwx4qy4i6p9csqql4yd299wvjl9k61j5"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb"; + name = "libsdl2_2.0.8+steamrt1+srt1_amd64"; + sha256 = "1wm48pdd9sxd581jhwi2b6a4ln16wbz72p74q8l8fypq6gmvifcc"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64"; - sha256 = "01kwm3yjq275j7hnd52hfjbhj5ijfz5wxmc1vpdp88q89zbkw227"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb"; + name = "libsdl2-image_2.0.3+steamrt1+srt1_amd64"; + sha256 = "0nngj4lvk1r780wpghm9wcg9gmv0yswp56ff53h2jhn6k3gbcqsw"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64"; - sha256 = "0bzv3spjksn504ma7haywyi3dlb5nl35wxp83if9n58i4850j6sd"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb"; + name = "libsdl2-mixer_2.0.2+steamrt1+srt1_amd64"; + sha256 = "0l2l0krldx0yhdqnmj6zfsx13c1zfr8hky48gbs94rlgwl02ym6w"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt1_amd64"; - sha256 = "16zx9cj56m939x3zrvq1ypxsd26vnc81gmkpkg5j80jl2lwz6b6v"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb"; + name = "libsdl2-net_2.0.1+srt2_amd64"; + sha256 = "1850n1zv9cpbnv5n3nk5knk30pm0f4g8x2cx70kyxbprfkq7894v"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt1_amd64"; - sha256 = "14sfnmb0zz0mhvl3jl45jqc2sci59gmzdn5kif08ai8ri2bk9sza"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb"; + name = "libsdl2-ttf_2.0.14+srt2_amd64"; + sha256 = "1bwhm58zqh452szjjj3m3ny2samx19qw3x6q7f18h7164d5vvm4a"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64"; - sha256 = "1y2a5f9qsxgdhak7vf72jsd6drjim172qp6m897yx7xbbk8ikpnr"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt5_amd64"; + sha256 = "001wfrryd549gh1qd4v8fz3m78vpjwdx1vh34cw0dgi3kxmjxp0q"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt4_amd64"; - sha256 = "0fjb9grh86vz58g6cb5d89hxnppqf7w5apivqb3h6sd5axkg2z1r"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb"; + name = "libsm6_1.2.0-2build1+srt5_amd64"; + sha256 = "0k0hyh6b36wvcn8ss24f7lqp2pb0wdvb5zh57y7zfxglgr9vj083"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+srt4_amd64"; - sha256 = "0fdv7ca60s23qc5azjsg7aaznqksx5xh0bngzc6sl8bqvnnc8z1g"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "17sds50cyvpfrm6x8hddb0ir5xsch79k8gyghkzi59dav2j4j2f4"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64"; - sha256 = "1as44g6g5li8q6mdxwnwfbqg9f779vyjh2bqygv5xm339viaj510"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt5_amd64"; + sha256 = "0b0lrg7arrnszc1hzya04ch3j4lbcrpxqf5hxxz2wm5k5qb9f6rv"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64"; - sha256 = "0rsrl5z379bls6bhb0nqc92ilkd7jkg7bdmxw0xg6vw9l66w78ln"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64"; + sha256 = "1vks6i3ipggcd2b4ayhkpzj70rdwvlmgh20z7ac8hcnhfnsmvmbc"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; - sha256 = "1x1byhdvr0zdfl9dj07qpndifbs9x416vxl7rpmig9g0makxvsmx"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64"; + sha256 = "0yavzpx56kf27pfjif6s86bg9wmr9078d7p34dpvbzp0aibjifs8"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64"; - sha256 = "11n8iwsc562i1glpisjs9xvlmz4a4xibq6axkhi0xnvv0pbfnxiw"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64"; + sha256 = "149wrr5k7hx5lbgkyi4rh2sgr15m9k8x075gilab60mj1b6cv439"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "0fdmjsyl8a5n14gkwhvkr3xfcfr7q9djapsk8gj56d6r0ydg9yxc"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "0fnqw21m8byigf4303z7qvficral6ar3lsxrsx4ai9r8d6bmmgdn"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64"; - sha256 = "1yn54vcd5hxx7rxzvshbfidfksl1c0pvl8xv427lkf7xni3jx0xb"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; + sha256 = "0km4v33pzknjq0ah7w03s8xny21qggx6pc2q1ah9dlra5dwv4nsm"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0y0k0glqnmsq69sbp3s47pw37vvf969n3chniv3jmrjkjghkp44h"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1shni0sdcv1jqkfsqy5j3kkr73lifb3ip9lqz8cxx23dlvbllly9"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; - sha256 = "0kqv3ndnw1lcz5p190bxpq6rglpcxdsz44wyr6yl7w5wpfwcbs61"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt2_amd64"; + sha256 = "1sjklhs977mrvs7qci0hc3w6x3gjrq5c6lfxjma7bjg731xwdivp"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+srt4_amd64"; - sha256 = "1ngm0nkzk8w5s7dp01983lybd256130kdc8f4jmlyikhvyx0khgh"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64"; + sha256 = "18rc6jhkpqnqvrw29zffahmjihrdrwmh4ydnx3433j6wc29m8p4v"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt4_amd64"; - sha256 = "112dq62phrd3czhi27kdk4ra9is5phxpzbn26x4bis4y3ccm0cfm"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb"; + name = "libtdb1_1.2.9-4+srt5_amd64"; + sha256 = "1wq2956jmq9zhd7gcpgvqq7d1rdjk954hgcx540zwgxs57brzkrw"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64"; - sha256 = "01zvb8msi6pkjs85y4j78a110fzlmnjp69m7z7qwr2r7rr05w6r0"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64"; + sha256 = "15b6sg3dhamlgaq28w3zlwif5aps0ybi0hc29k3vv2s48f6vqfi8"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; - sha256 = "13j4pqqba0bf2fq0871s8b4wkw8zyv0q80x0n07lkjiv7bvrrkcw"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt2_amd64"; + sha256 = "038wcp777pj2y3scwkqfdnb6yjsag5dnqajrdiv7pxmvkgn3bc2l"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt4_amd64"; - sha256 = "07pp7dgp33yjdk0i3s7q73qq0pd0ylfbpvr5jssjap0wsp3aqq66"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb"; + name = "libtinfo5_5.9-4+srt5_amd64"; + sha256 = "1w22aqm9zla5cfcvkridgzwnkhj3lyjqf61dl8ppnnbk8rhj07x4"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.2+srt4_amd64"; - sha256 = "07jvb8ghflb87f4dvgii5jv5qzz31g9s7c3k8wb9w9jp574y7079"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb"; + name = "libudev0_175-0ubuntu9.10+srt1_amd64"; + sha256 = "146kdj719rkgj5v2g0lzs7qqb59a2xgplkqrrafpkssqangvfmq1"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt1_amd64"; - sha256 = "19f9mhbjm6r4yxdr3fvsn0ad8j7dm07y4bzwqf0n5i715jcc0qaf"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb"; + name = "libusb-1.0-0_1.0.19-1+srt2_amd64"; + sha256 = "0vnsr4syd7alas356hv1radm5rb8vlh69h5ljlh24sqs923vgg28"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64"; - sha256 = "060wnsbhxl0aqyh1ymbcdma59v10b1vgi3h3xvvilzl869ivwr1p"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64"; + sha256 = "03d2jj9l3k31wb2wrvcjpa79cp7yjsqqms58vqh9pksbnmyrddr2"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "1v6n0ryr48d8f25vy06d9vh84z2zf3kmg6k8pg89j0s3spdyb44v"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "15scnb989xybb4l8gspbjvs058kjfw0r7ajqak3gxrx7vgqb3i92"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "03s9kbprf6r48y4ycfixx96ga0n8vfjn7v74sv88kl0lrs8xzjy8"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "0f1hmz4218isrwx8823sm7v08dlvyjwphvbjqsgg9qgim0f13j8a"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "0700lprd2c636dhqs000amw0nkys77h8mb7698bg30j25yd5kqr4"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "0p3548fnf47vj5kxzrqqpdxvip35xyydkxj7d5iiw9f26fz06drd"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; - sha256 = "0a519njbsdwpvc49pn08sya34z2wcd8hpl0j44plr4bd2df010g2"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64"; + sha256 = "1f1h77y6mf7xs8biaz77kfimp98v9cpjrbfg0qyi4wafwn7jmnsr"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "1jdvxgvlwnjcvg6009qfklr8mf3678ydrg855smgv8a0nd7v5qiv"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbis0a_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "0sn12vpmgk6jwa97cp6m8wx4197mdgh1ggb2r09hr3p5fyk44nmc"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "1ysm1ika8cymh7gmd3p2hdfsnm3jrzyn4g2r12r4m9m6q3l9knz7"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "18zd7njnczr93q7x2dz7x3n9yqwp77bjsp52qcxvy4bm7b3pr0bi"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "0y4r9s5cjcjxi6hy0svzfbqlkaxklb883vcsqn1j0kp9li3jpkbx"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "12ninaw71p59lazzvyd3yq3sy4g30x9ywwfm760nbiijb9yq48m4"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-1+srt4_amd64"; - sha256 = "1275437ph91i67q6naigz4nhmw2a330q72mjv282slk7y187ana5"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb"; + name = "libvpx1_1.0.0-2+srt1_amd64"; + sha256 = "02r8yklax0nd9z9s0c2iv1pdnwaq7h3ys46vf0wcwfc8n1p6jj9j"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64"; - sha256 = "18v5vbrvg6l9m768k4cb4xwbxahqrr7zspx1b5a8fv6bw8h3d9l4"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64"; + sha256 = "1f58xi83frcxpq62yfyqjhxzg2ali4hafv8zinial4ixh5nk2a07"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "02baqaxcpw306cgr5dvz5pcir7ys08r603m8ahk22bzgxpzl6xk4"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0wfs33djnx2k5clhwn6rq17pmqv7d2xyr5mihhylc4fs7q179pg0"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt4_amd64"; - sha256 = "12wq77h9jczq974fh3c8n4fkqa876kbizvai96jizh7c90z94kvk"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb"; + name = "libwrap0_7.6.q-21+srt5_amd64"; + sha256 = "1rvgmwh2m633mmz78lccs97sr489bc2qv1vvwl1gf6rd01cmgd99"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - sha256 = "0qp2q9q1z9sz0pyc7l1n6xa0bc22xsml3vf2yhdls71im3ks7bi9"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt1_amd64"; + sha256 = "0lf1k902i59f3v9jgjav9gzsiq7pnrfnlzmlmyxkcfwkd8pvkign"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; + name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; + sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - sha256 = "1vsvf6ihz8jbnsarygnfrjb1y7pg44gpk89b8sk449p0c1kmv4yz"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64"; + sha256 = "0l9zprciyrgn4aq91ddmmfhffvms8p9258vv109l62bar4mmg9sz"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt4_amd64"; - sha256 = "1bm0jp69kfnirvlsyj7qxf7dg5b1n53875kxr9asdpw4aqmfj3a6"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb"; + name = "libxau6_1.0.6-4+srt5_amd64"; + sha256 = "1l4ij8c6gmv54yfv24dw9903zjczasd6z9lvzd07c5zj4rj7gx62"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64"; - sha256 = "15r0f6zhjr13pca7mdxfhk0v48923q0kndp23kpxw8rz75nc15s7"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt5_amd64"; + sha256 = "1a15brx602gg6jq708ymngyr3rcbapmk5620wdx094vdclc665g9"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "072z8vwk4gmbnyf5acn6y4rjiidk7rvi1k05za1j5hlqzlydb6x9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0h0yfv4ana590x038lwbz4cxfb3smcqbd394ggir0kv9m1przp78"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1062g911skvvlvxr6ihxkb0inyg6xg1j4m4k5rfqs333rw4npc2i"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1431qrr9kg3mdbag9sfdcqy0g84w074k01r2nyr3bq0w5q8px15l"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; + name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all"; + sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libxcb-doc.deb"; }; } rec { - name = "libxcb-dpms0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1xq6zh8val8mc7wcry0jwdx11aagm4af383c6vs2z6a8vz97c6sj"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1p2hd14zb1zvqkvgs0apc6m2dwh7kwbxv12py10nr6rzmkr75z1k"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1kipdyw3wgdywznr5qxbdl85igizc40hwjd3s5f3y5pvd8kprarz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1ixndxxr7ff48p4sp6rim5bjjvncyc2qcld13az56hjybyq90ka1"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "04bqidf71j55qp2b83bfjm26sa62gslidzhzg81knynlqi8kk00q"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0l4j5ydzfnzl5wmabwh8jv2qcdgi5blks8ys06cjri8dq4fqq3gg"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "03wndp2gkjw016rl6k4jhkcpbs1njg74flnb0ppk30j7nxnxqcm9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1shd1g43pq5hqpmxkfp8lykpqzzdn0a0w53m20bkz133jgjwqq1i"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "18f38c275h2y9221mn7x0s8ap5fhlry6rdz34lz0rr3pn83fhpvf"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1m3xf4vkbk2iwy64y8ak51b8wrd5g8hyfbankvfaf123dyyk8z7x"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "08c7fx2vc35l7s72f2z02j0wh0b728ibn3zf103jc0yri9pgfinz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "047j08nl310s4m8d2gk555bhf1q0s78pq882dqqla2skhfslg645"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1ddr52m5x9ah4j313fvq2ira96l13w8dd4qi0z38llarmrhw2p2y"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0qfh1wnd11z8r9a7zyrvsa4banisvmi3vj5zvihppz2698ln53rv"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "07kyplilgxk0dj9gxk9zdf5l108d8ya9j4j1ji0frn0mk06i45kl"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1yj9hxmdjqqinkx8a1gm7nwyxpj6adxphl2f3i863m0gp679bvag"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0pxpgam9xjzf0m6hrqhl0679qa10qk91ami0p7k899b5b1573j6d"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1v8ipbhabg72mc3rf378l0c8x5apndkgjqbvg5qzp4s591w251np"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1i09z5nszbh9ikjpviwcixayicbq0v9rdg7gygxhs54zxxjccw8y"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "04cm77may727miynsqw0937cvs5kjbh85csrdr86yyayvlqygs02"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "02c87qhymk8ncywaw7zrs73spl1x1byklnafk2drfw76gpf2pa26"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1z0jlvv25ya5v4rn7cmpwpdbafjmhrb9b7hp6x9nlwrhbpwjh6q2"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0yzk3yx3c20ms7np2g956m1j3y5xf241gnvpsv37z173a4j7hlhn"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0sdajn0sxkvqpy69ccl3l7f7ky4yhj4z304b19wplqfy0qal2gn7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1lkch9qhzlx8hpv6msvfa2nd7qqkx6xj86akxwgj1wbl10lbqv47"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1dvq7n1jrsj07hikqvbbbc4wmmk5i9vsvgfcg39vaywmx5fdmfw8"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0f4g04lrbyfjgcphv12zcmsvxa6krjk33kjn4lfdfq3440znvkig"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "07qsfdyym47shm3n6m7i9flb339xannxlch2h0i5p9ca2z1a34g2"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "11c6yh1kax9d5qp17znbvll41q953x4ymx5yvhkjx23z6ra8skbb"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "06ha588as5j1njqga4xamfnw79z6y13i596syl0h34pdmsqd2jll"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0fhprxkv94sgyghcif81dzng5jwyrb6g1y8z78g0wrppjf0k2ixc"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1npk19k2qhqm89hk2jhf49acig330myvksamd3xw2gjxa99xz7lz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0wbs15dy8zr45d1jqnky6kki6slv150hqlylglva5n0cs2ami0si"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0s117w3a3ql7d6k2bp88hzni3k9cg24qcmbqz50z8b1gqhpw9y6b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1y6h2awv9h5h09xzhbfr9cd500928knx38ixc28q9v3r0xbw8i8k"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0kximpl89ks2simxnz10z836rnvaysys7c2jddhsy1z7z30gpb9h"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0ifmby85fzcazzlw36mliz8ylmbxdxxqbpibzlzn65dj3fmmkmhl"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1l2lxnwp129sa268n3xbrifq8yyfn292nz9arqp95za091zj2rri"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "09ia0zfb63wmr7a7hlgyn5dnq2dv78apkd834150pzbz83yr00vz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1pybcn6rwwg6b4l7a1sn0nxkp2lb5ar9vzwn6ggd8vwrwnppjvq4"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0r4yhw2h3clkscpxfg9vpl3x7sh89lxrqmddfvz2mwbqxs64i44q"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "13jyd5jkz8wmbz6n7azxdnbw48c9i5zkwysza50d1c3rlxalpq82"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0fjms3ram2zjg4b6njwqj37dyfw9m39syhw78w0p5q97my4vcrs2"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0l4wagp619qar8g9yji1sf4schlclyl1zvdmp3w2cp9lnnwx1p1w"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "18d9armijpdncqv8crz969dgrana0cw6f81di0clqwhx3sgmm29v"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1a8x128bgbz9gy2wsmhijg4di99k18ybs9mwvv37hkpw6mlfaxdx"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt4_amd64"; - sha256 = "0xiqwrgsz6dfa0pd9and19gyvmpha8x2sgh5hg3j6kn04cza8523"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb"; + name = "libxcomposite1_0.4.3-2build1+srt5_amd64"; + sha256 = "01kkvnndzkzqx9pacrlirn435z7dky7lkm0clv7yya3xaw5fslv4"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64"; - sha256 = "0zzj3j8k1ci94y3kydyia61crfw31qg4gqj10lih0m86ci5asyyw"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64"; + sha256 = "0n9dgdi8hb1w5dpasi2pmm5ysrckfch930yvx9grs026dgz3s2g7"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt4_amd64"; - sha256 = "12bb67z98j857wixl51bjg0mgq59zid69ng5lkdjwl5a7cqjgl0f"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb"; + name = "libxdamage1_1.1.3-2build1+srt5_amd64"; + sha256 = "0l088wzpyn15nmy8c6nx3p97qhklxhyaxm8bhafv9sddpr407p4k"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt4_amd64"; - sha256 = "1sw99jdxdafl57y67nssd0ninmiycfgmd8vbi7q3rpp545vc878p"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb"; + name = "libxdmcp6_1.1.0-4+srt5_amd64"; + sha256 = "1jx1i0i6vrm6h2sq99f61dix0v8j1f6nq4d2a1hqaw5f1bsra4q7"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; - sha256 = "0z9jhx6jplin6fzbj4v11aq3d1wqvy2rb2p3g952kymi9372mnr3"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64"; + sha256 = "0ip72ys964g5569rbgsrcv8b1afmwm1mrskgrgiqjs93bhr5i4c4"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; - sha256 = "0531x9n6p5b9n8isjwmfnr8kmwxyjp81mxrdkmxf6v0k4j0y9sgg"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt2_amd64"; + sha256 = "1x2255fch7g2skiz1x94vrm63ahcwf258w2qjkadnbqwivyf8crz"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt4_amd64"; - sha256 = "1bipk6d6dw57pdcybbyhvszjad68qckg4i8s9hkn3kn89d2s46bc"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt5_amd64"; + sha256 = "0ylsvvd28qwz442scylrp9gmmp1y6lvyj1bcjd5d4g0fc9iwm37d"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; - sha256 = "0m9h9k5qbqjiay4003v51vbbm9i24j7g3nx6q901csndjk5aq6ss"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64"; + sha256 = "0g3nazw6w77q91c0dsn040y79d1rmg4njg2n3cv871630zghz6rs"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64"; - sha256 = "03dqvmdvcdraw0p483qrqv6xchr6a96vpmbbni6qcdak1gic2xkb"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64"; + sha256 = "1icp7syxhfgwpiabl7503ylw66m7z3sq5pn7wkxb2yriqxfj3nmp"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64"; - sha256 = "0c5acgsr7as7afjwvl6qbqbgn3wpima2k55awgga6prvhzkas60p"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64"; + sha256 = "0k5wagjkf60ys0cg639758c1h0cjmziyxvp5597vavbds32sl2hm"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt4_amd64"; - sha256 = "1l08mkf2kwgskhzh9s43g5vcl4v1qphn68ila8g9gfw05gq7r0j1"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb"; + name = "libxmu6_1.1.0-3+srt5_amd64"; + sha256 = "0pabx6pyazssqfs775k4l19frqv20225n7jmr1ncvwfikiw48gsl"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+srt4_amd64"; - sha256 = "1z72sbc802sanhagf0w26hkk3yw0zdahw7dk89hjcgp57qmyyb08"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "0nv7v30mh3j53h7lcvqm2ixnsbn8328vcfbd2ysx2r2fac9waw7j"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; - sha256 = "1yqfa0nllfqk9rnwj65nx8ni5xy4pn2nfasbkhzs8cfcyfd96y4x"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; + name = "libxrandr2_1.5.0-1+srt1_amd64"; + sha256 = "1i55vzgaalxlm0mgi7c52nmpmksyffbf93isg3i2syg5nzain8v2"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; - sha256 = "06v7qfp10gfzx04znksc1mhx5a90za29hi90vinjrzccv096ak99"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt2_amd64"; + sha256 = "0zd4kd5235vn575msfgl48j4czfp4fc44y439gcclpadkhvciviz"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt4_amd64"; - sha256 = "0w0idnk6i94klavy80bv83pvkg2m8qvjaa9w641995r6drm9nag7"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb"; + name = "libxss1_1.2.1-2+srt5_amd64"; + sha256 = "1k7248hb63ml79nqzij65rmg8x0ayi41zpl9ls6my87a6gzswyhr"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64"; - sha256 = "1blcs2ngp6k5g87y10f2wgshr7m44943ks1ykpb59ss1w5j6cmx6"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt5_amd64"; + sha256 = "0gd81vk2bzjc9zcdbgj57hwhs6v9dmzajrmngmaxavyzv2fgamka"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64"; - sha256 = "0mff4swa68mldsv915hirllccybbgjn3i4j23bj4bf26hasr0m6x"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt5_amd64"; + sha256 = "1l1l2073b9cd76ckn5f2d4qb4w1k48s0dlki93bfikph8ms6px8d"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64"; - sha256 = "0ahk7z05sshj649vanr2hvarwqp3aphqwbdzf3hjd5rb9cg061fm"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64"; + sha256 = "1diqhhj91knlz02b6ha940091yjris46d5swy3zi3r389w2b2crm"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64"; - sha256 = "1sgjxdgx8fd780imrqwiwqlhwlmgrndam8km9visymcr431yjbnb"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64"; + sha256 = "0cr24gybxz7h8s9rijr75dayahy1kx4i6gn5q2q6h4z29v046nc4"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64"; - sha256 = "12csbx3bzziygw2xa0w4d0i3gh7l2h1sc93npvsmqnjxs6qmwnnz"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64"; + sha256 = "0ajisfqvlajw0m6kq3yv8j6f38dfhlavrmmfdq5yqmb70wmmkk71"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64"; - sha256 = "06l2s654sg4z16g2b1whrjkz2gwqd0mjgf9w3jzvwwdbprc71gmg"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64"; + sha256 = "0962hhdg3knxnjinkv7m3h510fq8vghjyaxnsnsyijqzfawi4rfj"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; @@ -1752,1746 +1743,1737 @@ ]; i386 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386"; - sha256 = "0i6phg3gmiqx4in4ym5iv3l15x396d0gkrs57x5p7mw8ahb5fq7q"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386"; + sha256 = "1899b2x8kfallda1i0m1hph7v088q7px0rpxm8w6qwp5mwqy4rip"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt4_i386"; - sha256 = "1vsm25lzylxf4mvqs5p171qrl8aspdi5rvlnpfhc35cx3vhkxg79"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt5_i386"; + sha256 = "0jdn9nvjmhphv9iw1h589cy5q1iq0gp9q4ibm0m69lkazi2v1blb"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386"; - sha256 = "1s7wvx23xnv3i3mw6a2pk9nr9s9wzpc99cr6rzgq3jxfmph78c4r"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; + sha256 = "0zsb0kn2kn64hvf33xnp94k5i9c1269qyla8p5q8vzwplcl0qrx9"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386"; - sha256 = "0rlhcsx8lvnmd6hx4iqh6z49jqxb2wlzl8n74qcbkx8vzg3jyffn"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt5_i386"; + sha256 = "06h5229y2md6d73imgy5wg4msv6s9vl056p97jq2hrf4di0q6a76"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386"; - sha256 = "1jkma0v5z7i7plamg49ljk0mhg3qf92k1disdj8yjjlgjf3d0isl"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386"; + sha256 = "1fyha082h0jr26gjnsxzj1c6rl63c9xc2kgf6cfb86dmsmbvpqqg"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - sha256 = "00p0qi47nnzlh31ajwalfh5kimsmdzjicgl5lnfg4viwb0r07vmd"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386"; + sha256 = "0ix60pix5cnzd807v8q9mqhyhhksqndd7vc6brs1daknhxn5dsi4"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+srt6_i386"; - sha256 = "188r323k4y6jvq64qywhglllxfbcpji15zvws1qlicv4nrjh2yk2"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb"; + name = "libacl1_2.2.51-5ubuntu1+srt7_i386"; + sha256 = "0x6959ivq4v8x9yd38c7kfvds9g3h00znim03dm5rvl7xl2k0cxn"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_i386.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386"; - sha256 = "049qhih0dl0z13ag1kradvwydwz90pllwriwnyjx78726fvcsa56"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386"; + sha256 = "1bbf9k50d3df4sjn2idizk2bcpkcxkg0wz8mczgzkh634753pkld"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0gp2falswr4hfcrfj7avp1g216mf5sargqflwyxl6ixxy1yxp22w"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1qgap0ha5vlpz1fnf2fppprzh4lyrvy7k9sj0whhb3f48ass8mh5"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386"; - sha256 = "0cy9s4wpnq2yd08shvip5mzg5a5mk76zmwyq68brqblaf1yqw907"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386"; + sha256 = "0wa019012di6slf29ambq249fn6w9ldmyxx80k564j9s1k510ivc"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386"; - sha256 = "10qhsgcsabp0mrihssj7znw67kjfmw9kv2sbplpwl8bc52pxdz6z"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_i386"; + sha256 = "0hrrpjp4wg13vfam863hwkhzv7ngcydx0iysmfkxjzhmpf3j4ghd"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt4_i386"; - sha256 = "1h2fs8azxz9z2wa45igxwvfaarp50pqx26jznyrv35ayxhnzsg8w"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb"; + name = "libasyncns0_0.8-4+srt5_i386"; + sha256 = "0k8rngiq74b574fc1jqfwf77f57qcflimbs63pa2jx1jqg7gxjx2"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386"; - sha256 = "08sbk32cv4r0nmhp8ydbmjy8mcnsi4y2wjm606d1hrqqnvhlk1yi"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_i386"; + sha256 = "0ldl3jsmf16mbf1bs94zkmaa1b1p9d9rvajlyp7iqkbqw6qkszlz"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+srt4_i386"; - sha256 = "06ms0pfsb85y53l83fvs2zh39dqzh7bw0jh6zsf5wi9g47y2kzhd"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386"; + sha256 = "1iyy60mpc6radds5rh9i6m8bmfa168y7dqbnz3jvgps5zndri363"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386"; - sha256 = "0gsbwnc5s6hd412djs257fgy50ayjph5gg1jhmvgz0nf0wqqy60g"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386"; + sha256 = "1yyq436zsx8hbfhhv4l8ji85narl6ws8flhfcbqvxldaxlzv4ls7"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386"; - sha256 = "0cfn660pngq7ackkcid410g8245grcs0izawwlmkhr6y19nma0jg"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386"; + sha256 = "0lhvj64i4dqy0lh73kyk32992fqkhxxr7k1cr97a03hdpaa06ycq"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0dz4d63whrhlsylvd1mqzz5v3xpwf88cgga8qr8vgf2vaz7ns0k1"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "129g8jgy4va5gszrq9pxd4p51zja9svcm0hqx8g12ryx5lfkjjc5"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "1rxbm4n09q4brhklaa5hwzaipv3y34a3jphrc724s29dg178bb6y"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1vnj97sl686wlkkxbhvn5s3ck60nzrqr60y4wxg9a2hxxf7ba1gf"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0f38h7h4m1g63jh9lsnq9win2k5zvg8i5khsadwb154y4iragm2f"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "12zikl29fcq5vc0k5n4l8db8q0f95h13hlqgka3cy13nf31kbk06"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "05lh422gvhl990yvlp4a0l3mfqn4n0l41fdaq4m4r5i23izcl3s0"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1brfvbqwga1hmmyarbwksbrj6kabnfnrk8hv9xrvd99jak3wsipl"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt4_i386"; - sha256 = "1hh77sg2pan5qlvxg82my0h1dy53rxrgnl84bggn2kiz9i61ls2m"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb"; + name = "libbz2-1.0_1.0.6-1+srt5_i386"; + sha256 = "1nngc07hwr96n1k56bi3i2yffad8dhf1zfblqlz8pffi1yl92vjz"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386"; - sha256 = "141rbp47gkvzfqzrwg4j80m1ay2l573p4q3x2ym5nxzw3f9jb00a"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt5_i386"; + sha256 = "0vnz2d66q9pkn8ry2ixbmqcyz0kpqqmimaxnrfq42g1lz8k44cs6"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "1mfv3q731b0sjl2axc5qf1drp4dfwsmg2i0c222bs3ccvk9m7bcr"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "10bw3fha2nc8lb3md5l8yj8c40rx7gm7vg9lk76359p06z3ypvvf"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "0iddn7f56g1lajd1f0s77s06qwh5nk0iv2ai2r5rcanhq693k3jp"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "1yg1hllxp2m5rv6hlgh714yhcb9l5ggg4lfwv33yaw4fnzz387km"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "0qpil9xifaq1kkmrga6v9sz4sl9dh78rp9kzm8p6c9hq2f4w5j4i"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "03b6rk9gkxx4d75cjr27w229nsc1jjp2fy8ln5gxp2bbhywgxl4a"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt4_i386"; - sha256 = "0llaf4hgb4v66hwkc6ibrhpadhjxkiz3frl00f6yagm9g6z2yxvy"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb"; + name = "libcap2_2.22-1ubuntu3+srt5_i386"; + sha256 = "1qy9ggswl8cbp0zbaryc7cd4bcq17qb4llv8v3zcj08wxr6v2ram"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt4_i386"; - sha256 = "0ka9z2sq315xvdbqmbqg76j3wknfa88hk41jg94svnqf4fbawbrz"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt5_i386"; + sha256 = "0gs2q5ql7wq28y2qrs9v9gs75r6ycq7c6xghf4s6g5s8q4cq205k"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; - sha256 = "0d0zpm7qx1p4zpi5xk585hxfirn6i3v53r0br7dlaiqfy0divv5z"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+srt1_i386"; + sha256 = "12c8gxi0l0qysbiw81hbysf5hn1kgv956csvrn71yf52zwqwr388"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386"; - sha256 = "1l49h8v8dgi4n2j32012zzxkyqgg7b9z7d9lxijj0cqwwjq6fzpx"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb"; + name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386"; + sha256 = "03x40p961apv96y59dabvp50s3jryccx2yqrw9i3dbflxvja5rbz"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - sha256 = "0z5qnjgmz9c917vm6r1m3856a10brdwx3d0k4qcv9vlv1gj1ln0j"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+srt1_i386"; + sha256 = "14yb0a5cglgqvwa75kb6lbhfpmpj4xjgxz6dm27q27pcxv9xx5km"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - sha256 = "09bx2gxldswb63nql2b7x5mq55miaz7x5gbzscrc1kybnm0vvv75"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386"; + sha256 = "027dgd9ik9zxy2ixi1272mskbax10cg0k7flljhcx5zmnwvrhxhx"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; - sha256 = "1lp548l33i3c7wavq9q0n9jhxm44mg0jlrgi89ngfm705141zw4f"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386"; + sha256 = "1m8aqb9hvprl0hbswha0raz6pp3gs84cmqg40fblbfqya8nibdlk"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386"; - sha256 = "13dcsf3ipayvrzj1ksmxph31gk2zs3m0ghy5jh3aq648s5ql2jj9"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386"; + sha256 = "0slsk7cqdrbnm35zqir21ms0vv1hv44i184x8ip1lg936vrvbxka"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386"; - sha256 = "14glmvc6923djpcn2a9kwhqm4myg1y9mp38n7gkby1wz6y63zvp5"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386"; + sha256 = "0g4zmrwpifl4kxv311spwyia1xrd76m0aizb3jzv6q8cc4hla3ii"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386"; - sha256 = "19ijz82wkk9z8w4yjp628hga6dsv7qr7x37kr8j8fq430gbl5y8s"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386"; + sha256 = "0kj6pfpgybkkb5bjfr9qgczwddx5lkbwhknlcymhhi94jcfbcnbc"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386"; - sha256 = "1dh1idpqqh66l2awfim17vk94238wb073d3xj74ci8gxfp0rxkvr"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt5_i386"; + sha256 = "06br49sn30hrxlq479xi3vxw3blkr558kz4d7gym3fxnwfa6im9w"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; - sha256 = "0wv8iym5bhwlvnsljxfjwhl8z39wh5nba6li1i7nnzqj365hmdc4"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386"; + sha256 = "0av7wcy104jz6pci7lgwpmvb528v9idx660qrrabdqhpd1m4hv8s"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt4_i386"; - sha256 = "1064kf252d1v8asi59m67bz7zg2k7fmgkqzbib872yb6qyrgj7p2"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb"; + name = "libffi6_3.0.11~rc1-5+srt5_i386"; + sha256 = "0gvhndr5y4zl097h105fr4q60sg38mhkhlw8ha51ypzcm9f8na6d"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+srt4_i386"; - sha256 = "17hb02f5yapkfkasamx6whxm76p1gpjrz7nq7i59zv0lfxwgjry7"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "1rdfykm113vps893xdkcrpphb06winv2566yb9myg9m3aybcldrx"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt4_i386"; - sha256 = "1vz2b02asscpr155v516zclawfi28m4yxf1ya33848ydg067iz35"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb"; + name = "libfltk1.1_1.1.10-10+srt5_i386"; + sha256 = "1j0bhpgsaw6rphy1wqp40wn8yr6qzrxdmwarc2amryqw7bqslmy5"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386"; - sha256 = "1dm12wk4pj2h4y0ykyvv9fs6s0vix1iy3hkvz2fvqx8wdb8710n6"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386"; + sha256 = "1ls25q28jk9znmi0fhm30cqilx9bmm463zfq1jmj5apw96wk64n4"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; - sha256 = "0661g4ghhynz49kkbr5kds1ms8prqmpm5rz0qv3c7cf62a2lb3x1"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_i386"; + sha256 = "1zahvr5h833mppcpg648jv28dywx9jiqdv58wlv1vpsk6d9599bh"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "19qracxc45irfmsbcn668zwdxx37avp1igj1z4c6xq8bmp6w685d"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "0bsm95m17f9lxrknl11jmaz9mqrbkd40p29z44497fw8miw736r2"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386"; - sha256 = "1srwysvh165hwiqxyl0aac3j39zzg2v4g3alix51cbvc4s6yzhy3"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_i386"; + sha256 = "07b1w4ww3xb5r13px85f8rv4nsc08rz8w3741zdk0vacq8scw4pb"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386"; - sha256 = "1cg2kps7cfmildp9hlijxsj7bc2j71xal6bm57ldz2vjcv6k06hl"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386"; + sha256 = "1wbaml6cjdijcaq6c9m0lcdlh350fk9a2prh6z4k7fjhsms60ppc"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386"; - sha256 = "1n5pyqw2v87xw32lj73aywhfgcmnzi2wvxxw2gqv52d56vzj254s"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386"; + sha256 = "0fis055pnc01rb5v9vdqc17w4ijdb6sksf2qjysc4q2j33gvh6d5"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt4_i386"; - sha256 = "1aswani1ymq52jyr4yhw4vi42gzw6xqk5ygh1d7zycakgrfs179b"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb"; + name = "libglew1.10_1.10.0-3+srt6_i386"; + sha256 = "17ki8vb4nbg140fg7vdfyb092lcr3hpsjx0z1gz13bvmzxcff3lf"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+srt4_i386"; - sha256 = "0yxnfi8arnp3cphxdviyqslw7nxnd1mx11v9i5i2xnl907iyaxpq"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb"; - source = fetchurl { - inherit url sha256; - name = "libglew1.6.deb"; - }; - } - rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386"; - sha256 = "1lmxm2gfz0mkjafpw8f98y73f0lj5m5nfdarqlpbb8dqbmpabwvk"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386"; + sha256 = "0l0vjcff86mw1mv5kizg3pcjr8rk9bn2gjf0d22jgljisq47f607"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386"; - sha256 = "11sdfs3zphb8ks2cpb646z4vza6s4zpbfgaq99drn5z9b8d109zi"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386"; + sha256 = "1bc2hb2cb05j4iw9lrskrqkdh8iy7wv3d1sknqn1ya847w98h9hr"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386"; - sha256 = "1f6ss23vybyqkifjr9nam0y6va34m2vdpaxbwjmwi2z4wwj7pn9k"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb"; + name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386"; + sha256 = "0y6qrw7n41szpi8p2fpilx20wmqk3arw0m7kr35isy0y3icpryka"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386"; - sha256 = "0580r5n6z9s147q4bkkm75a2pwb1ganz9msbp440rwwh6xahrh56"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_i386"; + sha256 = "1f5dv4bk2g9ldqfjm7a2a6mx2ignzgxy42ghl9yny6x9xz39g56h"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "04mywbz2lmxap8nq1rvj7aggkrvrgfz4869q41f0d6dnsmnbsj5k"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "0p6gj53jdk3d4nmhkiiqvh8sk3pm2g99iqfmlc7br1gxvmpjjj3s"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0hjfgcmrjr02xk788chyafg7j8viwmp2vrqyfjdjf79kvpy0354s"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt5_i386"; + sha256 = "19wh8hdp5lcf68w2hwmj8z55j2bcp61ydf37cs796rvzsxbsbamr"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "06sqdxf38qm6cd76gdir6m9rvbg4xv70jhh36zshxxhi50lhpjcx"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "1zkvqbm3i297b6pj0japgs3jcvps8my6icsh2n1ka6nvflvdr87h"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "015jb2j56ia3zvfmjlx72yjlvfv8z8bg0ff4z5nh1d25cambqcbs"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "0q2r4fmpql34hpd061289ijl40y66wp8rlh78b2ysg8dkvycni0k"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386"; - sha256 = "14z4v2j7lc5xnzbfpf8b3b5qg0d2yg917v4ighxy2nydf2zy0mrs"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386"; + sha256 = "0nq6hvv00b3s5fmay2nm4s869y6lws8v2w9lrqlpgs08z6fh6mjp"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386"; - sha256 = "06lp4ajhnczb5salf6njgi1q24zv3yrkqhgvbyq45dvsax76kafj"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386"; + sha256 = "0arypn4k1wvaiqqxc271r5w7bkdk0f4mh88l4np3ngfyzn2w6z61"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - sha256 = "0qhvr5pyjj0vh2c1658gmx9r7h194py8qbcx69qfca2czp9hhacs"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386"; + sha256 = "0swmpdf7872z0nb3rsfixspg11nvf0k7sm4xcdgvcliaqjhyv570"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; + sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386"; - sha256 = "0z8ncxaqxna0ihlp19i7b59k9vbkynak49kim821rwxsxvjqsfcd"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_i386"; + sha256 = "09gjla6gsx8whbvhzwvgjnm19md7bgpvb76kjfmxzm54hakcjxla"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "195yrcwrw8bnai5kkvhdq7nnjv643af5dyc97qcnfnvnvs20az42"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "18v3rqaclhdmbh25p48sa6qidi3birnymdfzg2c8z5bpg1giis83"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0g2dml08mw4yy9llnn2149x1niy97mqbz56rphw3g3zv5nivnbp3"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1546i5h5137ysvcgvyi6hplfx54wqya8sr233vgn838xd2bz024r"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0dbs4gxbfdhn2sbzfny75fzxiab9k8l1vd3vm7i4zfkbkx3lbr2x"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1yk0ap8wsi5k2wz5i9vcdw332kbhnlbf5hb8la9pckfrxy6bca82"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "01z9qr5r7n7vfkkb95apmkcc35va43qxsf0nzxff8x1ll82l3n7a"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "0y6awbyl4w56qa8vkn9dzsnb3162x4p5nr1cf7ir119nl05987cp"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt4_i386"; - sha256 = "1gmykmbbxk9590snli45dcvj00v77xn2za8v8193v020qa8hvmik"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb"; + name = "libice6_1.0.7-2build1+srt5_i386"; + sha256 = "02nygw4q330jgrfgbp46fjpa97bmgzk7sg9ikh97k4c743lshija"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.23-2+steamrt1+srt4_i386"; - sha256 = "1xmv6kqn3zpnls7nyqd2bjqzc03y4w2gp0xmq6l8wwi659dkr4vz"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb"; + name = "libidn11_1.23-2+steamrt1+srt5_i386"; + sha256 = "1wv5rfk5a9y6w5wylvbxj8kbmav61y5w3j413kvf373xnhp79gaf"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+srt4_i386"; - sha256 = "0j1v3ljb01wyy5v8a5ad8ar9wmx2hf6qd50k7cl95si60zs79bk6"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386"; + sha256 = "1qiyw54y8yra871vzvdlj2cqhf1yvg68h9zckyyv87s753x98kkq"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386"; - sha256 = "06gz25p9qm0lbxaqzag2y2lhc0wx9cnkxz7zdm2yfdcx1y4vbymx"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386"; + sha256 = "02c4fj82svlkh9whsasclshjlvgbcabsz64ac47hvs2ccaap0gis"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386"; - sha256 = "1m1986mn0ad5basd8hlby4d6jxpps4v0ib2g2pwqxdlil39gmar5"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386"; + sha256 = "0bcp6bxrgdbcgwrg2qgrax111w6xfwyf3rwrpf8j9mwd91hzm0c8"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386"; - sha256 = "1fjbscq7qp895z5g5aw5l98rfj0qpr66rl5r4m0f1ilrjn83i96y"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt5_i386"; + sha256 = "1l3hm9p30w2kwbjyri452h9v0nprznsl9jh32l9hg4php8kjfidw"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt2_i386"; - sha256 = "0nlhsclyxqa1s05hnzid6j8h0986v9viv6dysg22bc16gfdg9i1j"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt3_i386"; + sha256 = "0jnbwf7j7fmrylav1dck17kajxdyc67gfmpn09wrrqy0zgdbg3zi"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "0h2iv7p0w5ydd9nqfwmm4avjhcnki7nl000gpsdnrpfjrbv4rnlb"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "0czc7vf1q84k252wsx9v9na2jn8vqym62dnb100992cpzj2956c1"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt4_i386"; - sha256 = "1v9b3dg1s3ykj5abi4y2392m12dw2n7zrays6sv1n2dw46f2lj4k"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb"; + name = "libkeyutils1_1.5.2-2+srt5_i386"; + sha256 = "0vmd87b8kk579fi99di79p94nkl0584bsdhgw2gw03czbainq9rx"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0h4mnxfsf8j12g33lca2nlrcma9d8gdchxckzr916yp4snzjk0bb"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1hjdfsvqzvssxiamjq9dddlzjjz54grzva2a7rsipbmmvnw254yd"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "1ay1g283y3y6czm56r7wiibarwv267bg707ncaq4m7a9bxa0fmy2"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "1cr6z0jv6mchs82p6iyskdq6ppbfpyixanxwdbjdg76cpb5as3ii"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "031qjg6aajyrdj7ny9dl2v6p9syyngqfrdy277351814zcclhm1l"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "11v68jp8f24abx7i6b69jimlmv0lvpb5hnlxnj3f281zsz2smpyw"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386"; - sha256 = "03ix9r3mxvgq5i5qv7zhjmmg8bki8gvgg4n8r79az5zbp4nxmi4f"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386"; + sha256 = "1bpb8gfach74nibzzd2mk7mkdhlw1j27yrgckpl9pgzq8jd0ch70"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "0aycpf6xkr4fxr72np52jg6y384sy5b2r68kmmnzixqifykgc7jx"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386"; + sha256 = "1147dl2h2k2xhl6xlpnamg95rkmp4nq2k01fcrv09x442hmx34xf"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt4_i386"; - sha256 = "1kjphpfqjr5zsa1z1zq4dibxwhm5861vardc3xic4izqf05vd6nj"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt5_i386"; + sha256 = "1jv01xk4bf0sbq8jawa0zm1q0imc7nmzdwcmkhgscld02rzwwffs"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt4_i386"; - sha256 = "1rm18888n955wgh75srgrfhm0zgxz0n5sr030zc4lpp3bx4x2pfd"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb"; + name = "libmikmod2_3.1.12-2+srt5_i386"; + sha256 = "12dmbmkv3gmi1cz0bs3fsbhgnhzvf8cjp0b6zj2a2dgplw1h6qdr"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libncurses5_5.9-4+srt4_i386"; - sha256 = "1lc9s9rapyq6ld0xzlagqi5ah07gh59lixg0sh4xxm4sz75z6h21"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb"; + name = "libncurses5_5.9-4+srt5_i386"; + sha256 = "1jsi7qvwy4h1z1mf9qlhp5pizbn84qgnpgi2y1qjlgym8428k0ga"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt4_i386"; - sha256 = "1j5r17ph0z43npv4nh5xgz0fdw9magas5ryr6qpi2pcqf5x9pp9r"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb"; + name = "libncursesw5_5.9-4+srt5_i386"; + sha256 = "17hfrf97qcrw1n7p4nwwwiw3jpqpjphqwnq73pb7p8bsp53qa4h4"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "1jr5nysd947lvk39ki1lx1y8csyaw10vlm9db7djrn20b1a6dsns"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; + sha256 = "0vsd00x0wvqw84zqlqrbmdxfmzshrvwbr2az3ynkaz8azkxj1d6d"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "01gf2wf722mc28hyfh3g45p2qq0v04nrhkhz96xd8mwa7jdx0cb9"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; + sha256 = "1vaqqgxzvixvh8cvdspyr7azfn8dmknvsypz628h2xvbldf0p156"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt4_i386"; - sha256 = "00nfvgckkdfal6qfbj4hcp5jc0rs57ksl48ciy87v46inxgp67z5"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb"; + name = "libnotify4_0.7.5-1+srt5_i386"; + sha256 = "0420awfss4r2j8ncrvnapdj9gbh68z7qlp1vbq9wiaqraqy7zccw"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386"; - sha256 = "00di7dw9a124ahc04m1rs8w3mdx1kpjhf696zvgxprn8qrwwp84n"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386"; + sha256 = "1kfs3afaqrfhajbp6dlwzcbzvl8xsg2c04c6b5l1bby1l4ynmqv2"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386"; - sha256 = "1n46ln69sny735q75sn8g7sp23ahdav277bp0d0bl62k11xa3fnm"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386"; + sha256 = "00m55f14ih9xyri197hnslw2mnzgl0dxwqvwiba0hnhfl3qvqi99"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386"; - sha256 = "0bnsrk44pwzwjs7yw44kzbr5b10kq3jsvrskzxxr2sv12ljhxmrj"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb"; + name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386"; + sha256 = "0b47v6s9x8hvhkgvgmy01rxd81i1c8icb0lpf3mldp5ss1q8fwgj"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386"; - sha256 = "18g56z1s8yyxhklqmpy6l22zcbzkvws26v6b1xgg4w3k33hbcjng"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb"; + name = "libopenal1_1.16.0-3+srt1_i386"; + sha256 = "1barqvh4klpdabc1v9kb2q4l8pnmdx97h00hln32zca5z4y5ff9i"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386"; - sha256 = "0yfqakir28jnn873xxqdickf54mnlpp25946fi1malvxadjcqjll"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386"; + sha256 = "0n9fkxs3qkd4mwhm4cwlnljww1yalwqjcgia420ls3h7i4p7ss4v"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt4_i386"; - sha256 = "1f97dfd0z1fzk1l4zphdabxq7q02pdql03ifc265chzq4zpaghbh"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb"; + name = "libp11-kit0_0.12-2ubuntu1+srt5_i386"; + sha256 = "1nfcccnsn7x44wqwgkz0h9b3hzy3a0cknc51syniabsqds5w2i8p"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386"; - sha256 = "0xda2k934wpfq01lrc9yw6fy6bispnfyyp5k0iszzh8awfjghrjj"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386"; + sha256 = "0w6m9ycpmlir2wvb7jj0w1p6sh84bjng9i0549bn0afq58f05biw"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu5+srt4_i386"; - sha256 = "1zi4g80r8cgy4zawdddfkklp6q98xm3qlad1a27rfw6zlg66a028"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt1_i386"; + sha256 = "1jdakz038hxpkfh0g10acwlaaiqys7c546srdjhmhl9jxizw9ck8"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+srt4_i386"; - sha256 = "1v1jj9vwsd6k0f6l9a72pbx3idlnjs32zxd1gci2fanma7fsp4vj"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; + sha256 = "12ycdj8pwxlhhqbg89h6smgvnik2pvy6bqyx9szqmpdcjzddagp5"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+srt4_i386"; - sha256 = "01qklrzg9mprb45mn0bj9r5p5d3lmrz0mhiqwjxg07w533gycyr6"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; + sha256 = "0ml6bh7banikn75hzy68s2yx6y6924if4zar10lra1akl63by80l"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; - sha256 = "004abdax9r66z0a359rik8dqc9bsx177m8z5ygjsh40yv7fjgc9g"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386"; + sha256 = "06ch7dsjmjx2c67f932930rawn1cil6vxfnc0xcx937iwd3sq8i7"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386"; - sha256 = "0ahap0mzqdl51ia615j09yaawi36khv9bj9z5bd0wspfyjls0a74"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_i386"; + sha256 = "0vv10bzxqxnfmp1p4wl9c19kravqa7pcpcc6xar5przgwfv75fd8"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386"; - sha256 = "1gwsfmr80r59y7ic21shbflf505wl0izsm1mvld3yif80vfz4hdn"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386"; + sha256 = "0frhw8cw2ima5j40grmdk0hjf6hg6b029wr3f2g2252wzbhzx6ac"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0lfzgjyp4gxs6ns3v0xx82gpr784b7rwnhh37njq9zmhaq7mxpn6"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1284xglgq9j0dqrgggs6455p0qidq5dxd7axgvi22zhzq3h5adfd"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386"; - sha256 = "0x6dkzfc9bdcjr0sq6dl0vk0sjjm9pwp4hb2m8wjynykpinbzbxi"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386"; + sha256 = "04wg1b9i77hv87ra7xbhqzcx6m9xdpx72b6d7pxnkrxxxc8sp35d"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt4_i386"; - sha256 = "10dm5k8c6f8q6vgk0ab52kvikbrgiflbmkflbix42rm5l44bz8hd"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb"; + name = "libsamplerate0_0.1.8-4+srt5_i386"; + sha256 = "070cz870znj9584a9y9npp7zzkkcb049ar2g6m3v1dzf8ijha38x"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386"; - sha256 = "19pkr848bjg2zg43z2l5npx97ydx4jgf7c5n33ckj6wbgxvzbn1s"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386"; + sha256 = "10hnrhzfxbg2ka3wlhbvg1qd15k5vdbpfxhdi3ip6yynr00zb9zs"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt4_i386"; - sha256 = "1d3m36a58iwpykc442axj4bd6s4h7f9qq269qfv07i6cyfp2j87l"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb"; + name = "libsdl-image1.2_1.2.10-3+srt5_i386"; + sha256 = "0iam5axnl4is7avn37jc95c3qxb5zacl5kl2zg5mbnm4wgcywr08"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386"; - sha256 = "0wij7i9d5g9bbjq4xrvrbzqcsdpjn6dhj1pjn997lpgxsfwyl0nd"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386"; + sha256 = "1zv4iq7743y2g0zmycq1aj48s06lcmv60f0xig5s9zj8kj5nbg36"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386"; - sha256 = "1ih95dgbaksgj12x6p7528hywm4zqalv0zyg7k5mp3yfgdxi37xr"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386"; + sha256 = "15rbl3zbmg053ach4d25c988m3kj4gjndj5bz1v1spv46798lya8"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386"; - sha256 = "1qsmhdzs2rr13vgagma0yn39x4njx2gixw82l3zmp6b0rp8x0ff9"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386"; + sha256 = "1da6gg64n9x86ldxns4dfnixxa4sc6bci34sgy08fa3r05aqh84a"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.4+steamrt2+srt1_i386"; - sha256 = "1xxj20q6kv4n8g1d1f5pbg1qaqdaq4nigqi2sq4lzmnvzkm8nj91"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb"; + name = "libsdl2_2.0.8+steamrt1+srt1_i386"; + sha256 = "0ldraz2giwfhgxbc5m0sf4m1xvp21hx5n9cgqj1civa9plhwyrk7"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.1+steamrt2+srt1_i386"; - sha256 = "0s7gyc3d0acddzipc4pc89k5cdyjl8ik7pk1znrq0292rnmnwbk4"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb"; + name = "libsdl2-image_2.0.3+steamrt1+srt1_i386"; + sha256 = "006kbbcrzv4bdgpz2w3s0z2q28h5n37ab3995d1zlrpaxmh03i37"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386"; - sha256 = "0hqqxqnh8pyvaqhb9rhk20qnf4plrmh3w0n80sfzcn1vjrdcg8mr"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb"; + name = "libsdl2-mixer_2.0.2+steamrt1+srt1_i386"; + sha256 = "0m27snsrpcr1d7yd9kn8z0symw2fgivx8ndvjxif45w3h8qfkmv1"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt1_i386"; - sha256 = "14cn8v8bnllkbj88qy2chlj44m4qrdd6h1x705plwy10qma18iln"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb"; + name = "libsdl2-net_2.0.1+srt2_i386"; + sha256 = "0fk45d366021s31b8vlry93crm1c30fqiq2r4a4yvp9gkhlkww4a"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt1_i386"; - sha256 = "06r8vsji64dcswd7mwy9yyacp6pkza8lsa3dwz07yqyb49md9xrv"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb"; + name = "libsdl2-ttf_2.0.14+srt2_i386"; + sha256 = "0v9myv9d04h5rs9x216qjg2lf6pwnngsbyylzc0fs5rlzshwdk9s"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386"; - sha256 = "19vfb4zlpv25x5428zfm5mkwqgdc229mc3saq32pas3b2faxfan7"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt5_i386"; + sha256 = "0s5x224hx0q6j49pvb3bflzyzzi4ryl60sx6sf7y6wi7kplvibvg"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt4_i386"; - sha256 = "0c1rca5w1m1cqi2a5g9k7zpvkvky6da9hkfg1ar5c8xw4ilw304j"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb"; + name = "libsm6_1.2.0-2build1+srt5_i386"; + sha256 = "07vrs3rarjah3q06yfqqpb38j67s7dv2p30izhjzps7xxj2qfw6d"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+srt4_i386"; - sha256 = "0pbb7yv86am1x1fd2s15s7ybyz3q1xjlxij8in9dal1bkpj6yhsj"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "0y4hlf67cdlgcfsw03sjsvm2vch8gsasid58y77rzix43saay229"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386"; - sha256 = "1n2146dh1famhl58i1s4cdp0gyfz89w8vj5msh8hsdjjr8csa83s"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt5_i386"; + sha256 = "0d662dxr5dh6dvnz49pii1mqd8k2xk0jaw07sgl7nnd01926xa9p"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386"; - sha256 = "0gk0b28d9f7zya9vbmg1kj5xm3k3339ky2n16id3w6aks7lc5y8w"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386"; + sha256 = "1924dczm2sxlfn9ibmp7yvn0chd3y201zhw0a6dv65fwngmzk725"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; - sha256 = "160pzj7hmqm5hkixj002q81gcqybkv7xn8z8746dw7h90cvlyvrh"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386"; + sha256 = "05cihfj3ap1xwpnlmvl3wdbqrbbm6ic10zbja98c429xxx7y8bgv"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386"; - sha256 = "142c6vwq852mra2i2jp802wfsprd5jia80xn09ms0rxxa1aa7xsk"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386"; + sha256 = "06gc6qpm51jx0x1imf5nccc3r9x2d41xvfi0wl3p9wvrx6nsna7d"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "187nknssd0x7r0qsw71f3d06pvwbkqanajah4f7a01xk3hc8cxh1"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "13kvxng82xz171y3q0i12bvy8z77cqk6s088bjil4b5fq81aaxns"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386"; - sha256 = "1j2wsczzlh5jpqyr8k6j72107kmhxa3hdiqm0s648i0fyrks54wp"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; + sha256 = "1xh0hvgw6rrg6k1fbpblxvfdaslwkjlqbgaqjkavkkvl0xmk5k4b"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0x3xbbzf643mia8cx9py8vrn9d8c5njxh7x233ylmh8lybac9z5x"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1cj7zfhxrb6mvsd8np6q1s1wja2rdd85h2cs9b2pbnlffbr0b9ad"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; - sha256 = "050w4qc87h9kvniknk62jxpx2i40pl8djbmzbhj2w2lmjbzr7g83"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt2_i386"; + sha256 = "12lfinrk76laq7hiddsvi0gskyfgrf7nk2kflqryxwrpf1y34bcl"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+srt4_i386"; - sha256 = "1ava8m0iv62cb1gi28l486nibd981lsnjbx08b7cg7dd8hjw5lnj"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386"; + sha256 = "0ap5ar8v4ljv138p6kga1vzy96v5ilicxsk8lhp1scvcrcaqfppz"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt4_i386"; - sha256 = "17q687bsc7v2jkcvp1y85mnzdq8kdxwlvxib0h5i6v6qvwrj01hn"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb"; + name = "libtdb1_1.2.9-4+srt5_i386"; + sha256 = "0snf08x6fsjqxs2gzfa7sdxbznq7h347ndawmras84zi0g0bgj6q"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386"; - sha256 = "0viaqm59q9qbj23s5b4s4mq99imyfv799b6ph78cz2yi6l94qvqx"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386"; + sha256 = "1jjbd6yyyw5v5wnvsdc3s4gywm9q0mq32n2dr444qs030nkfvcrp"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; - sha256 = "1zyggf4hp7xxd7jn2rahg27vxk1pxpwcvjlrmc3lnp4d2krnf0pq"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt2_i386"; + sha256 = "0law24ini5ailgykff6blxqfj6zz0lfx5a2s5fzgf06s4j1n2cjv"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt4_i386"; - sha256 = "0iy5lalmyr9lv8vm7mc5zdis70ir3x82aav798s4dvwmhzw7a45a"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb"; + name = "libtinfo5_5.9-4+srt5_i386"; + sha256 = "1476jzkd5mcipafc8cfb03z9yzkxvdxnfc0qa34xq5rbjwcximmd"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.2+srt4_i386"; - sha256 = "1wxkfv34nqch3zi4hyshmwbg9s33q7inlz8zl396p22m1q5m5sfx"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb"; + name = "libudev0_175-0ubuntu9.10+srt1_i386"; + sha256 = "089z7vv229w6gnnzwwagixxwn2qcl8gfim1zbagg266vlwqvcyka"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt1_i386"; - sha256 = "0mmn9l99i595l4fd446jjyh301airh17wbc4wfiigsmz4b4mylb0"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb"; + name = "libusb-1.0-0_1.0.19-1+srt2_i386"; + sha256 = "1rjnir1gm768xhn4lqb4rdai6wabdfysnlzb47qxxzshpfphycmh"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3+srt4_i386"; - sha256 = "1hcrpngalirqbzqfn209akkizqnm4qpkhp42mcys78xx0i0p5kxr"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386"; + sha256 = "1hi8gq8jws689pacx8m0pzjfhrswh8jng39m7vnx2clj7xzfsk5b"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "0g7vra6wlgrvpn1cqx1xnckfxn7r2lzh8bk2gs32cdxc4qy7w22r"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "1q1aasyqlllhj0jhkf7mfcs4n83kj7yddxlsldl77v5x2rhn6ksx"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "0m5p4ciafgdvm4a29z07bcy8gx5n9vr634bwg1x2fj8z5w1y2bnx"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "1pk78g722w8j2zl0hij59p4v3j70am167mdd7f58d179j34v7y8p"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "1k44nikbgll3zh94p0zgnajjwkaxc0lzc1ss24frq1pzj76jgg54"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "17rlsh8sv8qymd17c8k1mlk5gb8fkjlgi2swxiaqnyzw40k52bi5"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; - sha256 = "0yya462g7ar6k54bb8aw9qw6zcnzqlzrqjni9w77pm5vbiy1r0yp"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_i386"; + sha256 = "1qa6bssw4rnyjxw79pfpbhhlwzkxcxg2cx5i8lns5sxg072as5sj"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "0s2m9sa8gyqk56icsb8y65fhfnmbay56a8gy8znz690l8aq6fcvl"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbis0a_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "01hkk2wxqx5fj7qsi00h4al8ddvymhziyzdpzr025bd0ibhgqayg"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "1848325zzklbdc03a738jvs0jpgypjd11sw80qv47i73zmc0wnfz"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "0v26kx6b98mj2glhmd6nsk2zqh3ra6jln1c9ksrq4abxda4qqril"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "0p63wgif2h9q6pd61mfpl63qa1m12344d5nkrd6daq47hmldfibw"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "0l9d7z87fpa8zkfg96709hfpx6jr0zrd5pvjz193jaj5165kamkh"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-1+srt4_i386"; - sha256 = "1dkpqaaclks24kw4wdbzfnkdbsf4yz3j8ygfl6w0y3w2sxwcxldl"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb"; + name = "libvpx1_1.0.0-2+srt1_i386"; + sha256 = "08yngwr92m787ycpsc798kgpyw6ixks55kmqmadjp8zx43pjzaai"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386"; - sha256 = "1fir2kw66z14pfs6zqa5i620c9rli075dk9mj9802d723hr78ylh"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386"; + sha256 = "0g9f3nk2bq8knqqs6qplw39p729zxqnxyyhipnziqy8h38bilj86"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "06vhdm7d6h7cihk97v5bf2b8mb5z1ncca1yfahcxmgykm0amq89w"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1xzj4q5wk1pjflqqd85cx1788sd89fjdjgwv4qlwyn76magxi7kh"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt4_i386"; - sha256 = "07qszw3j351x9vwz5q6qvzanp291xn27zif1ir5khdwidr5lb58b"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb"; + name = "libwrap0_7.6.q-21+srt5_i386"; + sha256 = "1lhp9v9cpi5dgk0wdrivr50b0g3l4fy8cjgnjai25hb65w2hj33n"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - sha256 = "0wsr47fjfvjxz0ks07va0mqs8d6b8prll5512hvivj6hf6x8cngm"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt1_i386"; + sha256 = "0mvg378ja1znf6qf5228bmijrznhhzw3r7lxizk9iwhz5pm6h2pm"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; + name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; + sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - sha256 = "11fhyqvfbs0jf71cnmld09q23abvnrzgp20zabrvi2r5vk0ai6f9"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386"; + sha256 = "0vpnnsa4ayvin11c9gl5c8bbaplz1z6pm28k0fhfhla5ggq1kd46"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt4_i386"; - sha256 = "0pw507i7nfr1zqjf8ysjzqgml053bwlac2jxv78b2rp3l3xky4sp"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb"; + name = "libxau6_1.0.6-4+srt5_i386"; + sha256 = "1q5qryha5ng0cjcalz5qxd38djxd5n7kb2fnz9mnp4cy2vk5jhmq"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt4_i386"; - sha256 = "172kg32mck6v60cy7bxb3wpmhn09jay6lg0mghb65f57bkqb539v"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt5_i386"; + sha256 = "17085yj7x9hncbgxw5jsi4inn17f6wzdx2akzv9v3l6hvhy8kmkl"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0m28k3pwgscxzbp4vhrncv12l0940s22qc8lrgzb0vi5ha4vb1zk"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "00zfy06nf78gs7ji222lcy1cwzsqfbng9119cgkw5c1z25x0q6a5"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0z180s301vq0bpnv18hqad3n5hsipv6svjgiwacq9c4srryn22af"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "09y48s64kp0maldv9bwwpj8ahrssvrik8xmqzjgvxcxpblb1zfb7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; + name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all"; + sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libxcb-doc.deb"; }; } rec { - name = "libxcb-dpms0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1k66jz8ms3mwbmkfdg9xb9wn77igwrkhjrvg6lw847c2f5rrxwp7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "085b0qhf15kaw9msmsk8jxp4rk7fym506jmiaqxh1i6wgr66ys86"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386"; - sha256 = "00r0pcda8hc7sq1nj93621p55743dys424fi3n26hdmdky9j0rks"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1nwdr550axxca7p438c3g9jb4y2zf8gxyd3756vav4jp1n57i1rq"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0lgg6b8sxd6s22vn7vwiyb9vz39v124y9w74g6krxqmfvbkfva2x"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1vjklblpkdrki48dn890920nx8gcj25sxqp24qkpxja8samvl6gr"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386"; - sha256 = "142f73f4mkvad2l238kyf0xl4kwzgcpcww33ah3rx4qjz7q3ails"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0zwc8c896bka6wi5jri78q1pq5ppsi5dwih9rwfl5c96p6r4lbr6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0rlnxwazwrp7kpgh6d6dbfzk5cjvlqp31qxgifd4b8fryjnan91f"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0cd4jsyj1r6b7nm8g6342f8dafghzd1dc0k61iw3qncwx949j3gy"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0qg20vdidpbl6jar9w4n65jfmg907fkqrk2nwh6qj0l3xd90pm61"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1vfrbkq1qqjp0278j70jcldls2g9rmkh9ifb6pnqznagqsrrhwy7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1kyjdazkvykcg76yp3gyy2pgj07nwbjld7q0ci96q1zka3a3m4sz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gy7l161idc59a6q8vhgq1krknwmd1cyh5ss2vhp7qznxwh9bd7j"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1r77z60hz0bblg07szl6yir6ll697w0w1y37bd66wv9n4cdlijqd"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gl7389h5ppfd3p30v8vmwl4kxvsqjhmhazszs7mdgalfjwkf9rf"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1xnnyczipj30kzkyrwngkra2m3xc8jchzd88a3afgy4m6cy6qyyy"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1ca5lk12qncrfkjakjb7yl5f5x41b3ynn3d9wk6paqrchhfn7yir"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386"; - sha256 = "155m47mnjbn9b5p895syyfxk9pk1sh76qj614k554rf77nwdx8rq"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0sz49j0z7zl2mx7cf6kw4ljzsbik92az35yj9i0426p1zaqzx0vs"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0wm9mm8xyh70zdc7iz8j3y89n2c5yhd72kq68nbxqpnwrz3kyzcz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1mycsk8ixdn7c8c4ma4vbrilhcdjxqz92nzv9rwxf96vr0dj4bhd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0ifvwv0jq4crsgzfpbssa4p9r1jk7mck4wlpfq5j11aiijyw5fq6"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1w0d53d8hgzr5ql9is7x4dap6ny6bfp041qa6hldmg8jbw3x8wc3"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386"; - sha256 = "0wsf356qiv9frxky8c503bb7nsksrgn9zii7h2yp7v5wsxpi20p5"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1pd0pw5q7h28p0j6h4889dq7fpvkjwclsmg96m6sl7a3459cp6b0"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1qynissbyb4ihyyy61nhlm4nqsm5akyfkdfyw38id6qiyh1hnml9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0nf3s5jff5psab8mv9avkflgwfj2pmbrvc3pyy743b9cwzv7q85p"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386"; - sha256 = "013mhdbavmaqvw99k52p45lzfri1fhyclg6hdzb3xgswzilq1wn4"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "149dgslf6hhngjjkhdvrsl3hjx3l2llvnwv6jgnc8hqvz7ck1i1h"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0szrbzqjks1g77x572r3dvkv791k1c8lckcgk6a7wl4pygsksd3m"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1rjynbvfxxzm5x07xxfq40qhs7b5pwassn1f7j02q3685swqmk0z"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0h01rmw1h93xd1vhz06v7ckjzy89ingi6c6b2sl6sxdd7ii9fkni"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0m0v4c50104c2khx9vcsf3v3xyl031xv2yladxfp168gchrczyk9"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386"; - sha256 = "07yq1khdrisvgkpbvl39kq1f3kwaqxvyn6jfcib2lcg6w5cbk9n8"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0d56vivs4ykanc1v3pbn9mzgcyw4ffx7c59ck1758g2vxfvi837w"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386"; - sha256 = "13dxk56nga9imkx07fb1s4fmgki0dnhcbb41pzr1r0ybxg6crnk9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gclf7sgd661820bqqj3aabykxp0m38y3wd9m25znqgqqg5bk6im"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386"; - sha256 = "11ajwd0456dr4nwhkib31zwgk7xpyzir86pvjrgpydnh6yj3dic0"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0swkpx39gd9n553qrc8dhdv4vvnan1byrkvy935zzimzxv8phxfm"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0xkj414c0svlndqck1ghddc424a7mpxwaw44sdjw25iwsidzqi7i"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0mi49k0xfk34x71ap4q9wy4p7cs31z25pg0p41yr859q4y49461r"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386"; - sha256 = "109bkl63vbsmhflqw3ivjdas96jamq5jjh67rf4lvpgxnlscxsgw"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "068y30y9ry4hlfc4dsza47z6lakfz2cy0zkdq5rn3nbs59d7f2nh"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.10-2ubuntu1+srt4_i386"; - sha256 = "1n3ppygmfjy4hwgi4lq2xlm1ldlp47g67ksafbs3zd06a7lyq2rb"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0sga5mjr5bk5w0mdq0y2hxfdhpfpzv9m9anfy2zkaw60gy6n0qk6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt4_i386"; - sha256 = "1ga6g4mdz02p4m6l3q7fa8404243qhqfrvvcwinbm9hj8fyshliz"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb"; + name = "libxcomposite1_0.4.3-2build1+srt5_i386"; + sha256 = "1c23iswcyi5axg5hql3kkfmcvxkzjl1db9klrlsqb2c0455pjlsf"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386"; - sha256 = "0nalkn0hql9v13b48685jrlcx607n5bn6gk5vmhbq0zpcs2ww709"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_i386"; + sha256 = "18321skl4h2s3izzaaw1jk2blfq93ygk4b2f2g4mnkipn1i9rybx"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt4_i386"; - sha256 = "0qysvz8hwcra2kr8sd9iyk1x73wawfnhsq5yspjphq08kg2k5gmq"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb"; + name = "libxdamage1_1.1.3-2build1+srt5_i386"; + sha256 = "01pam4srj0d3vyrrhlsnfkznpxgil3p674i0armxqfydzh4bww8q"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt4_i386"; - sha256 = "0hxixf0y2l3wc6flfg2gwlfc3fp40rg570lwkr0r6hwj1z0zwyf8"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb"; + name = "libxdmcp6_1.1.0-4+srt5_i386"; + sha256 = "0vz6w11yld3ii0b3i68wwzx7qsgd64yj8709h32db08izc1a2wdh"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; - sha256 = "0s6jc1zw6n2m3bmis62pr3mkzd64migzrj5wcl9hmq5yrnc46shs"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386"; + sha256 = "11jjds6qk9wvx446rph5n2qsr9b36jlr99ayw98zr89b3y6y8lyf"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; - sha256 = "0y5fb7nrnydlxbflhxqw065qz337m2i87sdn4730pd8y693sinyz"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt2_i386"; + sha256 = "19rm8s1dq7vysijlksbac04045x5j4g30s377im4ydljjh2vajh6"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt4_i386"; - sha256 = "087wclc31napmxc7l09gc73dgjczdkcyrld6zdcq6jq8jm1aq4vk"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt5_i386"; + sha256 = "0pcd8bvdlh41bixbdkrl0sm6libgns7ndjzyvj86s3qks7k11g97"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; - sha256 = "0zx652d5gr6dvviwpn5v0mhd9812pcha7xs9z7il3s01d75qcysk"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386"; + sha256 = "0pykpahh9j7cp91mbkqw22drl5npq3pbd712chbrmkdjdqm14x9p"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386"; - sha256 = "16dci5p6amsj1d474ih3avpjc1kc406wz6ywb9f6m44qrnm96w9m"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_i386"; + sha256 = "0xd0rfr6h25s3h6n8in5kby4fm88s1ykw2y8clymk79znmgby0av"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386"; - sha256 = "0gld5pbh1qh93nafvw6fx319av0hpfxp54pg3w4svi1cg7hj9rk2"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386"; + sha256 = "1ss7fpdqdgm8hmcgm1d59x5mfr4n7zps8bjg1304nn29a3cck26z"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt4_i386"; - sha256 = "0vvxp9fr2rykqny2r1qz6h5vqw26zv5lkh9nyw8jvrv9gx01rma0"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb"; + name = "libxmu6_1.1.0-3+srt5_i386"; + sha256 = "0z39zacqis2cq1gdwam1wk5xmisdhsrly7r1a8g5h8h6hbrri72w"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+srt4_i386"; - sha256 = "0s7pxkhfx84axldwpznv1wj9z05zm90fpp11702lm3qic6829sk1"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "02k70n6v245l0kqf7gjjv4bm12zmxcw8cayjv9xh8cp6svsxdzsq"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; - sha256 = "08392ac5sqsdq4r4p8n88c3d2nn0078y510grdrxp9z006f89846"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; + name = "libxrandr2_1.5.0-1+srt1_i386"; + sha256 = "10nqrxs2dxs06wah8dy48v7v8vdllpg9wwhcn67i7dkgfli27ykj"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; - sha256 = "08dj2kx2kr50jxcyfdj9y9gajkz1lnm6jn9z2pvqf43hzfa4pmp2"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt2_i386"; + sha256 = "0i48bi4zfv90dgc190mr8wd8hymbhdldrk1q2qag0l9fmn5hkwqv"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt4_i386"; - sha256 = "1zf5ifqq8s6xr3iiwhjk3g2ifrb9srwanffsdjab28jzfpsb4a9h"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb"; + name = "libxss1_1.2.1-2+srt5_i386"; + sha256 = "015n1l1hl4vvgb53zx6gisl44p2pjj339adabqlfy1fqwjf0ff4z"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386"; - sha256 = "1f01dzslhcm0r89p6wzs1pv32gaqxhxs3jim4jbzrkv18d4pyyc6"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt5_i386"; + sha256 = "0yqb6j6rh9y65bfbqv1hrggl1719lsm6yzydbmpnilz15p3f4sa9"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386"; - sha256 = "0w64xxfakharkmh0w9y6pg5446a7zypqhs3wgj6dbsa7clly8ir8"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt5_i386"; + sha256 = "1h21nyc2bigm3brpzmdaafvry4wszmykbs13vagmibwhb6rls7xd"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386"; - sha256 = "1xbxlzmhl8j64k2aayrmpdz9bxn7b6jirdk84qibwh96fna4gd2x"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386"; + sha256 = "133xi181g1pcd08px9yz7wqz93axy0cq9x5y76qp34dj7i9pscsg"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386"; - sha256 = "1m4r0mp1i44rlddjjrmmbqi1phg2ksdn5zb4bxjrf55m2zfkgkx3"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386"; + sha256 = "0nvhk0xyi1cc12j2j97x763irk2d9l8n0p3fjyg7s3jgm4va3yjj"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386"; - sha256 = "162554nhfmpjyyf1pzc35gsbawz4f6n1bm4s8n0923g1hmafpf6g"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386"; + sha256 = "04j0mbdcv8891apw3lak161fbvpyl8qykvqvn6ljl3mimf3qabcd"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386"; - sha256 = "0gcw3qr6w418idwd69i12hjr90ixnab81d1p3wi7d0rwl1227ihv"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386"; + sha256 = "1qbqclnhhwfxj5ajsb05c3pg5iq5imf4pl6yisx5hw5jndgmzch7"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py index c225d6bf8adc..aed42cdd5668 100755 --- a/pkgs/games/steam/update-runtime.py +++ b/pkgs/games/steam/update-runtime.py @@ -1,5 +1,6 @@ -#!/usr/bin/env python2 -# +#! /usr/bin/env nix-shell +#! nix-shell -i python2 -p "with python2Packages; [python debian]" + # Script to build a Nix script to actually build a Steam runtime. # Patched version of https://github.com/ValveSoftware/steam-runtime/blob/master/build-runtime.py @@ -20,7 +21,7 @@ REPO="http://repo.steampowered.com/steamrt" DIST="scout" COMPONENT="main" -out = open("runtime-generated.nix", "w"); +out = open("runtime-generated.nix", "w") out.write("# This file is autogenerated! Do not edit it yourself, use update-runtime.py for regeneration.\n") out.write("{ fetchurl }:\n") out.write("\n") diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 18db78d82ad5..45b2f79146c1 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' - Higan (formerly bsnes) is a multi-system game console emulator. + higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - Nintendo's Famicom, Super Famicom (with subsystems: Super Game Boy, BS-X Satellaview, Sufami Turbo); diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 0fc86e096f3d..ca49fb7d8a45 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3 -, gnome-themes-extra, gtk-engine-murrine, optipng, inkscape}: +{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3, gnome3 +, gtk-engine-murrine, optipng, inkscape }: let pname = "arc-theme"; @@ -7,40 +7,45 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "20180715"; + version = "20181022"; src = fetchFromGitHub { owner = "NicoHood"; repo = pname; rev = version; - sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j"; + sha256 = "08951dk1irfadwpr3p323a4fprmxg53rk2r2niwq3v62ryhi3663"; }; - preBuild = '' - # Shut up inkscape's warnings - export HOME="$NIX_BUILD_ROOT" - ''; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + sassc + optipng + inkscape + gtk3 + gnome3.gnome-shell + ]; - nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ]; - buildInputs = [ gtk3 ]; + propagatedUserEnvPkgs = [ + gnome3.gnome-themes-extra + gtk-engine-murrine + ]; - propagatedUserEnvPkgs = [ gnome-themes-extra gtk-engine-murrine ]; + enableParallelBuilding = true; postPatch = '' - find . -name render-assets.sh | - while read filename - do - substituteInPlace "$filename" \ - --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \ - --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng" - done patchShebangs . ''; + preBuild = '' + # Shut up inkscape's warnings about creating profile directory + export HOME="$NIX_BUILD_ROOT" + ''; + configureFlags = [ "--disable-unity" ]; postInstall = '' - install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md + install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix index e23fb7ff47cf..9967de786399 100644 --- a/pkgs/misc/themes/matcha/default.nix +++ b/pkgs/misc/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matcha-${version}"; - version = "2018-10-12"; + version = "2018-10-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "matcha"; - rev = "c1c91db44d9e28cc71af019784a77175a60a7b9d"; - sha256 = "0sr805ghgh8sr9nncs693b9p756nmi1l4d8mfywj6z219jhy77qv"; + rev = version; + sha256 = "112xfnwlq9ih72qbfrin78ly7bc4i94my3i6s7yhc46qg1lncl73"; }; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 219fe341d0b6..dd1bb0ad1244 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -4,10 +4,10 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; in # -# Unless there is a good reason not to, we attemp to use the same name as the +# Unless there is a good reason not to, we attempt to use the same name as the # extension's unique identifier (the name the extension gets when installed # from vscode under `~/.vscode`) and found on the marketplace extension page. -# So an extension's attribute name should be of the form: +# So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # rec { @@ -24,6 +24,6 @@ rec { }; ms-vscode.cpptools = callPackage ./cpptools {}; - + ms-python.python = callPackage ./python {}; -} \ No newline at end of file +} diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index db6826b2d7e8..a2d04edea19f 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2018.8.0"; - sha256 = "1x1wkqbc0d6h5w2m5qczv6gd5j6yrzhwp0c6wk49bhg2l0ibvyx6"; + version = "2018.9.1"; + sha256 = "050r1rb0xyfikfa6iq741s368xz600pqdk74w6cxszxpy8kl2hng"; }; postPatch = '' diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix index 3fac20d23c78..dc1b0112a219 100644 --- a/pkgs/os-specific/darwin/cf-private/default.nix +++ b/pkgs/os-specific/darwin/cf-private/default.nix @@ -1,4 +1,4 @@ -{ CF, apple_sdk }: +{ CF, apple_sdk, osx_private_sdk }: # cf-private is a bit weird, but boils down to CF with a weird setup-hook that # makes a build link against the system CoreFoundation rather than our pure one. @@ -13,10 +13,10 @@ # because of their magic "toll-free bridging" support, the symbols for those types # live in CoreFoundation with an ObjC runtime. And because that isn't public, we have # this hack in place to let people link properly anyway. Phew! -# +# # This can be revisited if Apple ever decide to release the ObjC backend in a publicly # buildable form. -# +# # This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to # an existing package was annoying. We need a buildEnv that knows how to add those CF.overrideAttrs (orig: { @@ -38,22 +38,24 @@ CF.overrideAttrs (orig: { # this is watchman, who can almost certainly switch to the pure CF once the header # and functionality is merged in. installPhase = orig.installPhase + '' + # Copy or overwrite private headers, some of these might already + # exist in CF but the private versions have more information. basepath="Library/Frameworks/CoreFoundation.framework/Headers" - path="$basepath/CFFileDescriptor.h" + cp -Lfv --no-preserve mode ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* "$out/$basepath" # Append the include at top level or nobody will notice the header we're about to add sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \ "$out/$basepath/CoreFoundation.h" - cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path + cp ${apple_sdk.frameworks.CoreFoundation}/$basepath/CFFileDescriptor.h $out/$basepath/CFFileDescriptor.h '' + # This one is less likely to go away, but I'll mention it anyway. The issue is at # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase '' - path="$basepath/CFURLEnumerator.h" + path="$basepath/CFURLEnumerator.h" sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFURLEnumerator.h>' \ "$out/$basepath/CoreFoundation.h" cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path ''; -}) \ No newline at end of file +}) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix new file mode 100644 index 000000000000..190c0ae22131 --- /dev/null +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "goku-${version}"; + version = "0.1.11"; + + src = fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz"; + sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15"; + }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin + cp goku $out/bin + cp gokuw $out/bin + ''; + + meta = with stdenv.lib; { + description = "Karabiner configurator"; + homepage = https://github.com/yqrashawn/GokuRakuJoudo; + license = licenses.gpl3; + maintainers = [ maintainers.nikitavoloboev ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 8faba250fb3e..14b10e6752bb 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "alsa-tools-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "mirror://alsa/tools/${name}.tar.bz2"; - sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n"; + sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 60e3b9750d71..c9cf12912670 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m"; + sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 568e474f444a..553b3804a038 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -37,6 +37,14 @@ stdenv.mkDerivation { sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile ''; + # We need to set the directory for the .local override files back to + # /etc/firejail so we can actually override them + postInstall = '' + sed -E -e 's@^include (.*)(/firejail/.*.local)$@include /etc\2@g' -i $out/etc/firejail/*.profile + ''; + + enableParallelBuilding = true; + meta = { inherit (s) version; description = ''Namespace-based sandboxing tool for Linux''; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 5943ced2f8f9..dfca87e27165 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.314"; + version = "0.316"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; + sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb"; }; preConfigure = "patchShebangs ./configure"; - configureFlags = [ "--datadir=$(prefix)/data" ]; + configureFlags = [ "--datadir=${placeholder "out"}/share" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; + outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; meta = { homepage = https://github.com/vcrhonek/hwdata; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 23dcbb05f30a..011668f0c679 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,9 +1,10 @@ { stdenvNoCC, lib, buildPackages -, fetchurl, perl +, fetchurl, fetchpatch, perl +, elf-header }: let - common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation { + common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation ({ name = "linux-headers-${version}"; src = fetchurl { @@ -16,18 +17,55 @@ let # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # We do this so we have a build->build, not build->host, C compiler. depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; + # TODO make unconditional next mass rebuild + nativeBuildInputs = [ perl ] ++ lib.optional + (stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform) + elf-header; extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"]; + # "patches" array defaults to 'null' to avoid changing hash + # and causing mass rebuild inherit patches; - buildPhase = '' + # TODO avoid native hack next rebuild + makeFlags = if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then null else [ + "SHELL=bash" + # Avoid use of runtime build->host compilers for checks. These + # checks only cared to work around bugs in very old compilers, so + # these changes should be safe. + "cc-version:=9999" + "cc-fullversion:=999999" + # `$(..)` expanded by make alone + "HOSTCC:=$(BUILD_CC)" + "HOSTCXX:=$(BUILD_CXX)" + ]; + + # TODO avoid native hack next rebuild + # Skip clean on darwin, case-sensitivity issues. + buildPhase = if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then '' make mrproper headers_check SHELL=bash + '' else lib.optionalString (!stdenvNoCC.buildPlatform.isDarwin) '' + make mrproper $makeFlags + '' + # For some reason, doing `make install_headers` twice, first without + # INSTALL_HDR_PATH=$out then with, is neccessary to get this to work + # for darwin cross. @Ericson2314 has no idea why. + + '' + make headers_install $makeFlags + ''; + + # TODO avoid native hack next rebuild + checkPhase = if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then null else '' + make headers_check $makeFlags ''; - installPhase = '' + # TODO avoid native hack next rebuild + installPhase = (if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then '' make INSTALL_HDR_PATH=$out headers_install + '' else '' + make headers_install INSTALL_HDR_PATH=$out $makeFlags + '') + '' # Some builds (e.g. KVM) want a kernel.release. mkdir -p $out/include/config @@ -39,11 +77,19 @@ let license = licenses.gpl2; platforms = platforms.linux; }; - }; + } // lib.optionalAttrs (stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform) { + # TODO Make unconditional next mass rebuild + hardeningDisable = lib.optional stdenvNoCC.buildPlatform.isDarwin "format"; + }); in { linuxHeaders = common { version = "4.18.3"; sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1"; + # TODO make unconditional next mass rebuild + patches = lib.optionals (stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform) [ + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above + ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch new file mode 100644 index 000000000000..9b582cac7153 --- /dev/null +++ b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile b/Makefile +index 863f58503bee..b778d5023208 100644 +--- a/Makefile ++++ b/Makefile +@@ -501,11 +501,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE) + KBUILD_AFLAGS += $(call cc-option,-fno-PIE) + + # check for 'asm goto' +-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) + CC_HAVE_ASM_GOTO := 1 + KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO +-endif + + # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included. + # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile. +diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include +index 065324a8046f..d09c67194549 100644 +--- a/scripts/Kbuild.include ++++ b/scripts/Kbuild.include +@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\ + cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) + + # cc-version +-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) + + # cc-fullversion +-cc-fullversion = $(shell $(CONFIG_SHELL) \ +- $(srctree)/scripts/gcc-version.sh -p $(CC)) + + # cc-ifversion + # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) diff --git a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch new file mode 100644 index 000000000000..67e8b19e23bd --- /dev/null +++ b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch @@ -0,0 +1,13 @@ +diff --git a/arch/x86/Makefile b/arch/x86/Makefile +index fad55160dcb9..a48c8331cbb2 100644 +--- a/arch/x86/Makefile ++++ b/arch/x86/Makefile +@@ -239,7 +239,7 @@ ifdef CONFIG_RETPOLINE + endif + + archscripts: scripts_basic +- $(Q)$(MAKE) $(build)=arch/x86/tools relocs ++ $(Q)$(MAKE) $(build)=arch/x86/tools + + ### + # Syscall table generation diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix new file mode 100644 index 000000000000..5aa033348d4e --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.19"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "18a92z17alh5kkvjv7l9z8wk5jgdb6raawdfkpwx9bi8amjzas0c"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 5e6023582082..1d280647c5a1 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl +, pkgconfig ? null, ncurses ? null , libelf , utillinux , writeTextFile @@ -265,6 +266,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] + ++ optionals stdenv.lib.inNixShell [ pkgconfig ncurses ] ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index a70ab13db623..1e920247a754 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, yacc, flex }: +{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { name = "libcgroup-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ pam yacc flex ]; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5"; + sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5"; + }) + ]; + postPatch = '' substituteInPlace src/tools/Makefile.in \ --replace 'chmod u+s' 'chmod +x' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 52a5f16bc52c..c6c5f8436902 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -14,11 +14,11 @@ let ''; in stdenv.mkDerivation rec { - name = "mdadm-4.0"; + name = "mdadm-4.1"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; + sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; # This is to avoid self-references, which causes the initrd to explode @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Programs for managing RAID arrays under Linux"; homepage = http://neil.brown.name/blog/mdadm; license = licenses.gpl2; + maintainers = with maintainers; [ ekleog ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 7235d8415f55..19a5184f8962 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, buildEnv +, buildEnv, python3 }: let @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 libuuid keyutils kerberos tcp_wrappers + python3 ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 492b268610f1..44598588db9d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl }: +{ lib, callPackage, fetchurl, stdenv }: let generic = args: callPackage (import ./generic.nix args) { }; @@ -16,7 +16,17 @@ let in rec { # Policy: use the highest stable version as the default (on our master). - stable = generic { + stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390; + + stable_410 = generic { + version = "410.66"; + sha256_64bit = "05xjzvj0fgmkpz36dbd7hy2vzl6xxiflzx7kml3k7ad9gy2svdlg"; + settingsSha256 = "1nsxz1byshgjs3c03lyx6ya36dp0f2vg2l0d9pkh1i6cpzkp53kz"; + persistencedSha256 = "0m4wdpb8w4y323d8py105p9hizwmf2ai8frkl7h77sn3ski17zw6"; + }; + + # Last one supporting x86 + stable_390 = generic { version = "390.87"; sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw"; sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; @@ -26,12 +36,8 @@ rec { patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; }; - beta = generic { - version = "410.57"; - sha256_64bit = "08534rv3wcmzslbwq11kd3s7cxm72p48dia6540c0586xwgjwg2w"; - settingsSha256 = "1phhhzlc8n3rqdhrn757mnlqmsp616d079a6h1qjpa6jba9z9915"; - persistencedSha256 = "1z7c1ff0y486yp9i5w0siwh9dnprml22x2avarbjfgqwm4f652lw"; - }; + # No active beta right now + beta = stable; legacy_340 = generic { version = "340.104"; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index c8b404c6be7f..21d32af3ba83 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "open-isns-${version}"; - version = "0.98"; + version = "0.99"; src = fetchFromGitHub { owner = "gonzoleeman"; repo = "open-isns"; rev = "v${version}"; - sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg"; + sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf"; }; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix new file mode 100644 index 000000000000..f2c87b97c4ff --- /dev/null +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + + +let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/r8168"; + +in stdenv.mkDerivation rec { + name = "r8168-${kernel.version}-${version}"; + # on update please verify that the source matches the realtek version + version = "8.046.00"; + + # This is a mirror. The original website[1] doesn't allow non-interactive + # downloads, instead emailing you a download link. + # [1] http://www.realtek.com.tw/downloads/downloadsView.aspx?PFid=5&Level=5&Conn=4&DownTypeID=3 + # I've verified manually (`diff -r`) that the source code for version 8.046.00 + # is the same as the one available on the realtek website. + src = fetchFromGitHub { + owner = "mtorromeo"; + repo = "r8168"; + rev = version; + sha256 = "0y8w3biw5mshn5bvl24b9rybfh67f1s9gfzkcv9p4m7s7nchj2dg"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + # avoid using the Makefile directly -- it doesn't understand + # any kernel but the current. + # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 + preBuild = '' + makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build") + makeFlagsArray+=("SUBDIRS=$PWD/src") + makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN") + makeFlagsArray+=("modules") + ''; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p ${modDestDir} + find . -name '*.ko' -exec cp --parents '{}' ${modDestDir} \; + find ${modDestDir} -name '*.ko' -exec xz -f '{}' \; + ''; + + meta = with lib; { + description = "Realtek r8168 driver"; + longDescription = '' + A kernel module for Realtek 8168 network cards. + If you want to use this driver, you might need to blacklist the r8169 driver + by adding "r8169" to boot.blacklistedKernelModules. + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b66cb78a702b..ecfd8581ca9d 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "20"; + version = "20.1"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1zz9r1zq9ql806sbyi7nrslx1d96hgd9zvdlzbv4j31m6kfmsyri"; + sha256 = "1j6d3n4wzl04m0k4nxbmahfwc094185d5jyijgvg3z5hwwb8lkwv"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 5f3eb22f127e..d3a9d7834cdc 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.0.1"; + name = "sysstat-12.1.1"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "114wh7iqi82c0az8wn3dg3y56279fb2wg81v8kvx87mq5975bg51"; + sha256 = "0drrlv2fr64g5zf0a2bkla2rql4nmq4n192wvcr9r4zppg58d8k4"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 657d6cc24a8d..8d53756d5101 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/lsusb.py \ - --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids + --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 46a78e1c5bd5..b9c5951b0b29 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.12.1"; + version = "7.12.3"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0qk72dq53kk40m8rz7i3r45cgrka2s1682b8d3kzdmmhclnzbaym"; + sha256 = "0gna0pr8g78pahm4ci14742w40f0nwfn4hpm3iwbsiw2w6vziahv"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 2dcbf6737e66..720898196c85 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.10.3"; + version = "18.12.17"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "1fm7jh9cxalvlic6pw58gblisvmvb6j0jzf3vr8p6cv7iw9238sp"; + sha256 = "0gkad6x6jlih30wal8nilhfqr3z22dzgz6m22pza3bhaba2ikk53"; }; nativeBuildInputs = [ cmake libtool ninja ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 44ae3b894d54..053fadc8af58 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.1.1"; + version = "18.08.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1yndxi11vj0di3yf6ky78zcnffk6d3676gf5y7jn7vwxxmzm4h5k"; + sha256 = "1dz5hgnlsld8b8vrbckk3mj7cqrv662wsp0s9z4x8wafygz3zx07"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 145052ff8c3a..d1dd7c05929d 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb -, dbus, librdmacm, libibverbs, libstatgrab, net_snmp +, dbus, rdma-core, libstatgrab, net_snmp , enableDbus ? false , enableInfiniBandRdma ? false , enableMonitoring ? false @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ nss nspr libqb ] ++ optional enableDbus dbus - ++ optional enableInfiniBandRdma [ librdmacm libibverbs ] + ++ optional enableInfiniBandRdma rdma-core ++ optional enableMonitoring libstatgrab ++ optional enableSnmp net_snmp; @@ -44,6 +44,17 @@ stdenv.mkDerivation rec { "LOGROTATEDIR=$(out)/etc/logrotate.d" ]; + preConfigure = optionalString enableInfiniBandRdma '' + # configure looks for the pkg-config files + # of librdmacm and libibverbs + # Howver, rmda-core does not provide a pkg-config file + # We give the flags manually here: + export rdmacm_LIBS=-lrdmacm + export rdmacm_CFLAGS=" " + export ibverbs_LIBS=-libverbs + export ibverbs_CFLAGS=" " + ''; + postInstall = '' wrapProgram $out/bin/corosync-blackbox \ --prefix PATH ":" "$out/sbin:${libqb}/sbin" diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 0891b72cd1e9..9bf461938cdb 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "coturn-${version}"; - version = "4.5.0.7"; + version = "4.5.0.8"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "${version}"; - sha256 = "1781fx8lqgc54j973xzgq9d7k3g2j03va82jb4217gd3a93pa65l"; + sha256 = "1l2q76lzv2gff832wrqd9dcilyaqx91pixyz335822ypra89mdp8"; }; buildInputs = [ openssl libevent ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 ]; description = "A TURN server"; platforms = platforms.all; + broken = stdenv.isDarwin; # 2018-10-21 maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f1ee1eda95da..6ad3facc0711 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.80.3"; + version = "0.81.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -16,6 +16,7 @@ "alarm_control_panel.concord232" = ps: with ps; [ ]; "alarm_control_panel.demo" = ps: with ps; [ ]; "alarm_control_panel.egardia" = ps: with ps; [ ]; + "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; @@ -54,6 +55,7 @@ "auth.mfa_setup_flow" = ps: with ps; [ ]; "automation" = ps: with ps; [ ]; "automation.event" = ps: with ps; [ ]; + "automation.geo_location" = ps: with ps; [ ]; "automation.homeassistant" = ps: with ps; [ ]; "automation.litejet" = ps: with ps; [ ]; "automation.mqtt" = ps: with ps; [ paho-mqtt ]; @@ -118,6 +120,7 @@ "binary_sensor.netatmo" = ps: with ps; [ ]; "binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ]; + "binary_sensor.opentherm_gw" = ps: with ps; [ ]; "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; @@ -128,6 +131,7 @@ "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; + "binary_sensor.rflink" = ps: with ps; [ ]; "binary_sensor.rfxtrx" = ps: with ps; [ ]; "binary_sensor.ring" = ps: with ps; [ ]; "binary_sensor.rpi_gpio" = ps: with ps; [ ]; @@ -209,8 +213,9 @@ "climate" = ps: with ps; [ ]; "climate.daikin" = ps: with ps; [ ]; "climate.demo" = ps: with ps; [ ]; + "climate.dyson" = ps: with ps; [ ]; "climate.ecobee" = ps: with ps; [ ]; - "climate.econet" = ps: with ps; [ ]; + "climate.elkm1" = ps: with ps; [ ]; "climate.ephember" = ps: with ps; [ ]; "climate.eq3btsmart" = ps: with ps; [ construct ]; "climate.evohome" = ps: with ps; [ ]; @@ -226,6 +231,7 @@ "climate.knx" = ps: with ps; [ ]; "climate.maxcube" = ps: with ps; [ ]; "climate.melissa" = ps: with ps; [ ]; + "climate.mill" = ps: with ps; [ ]; "climate.modbus" = ps: with ps; [ ]; "climate.mqtt" = ps: with ps; [ paho-mqtt ]; "climate.mysensors" = ps: with ps; [ ]; @@ -295,7 +301,6 @@ "cover.rflink" = ps: with ps; [ ]; "cover.rfxtrx" = ps: with ps; [ ]; "cover.rpi_gpio" = ps: with ps; [ ]; - "cover.ryobi_gdo" = ps: with ps; [ ]; "cover.scsgate" = ps: with ps; [ ]; "cover.tahoma" = ps: with ps; [ ]; "cover.tellduslive" = ps: with ps; [ ]; @@ -351,6 +356,7 @@ "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ]; "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ]; "device_tracker.ping" = ps: with ps; [ ]; + "device_tracker.quantum_gateway" = ps: with ps; [ ]; "device_tracker.ritassist" = ps: with ps; [ ]; "device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; @@ -383,6 +389,7 @@ "edp_redy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; "eight_sleep" = ps: with ps; [ ]; + "elkm1" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue.hue_api" = ps: with ps; [ ]; @@ -410,11 +417,12 @@ "foursquare" = ps: with ps; [ aiohttp-cors ]; "freedns" = ps: with ps; [ ]; "fritzbox" = ps: with ps; [ ]; - "frontend" = ps: with ps; [ aiohttp-cors ]; + "frontend" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "gc100" = ps: with ps; [ ]; "geo_location" = ps: with ps; [ ]; "geo_location.demo" = ps: with ps; [ ]; "geo_location.geo_json_events" = ps: with ps; [ ]; + "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; @@ -506,6 +514,7 @@ "knx" = ps: with ps; [ ]; "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "lametric" = ps: with ps; [ ]; + "lifx" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ]; "light.ads" = ps: with ps; [ ]; @@ -516,6 +525,7 @@ "light.decora" = ps: with ps; [ ]; "light.decora_wifi" = ps: with ps; [ ]; "light.demo" = ps: with ps; [ ]; + "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; @@ -593,6 +603,7 @@ "lock.nello" = ps: with ps; [ ]; "lock.nuki" = ps: with ps; [ ]; "lock.sesame" = ps: with ps; [ ]; + "lock.template" = ps: with ps; [ ]; "lock.tesla" = ps: with ps; [ ]; "lock.vera" = ps: with ps; [ ]; "lock.verisure" = ps: with ps; [ ]; @@ -600,11 +611,11 @@ "lock.wink" = ps: with ps; [ ]; "lock.xiaomi_aqara" = ps: with ps; [ ]; "lock.zwave" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "logbook" = ps: with ps; [ aiohttp-cors ruamel_yaml sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ ]; - "lovelace" = ps: with ps; [ ]; + "lovelace" = ps: with ps; [ ruamel_yaml ]; "lutron" = ps: with ps; [ ]; "lutron_caseta" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ aiohttp-cors ]; @@ -644,6 +655,7 @@ "media_player.itunes" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; + "media_player.lg_soundbar" = ps: with ps; [ ]; "media_player.liveboxplaytv" = ps: with ps; [ ]; "media_player.mediaroom" = ps: with ps; [ ]; "media_player.monoprice" = ps: with ps; [ ]; @@ -727,7 +739,8 @@ "notify.group" = ps: with ps; [ ]; "notify.hangouts" = ps: with ps; [ ]; "notify.hipchat" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ aiohttp-cors ]; + "notify.homematic" = ps: with ps; [ pyhomematic ]; + "notify.html5" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "notify.instapush" = ps: with ps; [ ]; "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "notify.joaoapps_join" = ps: with ps; [ ]; @@ -764,7 +777,7 @@ "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twitter" = ps: with ps; [ ]; "notify.webostv" = ps: with ps; [ ]; - "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; + "notify.xmpp" = ps: with ps; [ slixmpp ]; "notify.yessssms" = ps: with ps; [ ]; "nuheat" = ps: with ps; [ ]; "nuimo_controller" = ps: with ps; [ ]; @@ -772,11 +785,12 @@ "onboarding" = ps: with ps; [ aiohttp-cors ]; "onboarding.const" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ]; + "opentherm_gw" = ps: with ps; [ ]; "openuv" = ps: with ps; [ ]; "openuv.config_flow" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ]; - "panel_custom" = ps: with ps; [ aiohttp-cors ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors ]; + "panel_custom" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "persistent_notification" = ps: with ps; [ ]; "pilight" = ps: with ps; [ ]; "plant" = ps: with ps; [ ]; @@ -806,6 +820,7 @@ "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; + "route53" = ps: with ps; [ boto3 ]; "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; @@ -813,6 +828,7 @@ "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ]; + "scene.elkm1" = ps: with ps; [ ]; "scene.homeassistant" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ]; "scene.knx" = ps: with ps; [ ]; @@ -889,6 +905,7 @@ "sensor.efergy" = ps: with ps; [ ]; "sensor.eight_sleep" = ps: with ps; [ ]; "sensor.eliqonline" = ps: with ps; [ ]; + "sensor.elkm1" = ps: with ps; [ ]; "sensor.emoncms" = ps: with ps; [ ]; "sensor.enocean" = ps: with ps; [ ]; "sensor.enphase_envoy" = ps: with ps; [ ]; @@ -992,6 +1009,7 @@ "sensor.openexchangerates" = ps: with ps; [ ]; "sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ]; + "sensor.opentherm_gw" = ps: with ps; [ ]; "sensor.openuv" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ pyotp ]; @@ -1017,6 +1035,7 @@ "sensor.ring" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ]; "sensor.rmvtransport" = ps: with ps; [ ]; + "sensor.rtorrent" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; "sensor.season" = ps: with ps; [ ephem ]; @@ -1062,6 +1081,7 @@ "sensor.temper" = ps: with ps; [ ]; "sensor.template" = ps: with ps; [ ]; "sensor.tesla" = ps: with ps; [ ]; + "sensor.thermoworks_smoke" = ps: with ps; [ ]; "sensor.thethingsnetwork" = ps: with ps; [ ]; "sensor.thinkingcleaner" = ps: with ps; [ ]; "sensor.tibber" = ps: with ps; [ ]; @@ -1071,6 +1091,7 @@ "sensor.tradfri" = ps: with ps; [ ]; "sensor.trafikverket_weatherstation" = ps: with ps; [ ]; "sensor.transmission" = ps: with ps; [ transmissionrpc ]; + "sensor.transport_nsw" = ps: with ps; [ ]; "sensor.travisci" = ps: with ps; [ ]; "sensor.twitch" = ps: with ps; [ ]; "sensor.uber" = ps: with ps; [ ]; @@ -1116,10 +1137,16 @@ "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; + "simplisafe" = ps: with ps; [ ]; + "simplisafe.config_flow" = ps: with ps; [ ]; + "simplisafe.const" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; "skybell" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; + "smhi" = ps: with ps; [ ]; + "smhi.config_flow" = ps: with ps; [ ]; + "smhi.const" = ps: with ps; [ ]; "snips" = ps: with ps; [ paho-mqtt ]; "sonos" = ps: with ps; [ ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -1150,6 +1177,7 @@ "switch.doorbird" = ps: with ps; [ ]; "switch.edimax" = ps: with ps; [ ]; "switch.edp_redy" = ps: with ps; [ ]; + "switch.elkm1" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ]; @@ -1190,6 +1218,7 @@ "switch.raincloud" = ps: with ps; [ ]; "switch.rainmachine" = ps: with ps; [ ]; "switch.raspihats" = ps: with ps; [ ]; + "switch.recswitch" = ps: with ps; [ ]; "switch.rest" = ps: with ps; [ ]; "switch.rflink" = ps: with ps; [ ]; "switch.rfxtrx" = ps: with ps; [ ]; @@ -1215,6 +1244,7 @@ "switch.tradfri" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; "switch.tuya" = ps: with ps; [ ]; + "switch.unifi" = ps: with ps; [ ]; "switch.upcloud" = ps: with ps; [ ]; "switch.velbus" = ps: with ps; [ ]; "switch.vera" = ps: with ps; [ ]; @@ -1262,6 +1292,10 @@ "tts.yandextts" = ps: with ps; [ ]; "tuya" = ps: with ps; [ ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "unifi" = ps: with ps; [ ]; + "unifi.const" = ps: with ps; [ ]; + "unifi.controller" = ps: with ps; [ ]; + "unifi.errors" = ps: with ps; [ ]; "upcloud" = ps: with ps; [ ]; "updater" = ps: with ps; [ distro ]; "upnp" = ps: with ps; [ aiohttp-cors ]; @@ -1284,6 +1318,10 @@ "volvooncall" = ps: with ps; [ ]; "vultr" = ps: with ps; [ vultr ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; + "water_heater" = ps: with ps; [ ]; + "water_heater.demo" = ps: with ps; [ ]; + "water_heater.econet" = ps: with ps; [ ]; + "water_heater.wink" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; "watson_iot" = ps: with ps; [ ]; "weather" = ps: with ps; [ ]; @@ -1296,6 +1334,7 @@ "weather.met" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ pyowm ]; + "weather.smhi" = ps: with ps; [ ]; "weather.yweather" = ps: with ps; [ yahooweather ]; "weather.zamg" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -1324,6 +1363,7 @@ "zone.zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ ]; "zwave" = ps: with ps; [ pydispatcher python_openzwave ]; + "zwave.config_flow" = ps: with ps; [ ]; "zwave.const" = ps: with ps; [ ]; "zwave.discovery_schemas" = ps: with ps; [ ]; "zwave.node_entity" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8503b53033cf..48ad27c96199 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -22,6 +22,8 @@ let "51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa") (mkOverride "astral" "1.6.1" "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d") + (mkOverride "async-timeout" "3.0.1" + "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "18.2.0" "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.4" @@ -77,7 +79,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.80.3"; + hassVersion = "0.81.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -92,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0fjkw8kg0vsyrkcrx9jhqrh5nzxx5wphj6zglqgai2d635m8j2dg"; + sha256 = "05cdx2pax7vx0v7arnciqrq38k2xyiv7iagxd3qs5m6gra72qlqw"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 25a63ef71a92..7bf1e6871411 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181018.0"; + version = "20181026.0"; src = fetchPypi { inherit pname version; - sha256 = "83f52421056acda8297f174a7c4e3c540109673c2f2c25720638d171c6bc2653"; + sha256 = "fa877803ec7201a9b2129e96d6c19822cbcb28fa8ad5d422974bd3c872da1531"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 65679e4ac86e..9503fd14907c 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -13,11 +13,11 @@ assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.50"; + name = "lighttpd-1.4.51"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "1sr9avcnld22a5wl5s8vgrz8r86mybggm9z8zwabqz48v0986dr9"; + sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a"; }; postPatch = '' diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 0501bcc9e58b..15822a0387b9 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -131,6 +131,18 @@ }; }; + opentracing = { + src = + let src' = fetchFromGitHub { + owner = "opentracing-contrib"; + repo = "nginx-opentracing"; + rev = "v0.7.0"; + sha256 = "16jzxhhsyfjaxb50jy5py9ppscidfx1shvc29ihldp0zs6d8khma"; + }; + in "${src'}/opentracing"; + inputs = [ pkgs.opentracing-cpp ]; + }; + pagespeed = let version = pkgs.psol.version; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 4f9cfa46e714..100bc4709bf1 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.304"; + version = "0.10.365"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "15v9xyvcdx9kbarilq7d7nm8ac8mljw641nrr3mnk8ij3gjdgb38"; + sha256 = "1wq4by10wxhcz72fappb7isw0850laf2yk5bgpx8nrjxigmv4ik0"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index ab632372b464..4b753bdf0cdb 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -4,12 +4,12 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; name = "nullmailer-${version}"; src = fetchurl { url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; - sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; + sha256 = "0md8cf90fl2yf3zh9njjy42a673v4j4ygyq95xg7fzkygdigm1lq"; }; buildInputs = stdenv.lib.optional tls gnutls; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 60c517230b4f..d55804504442 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,43 +1,33 @@ { stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison -, libasr, libevent, zlib, openssl, db, pam - -# opensmtpd requires root for no reason to encrypt passwords, this patch fixes it -# see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678 -, unpriviledged_smtpctl_encrypt ? true - -# Deprecated: use the subaddressing-delimiter in the config file going forward -, tag_char ? null +, libasr, libevent, zlib, libressl, db, pam }: -if (tag_char != null) -then throw "opensmtpd: the tag_char argument is deprecated as it can now be specified at runtime via the 'subaddressing-delimiter' option of the configuration file" -else stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "6.0.3p1"; + version = "6.4.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ libasr libevent zlib openssl db pam ]; + buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; + sha256 = "1qxxhnlsmpfh9v4azgl0634955r085gsic1c66jdll21bd5w2mq8"; }; patches = [ ./proc_path.diff - (fetchpatch { - url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff"; - sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa"; - }) + ./fix-build.diff # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 ]; - postPatch = with builtins; with lib; - optionalString unpriviledged_smtpctl_encrypt '' - substituteInPlace smtpd/smtpctl.c --replace \ - 'if (geteuid())' \ - 'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))' - substituteInPlace mk/smtpctl/Makefile.in --replace "chmod 2555" "chmod 0555" - ''; + # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap` + # requirement + postPatch = '' + substituteInPlace smtpd/parse.y \ + --replace "/usr/libexec/" "$out/libexec/opensmtpd/" + substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true" + substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" + sh bootstrap + ''; configureFlags = [ "--sysconfdir=/etc" @@ -54,6 +44,9 @@ else stdenv.mkDerivation rec { "--with-table-db" ]; + # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 + makeFlags = [ "CFLAGS=-ffunction-sections" "LDFLAGS=-Wl,--gc-sections" ]; + installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" @@ -67,6 +60,6 @@ else stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils obadz ]; + maintainers = with maintainers; [ rickynils obadz ekleog ]; }; } diff --git a/pkgs/servers/mail/opensmtpd/fix-build.diff b/pkgs/servers/mail/opensmtpd/fix-build.diff new file mode 100644 index 000000000000..1f995fd4f623 --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/fix-build.diff @@ -0,0 +1,12 @@ +diff --git a/mk/smtpctl/Makefile.am b/mk/smtpctl/Makefile.am +index 5af0b713..f0fce735 100644 +--- a/mk/smtpctl/Makefile.am ++++ b/mk/smtpctl/Makefile.am +@@ -4,6 +4,7 @@ sbin_PROGRAMS= smtpctl + + smtpctl_SOURCES= $(smtpd_srcdir)/enqueue.c + smtpctl_SOURCES+= $(smtpd_srcdir)/parser.c ++smtpctl_SOURCES+= $(smtpd_srcdir)/config.c + smtpctl_SOURCES+= $(smtpd_srcdir)/log.c + smtpctl_SOURCES+= $(smtpd_srcdir)/envelope.c + smtpctl_SOURCES+= $(smtpd_srcdir)/queue_backend.c diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 02e14f3b5aca..b9dd07adde98 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7"; + sha256 = "1cgnychv8yz7a6mjg3b12nzs4gl0xqg9agl7m6faihnh7gqx4xld"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index b3a31d2d1ba1..70112732d273 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.3.1"; + version = "5.3.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp"; + sha256 = "1p2vapyaf11d7zri73vnq1rsgwb018pqbjzdkdgppcm5xfrrjh8y"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz"; + sha256 = "067rj2lrdwxda1clcg89m1cnl9sfrl2l9ia5fx2bcxq3yzhchazh"; }; postPatch = '' diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index bce69370d2bd..231124a42efb 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,36 +1,51 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt +, openssl, libuuid, libwebsockets, c-ares, libuv }: stdenv.mkDerivation rec { - pname = "mosquitto"; - version = "1.4.15"; + name = "mosquitto-${version}"; + version = "1.5.3"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz"; - sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx"; + src = fetchFromGitHub { + owner = "eclipse"; + repo = "mosquitto"; + rev = "v${version}"; + sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz"; }; - buildInputs = [ openssl libuuid libwebsockets c-ares libuv ] - ++ stdenv.lib.optional stdenv.isDarwin cmake; - - makeFlags = stdenv.lib.optionals stdenv.isLinux [ - "DESTDIR=$(out)" - "PREFIX=" + patches = [ + # https://github.com/eclipse/mosquitto/issues/983 + (fetchpatch { + url = "https://github.com/eclipse/mosquitto/commit/7f1419e4de981f5cc38aa3a9684369b1de27ba46.patch"; + sha256 = "05npr0h79mbaxzjyhdw78hi9gs1cwydf2fv67bqxm81jzj2yhx2s"; + name = "fix_threading_on_cmake.patch"; + }) ]; postPatch = '' - substituteInPlace config.mk \ - --replace "/usr/local" "" - substituteInPlace config.mk \ - --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" + substituteInPlace man/manpage.xsl \ + --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ + + # the manpages are not generated when using cmake + pushd man + make + popd ''; - meta = { - homepage = http://mosquitto.org/; + buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]; + + nativeBuildInputs = [ cmake docbook_xsl libxslt ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DWITH_THREADING=ON" + ]; + + meta = with stdenv.lib; { description = "An open source MQTT v3.1/3.1.1 broker"; - platforms = stdenv.lib.platforms.unix; - # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) - license = stdenv.lib.licenses.epl10; + homepage = http://mosquitto.org/; + license = licenses.epl10; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 9365612c14ed..0f20128678ce 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1mdxqfy5xzc6944lg87975i9bfpqqx28xl8h70m4wn79x0qgby2v"; + sha256 = "0kg0dr42qi8cwg3i1hcgczd4psh97s54q5zd8z2wn1fqf4m2h597"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index ab2ff85939f6..afa0c6c0f938 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.11"; + version = "5.0.0"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw"; + sha256 = "194rvj3wzdil2rny93vq9g9vlqnb7gv4vnwaklybgcj00qnqpjbh"; }; buildInputs = [ lua ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://redis.io; description = "An open source, advanced key-value store"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.berdario ]; }; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index f0f89c3f0fa0..b562df681a06 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -37,6 +37,7 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. for bin in "Plex Media Server" \ + "Plex Commercial Skipper" \ "Plex DLNA Server" \ "Plex Media Scanner" \ "Plex Relay" \ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 385674c12a86..38f13fcd1fa1 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -3,10 +3,8 @@ , docbook_xml_dtd_42, readline, talloc , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls -, ncurses, libunwind, libibverbs, librdmacm, systemd +, gnutls, ncurses, libunwind, systemd -, enableInfiniband ? false , enableLDAP ? false , enablePrinting ? false , enableMDNS ? false @@ -22,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.9"; + version = "4.7.10"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "1v0pd2k4rfdzcqbzb3g5gjiy8rwqamppwzwy5swz4x5rxyr5567c"; + sha256 = "0w5y6a7kiw5ap7hd84yglzk7cjax6lxlszd0wz1sxnmqx4a6hn9l"; }; outputs = [ "out" "dev" "man" ]; @@ -47,7 +45,6 @@ stdenv.mkDerivation rec { libbsd libarchive zlib fam libiconv gettext libunwind krb5Full ] ++ optionals stdenv.isLinux [ libaio systemd ] - ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index eef975881117..aaeb810eca0b 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.2"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1g9pd00c1x66cbp4gls93pvnrwbzl37q7p8jaag3h5d6f1431i51"; + sha256 = "1cw6wybnh4sp3llzmam0zpd6fcmr9y6ykrirzygckp2iaglcqbcv"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 723b4e4d8d3e..b5912dd9ab94 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.23"; + version = "5.7.24"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; + sha256 = "11qz8cc4zyi7sxs66c5zlap6fd3vra1srwgzcxdzhz59qs90rgq5"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index 1b7cd08b082b..a50605bd0409 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_repack-${version}"; - version = "1.4.3"; + version = "1.4.4"; buildInputs = [ postgresql openssl zlib readline ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "reorg"; repo = "pg_repack"; rev = "refs/tags/ver_${version}"; - sha256 = "1mmd22nfaxjwnbl3i95f3ivmjvfqwdflgaczlg3129dbpwg265xr"; + sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 615a199ddb53..aca5eb1f4ee7 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.1.3"; + version = "2.1.6"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0qv82libl4rv6cq9klvzwx4g767mjl4jaap34sxbd3x0wvm364yd"; + sha256 = "1scybfmmlz5p4xgkhfx7pzdiqj5cd60kvbk8m4xa6k3avz0p1sw9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 1fb8f4b1221b..474a5b65b306 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # url = "https://builds.matomo.org/${name}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "1bkxa163s420w579ma7sbab1nm8c6ca6r6irn200j7p1r5zjklp8"; + sha256 = "0hddj1gyyriwgsh1mghihck2i7rj6gvb1i0b2ripcdfjnxcs47hz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58688590b84e..4772ac7f7ee2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -2,10 +2,10 @@ stdenv, makeWrapper, lib, fetchurl, fetchpatch, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - python, freetype, apple_sdk, tradcpp, fontconfig, mesa_drivers, + python, freetype, apple_sdk, tradcpp, fontconfig, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig }: + mcpp, epoxy, openssl, pkgconfig, llvm_6 }: let inherit (stdenv) lib isDarwin; @@ -394,7 +394,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa_drivers ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index bf3d7773640e..92a6628dcdae 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "antibody-${version}"; - version = "3.7.0"; + version = "4.0.0"; rev = "v${version}"; goPackagePath = "github.com/getantibody/antibody"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "getantibody"; repo = "antibody"; - sha256 = "1c7f0b1lgl4pm3cs39kr6dgr19lfykjhamg74k5ryrizag0j68l5"; + sha256 = "0iq3dfwwh39hmk8qmhrfgkn8pcabxf67c03s7vh18n7w9aay4jfz"; }; goDeps = ./deps.nix; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index ba65f90d909e..29a2a653265d 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "02n1svaw74y0za856w8zjb98nzg1h6bmy4xsar71irsk1mj3m5h2"; + sha256 = "0a4fdh10rhhjcy06qiyyy0xjvg7fapvy3pgif38wrjqvrddaj6pv"; }; installPhase= '' diff --git a/pkgs/test/openftd/default.nix b/pkgs/test/openftd/default.nix deleted file mode 100644 index a5b817de40e9..000000000000 --- a/pkgs/test/openftd/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -/* - -Systeemvereisten - -* libz >= 1.1.4 -* glib >= 2.2.0 -* gtk >= 2.2.0 - -Glib 2 is een 'dependency' van gtk2. Als je gtk2 op je systeem hebt staan dan heb je ongetwijfeld ook glib2 op je systeem. Zie: www.gtk.org voor meer informatie omtrent Glib/gtk2 -Alhoewel FTD4Linux gtk 2.2 als minimumvereiste heeft raden we toch aan om gtk 2.4 te gebruiken. Dit vanwege een bug in gtk versies 2.2.2 t/m 2.2.4. - -* libxml2 >= 2.2.5 -* libxslt >= 1.0.5 - -* mozilla (gecompileerd met gtk2 support) -Mozilla is de opensource browser die is voortgekomen uit het vrijgeven van de netscape navigator source code. Als je mozilla reeds op je systeem hebt staan zou je even moeten nagaan of deze tegen gtk2 is gelinkt. Dit kun je doen met behulp van het programma ldd. -ldd /usr/X11R6/lib/mozilla-gtk2/libgtkembedmoz.so | grep gtk -/usr/X11R6/lib/mozilla-gtk2/libgtkembedmoz.so: -libgtk-x11-2.0.so.200 => /usr/X11R6/lib/libgtk-x11-2.0.so.200 (0x282c3000) -In de output van het ldd programma kun je zien of er inderdaad wordt gelink tegen gtk2. (libgtk-x11-2.0.so.200). -Heb je geen mozilla, maar heb je wel de firebird/firefox variant geinstalleerd staan dan kun je ook met de mozilla compatible onderdelen van firebird/firefox aan de gang. Je hebt hier echter wel de header (development) bestanden bij nodig. Controleer dus even of jouw firebird/firefox installatie hiermee is geleverd. (gtkembedmoz/gtkmozembed.h) Een 'locate gtkmozembed.h' zou hier snel genoeg uitsluitsel over moeten geven. - -* OpenSSL -* LibCURL - -*/ - -{ stdenv, fetchurl -, zlib, libxml2, libxslt, firefox, openssl, curl -, glib, gtk, libgnomeui, libgtkhtml -, pkgconfig, dbus-glib, realCurl, pcre, libsexy, gtkspell, libnotify -}: - -stdenv.mkDerivation { - name = "openftd-0.98.6"; - #builder = ./builder.sh; - - src = fetchurl { - url = http://speeldoos.eweka.nl/~paul/openftd/openftd-1.0.1.tar.bz2; - sha256 = "e0710865f852fdf209949788a1ced65e9ecf82b4eaa0992a7a1dde1511a3b6e7"; - }; - - buildInputs = [ - zlib libxml2 libxslt firefox openssl curl - glib gtk pkgconfig dbus-glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml - ]; - - configureFlags="--with-libcurl-libraries=${curl.out}/lib --with-libcurl-headers=${curl.dev}/include --with-pcre_libraries=${pcre.out}/lib --with-pcre_headers=${pcre.dev}/include"; -} diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index b96235341401..0c64cbefb3ed 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub +{ lib, stdenv, rustPlatform, fetchFromGitLab , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.9"; + version = "0.5.0"; doCheck = false; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "xidlehook"; rev = version; - sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; + sha256 = "1qrjwk91i31rww5lwgp84hc4h3b1prm60y45jm1f28g2bbv2qy19"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; + cargoSha256 = "1pdhbqnkgwp2v5zyin8z8049aq8c3kfk04v9wsbz8qla34rgi99s"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 2fbfff287cb9..09c29517af40 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,16 +1,17 @@ { stdenv, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq -, squashfsTools, iproute, iptables, ebtables +, squashfsTools, iproute, iptables, ebtables, libcap, dqlite +, sqlite-replication }: buildGoPackage rec { - name = "lxd-3.0.0"; + name = "lxd-3.0.2"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; - sha256 = "0m5prdf9sk8k5bws1zva4n9ycggmy76wnjr6wb423066pszz24ww"; + sha256 = "1ha8ijzblf15p0kcpgwshswz6s2rdd2b4qnzjw3l72ww620hr84j"; }; preBuild = '' @@ -22,6 +23,8 @@ buildGoPackage rec { popd ''; + buildFlags = [ "-tags libsqlite3" ]; + postInstall = '' # binaries from test/ rm $bin/bin/{deps,macaroon-identity} @@ -32,7 +35,7 @@ buildGoPackage rec { ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ lxc acl ]; + buildInputs = [ lxc acl libcap dqlite sqlite-replication ]; meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 7047eeeefa61..a3987085c8e3 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1hng7v7n6asli9v8gnshrqjnia5cvrwzgnx7irmk7r98nnjzlqda"; + sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 53aaf1004906..85b2c280b8f7 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { - sha256 = "1x4a8r4m68m93q52ffxvaip9nnwx9yqvd1m90v80777c11s20a4n"; + sha256 = "04pdim2bgbbryalim6y8fflm9njpbzxh7148hi4pa828rn9p0jim"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e84260052a41..42f27e69f38e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,26 +1,18 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages }: stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.15.1"; + version = "4.17.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"; + sha256 = "0x6d53fbrcmzvhv461575fzsv3373427p4srz646w2wcagqk82xz"; }; - patches = [ - # Fix build with e2fsprogs 1.44.0 - (fetchpatch { - url = "https://patchwork.kernel.org/patch/10281327/raw/"; - sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf"; - }) - ]; - nativeBuildInputs = [ - pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools ]; buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ]; diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch index b694fcabbd0d..4655879149d2 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch +++ b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch @@ -1,5 +1,5 @@ diff --git a/libinput-gestures b/libinput-gestures -index f337ba3..fe56d66 100755 +index 66479b6..aca94ac 100755 --- a/libinput-gestures +++ b/libinput-gestures @@ -6,7 +6,7 @@ from collections import OrderedDict diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch index c6ee123db8b6..407450c8bccd 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch +++ b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch @@ -1,29 +1,28 @@ diff --git a/libinput-gestures b/libinput-gestures -index f337ba3..5f5b05d 100755 +index aca94ac..c2f03ca 100755 --- a/libinput-gestures +++ b/libinput-gestures -@@ -75,17 +75,13 @@ def get_libinput_vers(): +@@ -77,7 +77,7 @@ def get_libinput_vers(): 'Return the libinput installed version number string' # Try to use newer libinput interface then fall back to old # (depreciated) interface. - res = run(('libinput', '--version'), check=False) + res = run(('@libinput@', '--version'), check=False) - return res.strip() if res else run(('libinput-list-devices', '--version')) + return res.strip() if res else \ + run(('libinput-list-devices', '--version'), check=False) - # Libinput changed the way in which it's utilities are called - libvers = get_libinput_vers() --if Version(libvers) >= Version('1.8'): +@@ -87,8 +87,8 @@ if not libvers: + sys.exit('libinput helper tools do not seem to be installed?') + + if Version(libvers) >= Version('1.8'): - cmd_debug_events = 'libinput debug-events' - cmd_list_devices = 'libinput list-devices' --else: -- cmd_debug_events = 'libinput-debug-events' -- cmd_list_devices = 'libinput-list-devices' -+cmd_debug_events = '@libinput@ debug-events' -+cmd_list_devices = '@libinput@ list-devices' - - def get_devices_list(): - 'Get list of devices and their attributes (as a dict) from libinput' -@@ -187,7 +183,7 @@ class COMMAND_internal(COMMAND): ++ cmd_debug_events = '@libinput@ debug-events' ++ cmd_list_devices = '@libinput@ list-devices' + else: + cmd_debug_events = 'libinput-debug-events' + cmd_list_devices = 'libinput-list-devices' +@@ -199,7 +199,7 @@ class COMMAND_internal(COMMAND): def run(self): 'Get list of current workspaces and select next one' @@ -32,7 +31,7 @@ index f337ba3..5f5b05d 100755 if not stdout: # This command can fail on GNOME when you have only a single # dynamic workspace using Xorg (probably a GNOME bug) so let's -@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND): +@@ -233,7 +233,7 @@ class COMMAND_internal(COMMAND): # Switch to desired workspace if index >= minindex and index < maxindex: @@ -41,3 +40,6 @@ index f337ba3..5f5b05d 100755 # Table of gesture handlers handlers = OrderedDict() +-- +2.19.1 + diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index 31a7098e08d6..77eae2c55e1d 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, - libinput, wmctrl, + libinput, wmctrl, python3, xdotool ? null, extraUtilsPath ? lib.optional (xdotool != null) xdotool }: stdenv.mkDerivation rec { pname = "libinput-gestures"; - version = "2.33"; + version = "2.38"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; rev = version; - sha256 = "0a4zq880da1rn0mxn1sq4cp6zkw4bfslr0vjczkbj4immjrj422j"; + sha256 = "1nxvlifag04v56grdwxc3l92kmf51c4w2lq42a3w76yc6p4nxw1m"; }; patches = [ ./0001-hardcode-name.patch @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; postPatch = '' diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 5059b395610d..b9046bf19ca5 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "cloud-sql-proxy-${version}"; - version = "1.11"; + version = "1.13"; goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { rev = version; url = "https://${goPackagePath}"; - sha256 = "13g68i51f03xdh7a1qjmj8j5ljn4drd3n44fn348xfdxqclnx90l"; + sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; }; goDeps = ./deps.nix; @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = https://github.com/GoogleCloudPlatform/cloudsql-proxy; + homepage = "https://${goPackagePath}"; license = licenses.asl20; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix index 7021b4b05b23..6898833b6f12 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/deps.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "e9284bade4f43071dac5ec56c73a03a3c9fa7772"; - sha256 = "0qm0s97bj21m04a07yni09hdh0aycgmklm5mg6flx17lrp2av9j8"; + rev = "dba8c2c195294739180b3e6865f8893eb808676e"; + sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "3a7846fea0afe8cc88deb31d8cfb1fa15a3615ef"; - sha256 = "1dxvliqc79bl0waczzy8ajm7jpbnn2bszwfcd71zjjxph8jz75kg"; + rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"; + sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269"; - sha256 = "182is558nfvk4x1cm8sqzaym8kfcaaxaga9ggqhvzqrs8mncbj22"; + rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"; + sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://code.googlesource.com/google-api-go-client"; - rev = "20530fd5d65ad2caee87891f9896d7547cb400c9"; - sha256 = "06fsnml2kfzifxp2d5anb6vxjlgpkwl82xcddf0cg0v1bnx5mnrd"; + rev = "39567f0042a03aeb2691599961ed4454e43d5063"; + sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d"; }; } ] diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index b85d2bffc341..a882fe9a9ba3 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.4"; + version = "0.17.5"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "10k21v9x82imly36lgra8a7rlvz5a1jd49db16g9xc11wx7cdg8g"; + sha256 = "04kalm25sn5k24nrdmbkafp4zvxpm2l3rxchvccl0kz0j3szh62z"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 3f476cfea941..a692933053df 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -25,10 +25,10 @@ in { aggregates = glPlugin rec { name = "graylog-aggregates-${version}"; pluginName = "graylog-plugin-aggregates"; - version = "2.0.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0crgb49msjkvfpksbfhq2hlkc904j184wm1wp6q0x6lzhn07hm8y"; + sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws"; }; meta = { homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l"; + sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; @@ -51,10 +51,10 @@ in { dnsresolver = glPlugin rec { name = "graylog-dnsresolver-${version}"; pluginName = "graylog-plugin-dnsresolver"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "01s7wm6bwcpmdrl35gjp6rrqxixs2s9km2bdgzhv8pn25j5qnw28"; + sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; @@ -77,10 +77,10 @@ in { internal-logs = glPlugin rec { name = "graylog-internal-logs-${version}"; pluginName = "graylog-plugin-internal-logs"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "05r4m2gf1hj1b889rmpb6b5a6q2xd0qkl1rpj107yd219j2grzf4"; + sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; @@ -103,10 +103,10 @@ in { jabber = glPlugin rec { name = "graylog-jabber-${version}"; pluginName = "graylog-plugin-jabber"; - version = "2.0.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h"; + sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-jabber; @@ -168,10 +168,10 @@ in { slack = glPlugin rec { name = "graylog-slack-${version}"; pluginName = "graylog-plugin-slack"; - version = "2.4.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0v8ilfhs8bnx87pjxg1i3p2vxw61rwpg4k3zhga7slavx70y986p"; + sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-slack; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index b3ceb41191de..0f035c347cff 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.11"; + version = "1.2018.12"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm"; + sha256 = "1ydi4zwzwf9q6hldzd9pcvsbrwy8r52vqxm74j2wq8yivh2p85s4"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 67f805988a3e..3de81d3bd052 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; name = "${pname}-${version}"; - version = "0.1.8"; + version = "0.1.9"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "powerline-rs"; - rev = version; + #rev = version; - sha256 = "018i9qq98afbgv0nxs1n83zb09lqhqxpdrd95f2maic3rr5ngnj5"; + # Support for $COMPLETION_OUT: + rev = "44679385a95dd9f3ebd9b093f9ef8925610e9a23"; + + sha256 = "1mxkw6ydnqjyplbki2j9pbnlhxmkw9qqw54443a3cjmn2g08jyzp"; }; - cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; + cargoSha256 = "1sr9vbfk5bb3n0lv93y19in1clyvbj0w3p1gmp4sbw8lx84zwxhc"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + COMPLETION_OUT = "out"; postInstall = '' - install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" - install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 54a6500f7797..f1df06912051 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,23 +2,21 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "1k7l93kvf5ad07yn69vjfv6znwb9v38d53xa1ij195x4img9f34j"; + sha256 = "1b3l0h69cm70669apsgzp7qw1k5fi2gbk9176hjr9iypbdiwjyir"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "18lgjh1b1wfm9xsd6y6slfj1i3dwrvzkzszdzk3lmqx1f8515gx7"; + cargoSha256 = "0ksxyivdrrs3z5laxkqzq4lql6w0hqf92daazanxkw8vfcksbzsm"; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim - # fix Cargo.lock version - sed -i -e '168s|0.4.0|0.5.1|' Cargo.lock ''; postInstall = '' @@ -36,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "Fuzzy Finder in rust!"; + description = "Command-line fuzzy finder written in Rust"; homepage = https://github.com/lotabout/skim; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 563232dbe53d..80b66026848e 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,23 +5,15 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.5.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm"; + sha256 = "1dm1kf4wrbcaaagxgbc8q0f5j9dq3bmp6ycl7zx8p70s4nv3xnbc"; }; - patches = [ - # Fix build with new Boost - (fetchpatch { - url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch"; - sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig docbook_xsl libxslt docbook_xml_dtd_45 diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index fe0aa6cc3089..73a9f68d3dcd 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "tealdeer-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dbrgn"; repo = "tealdeer"; rev = "v${version}"; - sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v"; + sha256 = "055pjxgiy31j69spq66w80ig469yi075dk8ad38z6rlvjmf74k71"; }; - cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq"; + cargoSha256 = "1jxwz2b6p82byvfjx77ba265j6sjr7bjqi2yik8x2i7lrz8v8z1g"; buildInputs = [ openssl cacert curl ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with stdenv.lib; { - description = "An implementation of tldr in Rust"; + description = "A very fast implementation of tldr in Rust"; homepage = "https://github.com/dbrgn/tealdeer"; maintainers = with maintainers; [ davidak ]; license = with licenses; [ asl20 mit ]; diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix new file mode 100644 index 000000000000..9fdac0b8b9cc --- /dev/null +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, ncurses }: +stdenv.mkDerivation rec { + name = "ttyplot-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "tenox7"; + repo = "ttyplot"; + rev = version; + sha256 = "1i54hw7fad42gdlrlqg7s0vhsq01yxzdi2s0r3svwbb1sr7ynzn1"; + }; + + buildInputs = [ ncurses ]; + + buildPhase = '' + ${stdenv.cc}/bin/cc ./ttyplot.c -lncurses -o ttyplot + ''; + + installPhase = '' + mkdir -p $out/bin + cp ttyplot $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "a simple general purpose plotting utility for tty with data input from stdin."; + homepage = https://github.com/tenox7/ttyplot; + license = licenses.unlicense; + maintainers = with maintainers; [ lassulus ]; + }; +} diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 23e28c3c286a..fa208154eaa0 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"; + sha256 = "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index ab8d257d7c76..a0c44b0341c3 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -3,18 +3,18 @@ , autoreconfHook }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.2"; + name = "aircrack-ng-1.4"; src = fetchurl { url = "https://download.aircrack-ng.org/${name}.tar.gz"; - sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr"; + sha256 = "0fz1g6sd7dkfgcxrfrnqbygpx8d4ziyidm9wjb0ws9xgyy52l2cn"; }; nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' - sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c + sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/aircrack-osdep/linux.c ''; postFixup = '' diff --git a/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix new file mode 100644 index 000000000000..a51cf1839930 --- /dev/null +++ b/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix @@ -0,0 +1,156 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/DataDog/datadog-agent"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/datadog-agent"; + rev = "92733ff01547103d5286afc9e272d501cb18f761"; + sha256 = "1mmb7gyin6c4l6pj0nw3kpmj8wvjm7c8n4h5frv26bhg84m15xhd"; + }; + } + { + goPackagePath = "github.com/DataDog/datadog-go"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/datadog-go"; + rev = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d"; + sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "ea383cf3ba6ec950874b8486cd72356d007c768f"; + sha256 = "1x3a3rdxccrzrnkld67p9ilm086v4w195rdhyw0bq39x1v1vzbln"; + }; + } + { + goPackagePath = "github.com/cihub/seelog"; + fetch = { + type = "git"; + url = "https://github.com/cihub/seelog"; + rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115"; + sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "74bdc99692c3408cb103221e38675ce8fda0a718"; + sha256 = "0ad93rznilmd1hw20nlkr7ywi3sbd299mynf4db20k5yl34r3498"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "de8695c8edbf8236f30d6e1376e20b198a028d42"; + sha256 = "084caxl71v8lgg475whj2pz9mij3wk3gpbh3pfyf2dm66b6xrq2k"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "d76fbc1373015ced59b43ac267f28d546b955683"; + sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; + sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58"; + sha256 = "04qbzj7r7ahq6s407lh9rb3xagbnaj5wp79siq49qkiz3101kfdb"; + }; + } + { + goPackagePath = "github.com/shirou/w32"; + fetch = { + type = "git"; + url = "https://github.com/shirou/w32"; + rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; + sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "362bfb3384d53ae4d5dd745983a4d70b6d23628c"; + sha256 = "0b39cp417ndznkfwdqcbh89f9x3ml4rn7kf4l4als7vqrrwk7vrz"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9"; + sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; + sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; + }; + } +] \ No newline at end of file diff --git a/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix b/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix new file mode 100644 index 000000000000..bdd3491ed18f --- /dev/null +++ b/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "datadog-trace-agent-${version}"; + version = "6.5.0"; + owner = "DataDog"; + repo = "datadog-trace-agent"; + + src = fetchFromGitHub { + inherit owner repo; + rev = "6.5.0"; + sha256 = "0xhhcdridilhdwpmr9h3cqg5w4fh87l1jhvzg34k30gdh0g81afw"; + }; + + goDeps = ./datadog-trace-agent-deps.nix; + goPackagePath = "github.com/${owner}/${repo}"; + + meta = with stdenv.lib; { + description = "Live trace collector for the DataDog Agent v6"; + homepage = https://www.datadoghq.com; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ rob ]; + }; +} diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index fda5d25aa17d..36bc2a9bc284 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz"; + sha256 = "17ndpkpyh8hwr6v7ac6029sja95nhn9c1g8r93g20rp0vz3r6lpa"; }; nativeBuildInputs = [ cmake ninja ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; homepage = https://mistertea.github.io/EternalTCP/; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.dezgeg ]; }; } diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index d911acc58f4d..952bbf4999e3 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -3,13 +3,13 @@ let pname = "NetworkManager-openvpn"; - version = "1.8.6"; + version = "1.8.8"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ksij9438f2lrwkg287qjlfaxja6jgmqxqap96585r3nf5zj69ch"; + sha256 = "19qdl7x5x7f9mj8vm25mck6gg8ljbixi0dw2rqngwl2nzpcxwg52"; }; patches = [ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 96bc2c56ece8..7aeae3ca9d12 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,39 +13,31 @@ let gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/" - + "e395eed38096fcda74398424ea94de3ec44effd5" + + "d80ebbf028196b2478beebf5a290b97f35e1eed9" + "/debian/patches/gssapi.patch"; - sha256 = "0x7xysgdahb4jaq0f28g2d7yzp0d3mh59i4xnffszvjndhvbk27x"; + sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2wv"; }; in with stdenv.lib; stdenv.mkDerivation rec { name = "openssh-${version}"; - version = if hpnSupport then "7.7p1" else "7.7p1"; + version = if hpnSupport then "7.8p1" else "7.9p1"; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_7_P1.tar.gz"; - sha256 = "1l4k8mg3gnzxbz53cma8s6ak56waz03ijsr08p8vgpi0c2rc5ri5"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz"; + sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw"; } else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp"; + sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"; }; patches = [ - # Remove on update! - (fetchpatch { - name = "fix-tunnel-forwarding.diff"; - url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff"; - sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8"; - }) - ./locale_archive.patch - ./fix-host-key-algorithms-plus.patch # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch diff --git a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch deleted file mode 100644 index 02846e9bdad2..000000000000 --- a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch +++ /dev/null @@ -1,52 +0,0 @@ -Specifying "HostKeyAlgorithms +ssh-dds" does not work properly because -setting any value for HostKeyAlgorithms causes the known host keys to -be ignored for the purpose of determining the priority of algorithms. -This was fixed upstream for HostKeyAlgorithms in sshd_config, but not -in ssh_config. The fix is to apply order_hostkeyalgs() if the user -specifies a HostKeyAlgorithms starting with "+". - -diff -ru -x '*~' openssh-7.2p2-orig/sshconnect2.c openssh-7.2p2/sshconnect2.c ---- openssh-7.2p2-orig/sshconnect2.c 2016-03-09 19:04:48.000000000 +0100 -+++ openssh-7.2p2/sshconnect2.c 2016-04-01 15:39:45.140945902 +0200 -@@ -100,7 +100,7 @@ - } - - static char * --order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) -+order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port, char *algs) - { - char *oavail, *avail, *first, *last, *alg, *hostname, *ret; - size_t maxlen; -@@ -116,7 +116,7 @@ - for (i = 0; i < options.num_system_hostfiles; i++) - load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]); - -- oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG); -+ oavail = avail = xstrdup(algs); - maxlen = strlen(avail) + 1; - first = xmalloc(maxlen); - last = xmalloc(maxlen); -@@ -181,18 +181,21 @@ - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; - if (options.hostkeyalgorithms != NULL) { -+ int append = options.hostkeyalgorithms[0] == '+'; - if (kex_assemble_names(KEX_DEFAULT_PK_ALG, - &options.hostkeyalgorithms) != 0) - fatal("%s: kex_assemble_namelist", __func__); - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = -- compat_pkalg_proposal(options.hostkeyalgorithms); -+ compat_pkalg_proposal(append -+ ? order_hostkeyalgs(host, hostaddr, port, options.hostkeyalgorithms) -+ : options.hostkeyalgorithms); - } else { - /* Enforce default */ - options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); - /* Prefer algorithms that we already have keys for */ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - compat_pkalg_proposal( -- order_hostkeyalgs(host, hostaddr, port)); -+ order_hostkeyalgs(host, hostaddr, port, KEX_DEFAULT_PK_ALG)); - } - - if (options.rekey_limit || options.rekey_interval) diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index 8e9a88ad6f94..7d2e17af3880 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { name = "twa-${version}"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = version; - sha256 = "14pwiq1kza92w2aq358zh5hrxpxpfhg31am03b56g6vlvqzsvib7"; + sha256 = "19jn4wp4f0vp2bxvrbyhjrwqgbphr5y1l17qawy8vdv3yswbyw46"; }; dontBuild = true; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 850a33db58cf..c9de3f8ea574 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1m7qdh2lk5napncmfnk86dj4wqcahq8y24xnylxa4qlx2ivwkr6b"; + sha256 = "1bkd0r5arzdvinpn1n23cw1gf7byxml95hl6qvvf6mnggb1ifcwg"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index b11d149da889..f668998de7fd 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.3.2"; + version = "5.4.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1sd6jl349kz3bjwm8rx9kihxyd3d35cac4swla843vwzdpczsk5f"; + sha256 = "1n90qpy079x97a27zpckc0vnaqrdjsxgy0hsz0z8gbrc1sy30sdz"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 33b62d1bb380..12e2deb74226 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20181007"; + version = "0.0.20181018"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1nrhwnccs6sqq1qs7yhxqb989inrc9n2saibpqs6ga6gb0pvpac6"; + sha256 = "0vrr0f89nrpwnyia6kqvrjkxwivrnvjnbavmx2nxlrb3sz23481y"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix new file mode 100644 index 000000000000..988147d7ab00 --- /dev/null +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub +, autoreconfHook, pkgconfig, gettext +, vim, glib, libxml2, openssl, ncurses, popt, screen +}: + +stdenv.mkDerivation rec { + name = "apt-dater-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "DE-IBH"; + repo = "apt-dater"; + rev = "v${version}"; + sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl"; + }; + + nativeBuildInputs = [ + pkgconfig autoreconfHook gettext + ]; + + buildInputs = [ + libxml2 ncurses vim glib popt screen + ]; + + configureFlags = [ "--disable-history" ]; + + prePatch = '' + substituteInPlace etc/Makefile.am \ + --replace 02770 0770 + ''; + + postPatch = '' + substituteInPlace configure.ac \ + --replace "/usr/bin/screen" "${screen}/bin/screen" + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/DE-IBH/apt-dater; + description = "Terminal-based remote package update manager"; + longDescription = '' + Provides an ncurses frontend for managing package updates on a large + number of remote hosts using SSH. It supports Debian-based managed hosts + as well as rug (e.g. openSUSE) and yum (e.g. CentOS) based systems. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ c0bw3b ]; + }; +} diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 99d59ae65de9..8cb8237c538c 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.0.5"; + version = "1.19.2"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1dc5kp3fqy1k66fly6jfxkkg7w6d0jy8szddpfyc2xvzga94d041"; + sha256 = "0w8vhvwnhvwq3k3cw9d1jiy61v4r81wv6q5rkliq2nq6z0naxwpq"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index da32aca28aac..f761c69e0264 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "0csd7dkdv0csc63dz1h08c8xifxwv5fdz5dyk37sr6vh1ccjdapi"; + sha256 = "1391fs33jlg1pnfxpfhvry4sb4p4hy8gjpipnnxm8483f12b49km"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 975d36ddf190..030571d6a911 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -159,13 +159,13 @@ in rec { }; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-2.1${suffix}"; - suffix = "pre6377_954d1f4d"; + name = "nix-2.2${suffix}"; + suffix = "pre6520_18b4c53f"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "954d1f4d0a35063ff431b258beebadf753cb9efe"; - sha256 = "0wnljxljvcwmniydgxlsjqmbgghmljs75m6083y2nkjql7dnrm7g"; + rev = "18b4c53f71dfc626f5f5ffa0282afd1b9faad6a4"; + sha256 = "1hn7bjrf6x7024nald7nk1c9m8fyddkzhazl7pwf6ssmiv12apxh"; }; fromGit = true; })) // { perl-bindings = perl-bindings { diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 27793f448013..55171e6d38f7 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.14.2"; + version = "4.14.2.1"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0"; + sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 825993937246..5ab46a1d5e16 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.100.1"; + version = "0.100.2"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; - sha256 = "17x5b2gh84b167h6ip9hw05w809p009yx13i4gkps92ja5jjdq44"; + sha256 = "1mkd41sxbjkfjinpx5b9kb85q529gj2s3d0klysssqhysh64ybja"; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 70a1beb8ce7c..c23827842f23 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensc-${version}"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "1shwx1rkmnygk2dp0q8pbvnxcg96bn570vch9yq34gs42ryskihf"; + sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; }; nativeBuildInputs = [ pkgconfig ]; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=$(out)/etc" + "completiondir=$(out)/etc" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 44cee21bc497..03af1b8a101a 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "paperkey-${version}"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; - sha256 = "1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4"; + sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2"; }; postPatch = '' diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index d2326c7e8c38..86a5a1b7c396 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,24 +1,50 @@ -{ stdenv, fetchurl }: - +{ stdenv, fetchFromGitHub, libtool, autoconf, automake, pkgconfig +, sysfsutils + # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS + # https://www.nist.gov/programs-projects/nist-randomness-beacon +, curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false + # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source +, libgcrypt ? null, withGcrypt ? true + # Not sure if jitterentropy is safe to use for cryptography + # and thus a default entropy source +, jitterentropy ? null, withJitterEntropy ? false +}: +with stdenv.lib; stdenv.mkDerivation rec { - name = "rng-tools-5"; + name = "rng-tools-${version}"; + version = "6.6"; + + src = fetchFromGitHub { + owner = "nhorman"; + repo = "rng-tools"; + rev = "v${version}"; + sha256 = "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7"; + }; - src = fetchurl { - url = "mirror://sourceforge/gkernel/${name}.tar.gz"; + nativeBuildInputs = [ libtool autoconf automake pkgconfig ]; - sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"; - }; + preConfigure = "./autogen.sh"; + + configureFlags = + optional (!withJitterEntropy) "--disable-jitterentropy" + ++ optional (!withNistBeacon) "--without-nistbeacon" + ++ optional (!withGcrypt) "--without-libgcrypt"; + + buildInputs = [ sysfsutils ] + ++ optional withJitterEntropy [ jitterentropy ] + ++ optional withGcrypt [ libgcrypt.dev ] + ++ optional withNistBeacon [ openssl.dev curl.dev libxml2.dev ]; + + enableParallelBuilding = true; # For cross-compilation makeFlags = [ "AR:=$(AR)" ]; meta = { description = "A random number generator daemon"; - - homepage = https://sourceforge.net/projects/gkernel; - - license = stdenv.lib.licenses.gpl2; - + homepage = https://github.com/nhorman/rng-tools; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix new file mode 100644 index 000000000000..68db242f40af --- /dev/null +++ b/pkgs/tools/security/signify/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, libbsd, pkgconfig }: + +stdenv.mkDerivation rec { + name = "signify-${version}"; + version = "24"; + + src = fetchFromGitHub { + owner = "aperezdc"; + repo = "signify"; + rev = "v${version}"; + sha256 = "0grdlrpxcflzmzzc30r8rvsmamvbsgqyni59flzzk4w5hpjh464w"; + }; + + doCheck = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libbsd ]; + + preInstall = '' + export PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "OpenBSD signing tool"; + longDescription = '' + OpenBSDs signing tool, which uses the Ed25519 public key signature system + for fast signing and verification of messages using small public keys. + ''; + homepage = https://www.tedunangst.com/flak/post/signify; + license = licenses.isc; + maintainers = [ maintainers.rlupton20 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 6c89b0defa66..0484e8e069ab 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sslscan-${version}"; - version = "1.11.11"; + version = "1.11.12"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "${version}-rbsec"; - sha256 = "0k1agdz52pdgihwfwbygp0mlwkf757vcwhvwc0mrz606l2wbmwmr"; + sha256 = "0wa0z6my6aqjp8si6x522ivk0yy55izbs3ch298gxjw5r15f4jb1"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f805670a5d5e..9492f2bb6eac 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -12,11 +12,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.91"; + version = "2.0.97"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx"; + sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; }; # Relax overly restricted version constraint diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index e273b2c19091..460474a7bb3b 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,34 +5,16 @@ }: stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.8.1"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "05smkn4ii8irx6ccnzrhwa39pkmrjyxjmfrwh6mhdd8iz51v5cgz"; + sha256 = "1ys2y5f2cif3g42daq646jcrn2na19zkx7fds2gnavj5c1rk7463"; }; - # FIXME: this is probably not the right way to make it work - # make[2]: *** No rule to make target 'libyara/.libs/libyara.a', needed by 'yara'. Stop. - prePatch = '' - cat >staticlibrary.patch <<EOF - --- a/Makefile.am 2015-11-01 11:39:12.000000000 +0100 - +++ b/Makefile.am 2015-11-01 11:45:32.000000000 +0100 - @@ -12 +12 @@ - -yara_LDADD = libyara/.libs/libyara.a - +yara_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary} - @@ -15 +15 @@ - -yarac_LDADD = libyara/.libs/libyara.a - +yarac_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary} - EOF - ''; - patches = [ - "staticlibrary.patch" - ]; - buildInputs = [ autoconf automake libtool pcre] ++ stdenv.lib.optionals withCrypto [ openssl ] ++ stdenv.lib.optionals enableMagic [ file ] diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 8ffa85a5084a..8796de4e9e07 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, getopt, libcap }: stdenv.mkDerivation rec { - version = "1.22"; + version = "1.23"; name = "fakeroot-${version}"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2"; - sha256 = "1zn67sp066q63vx95r671v0ki878i40a2wa57pmh64k43r56m05x"; + url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz"; + sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; }; patches = stdenv.lib.optional stdenv.isLinux ./einval.patch diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 59ece285676c..4b2ad1f7ef96 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.58"; + version = "21.60"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "15gfgb711cs42nynmql2dyi8hs7f5wj3pcm75snnbz5arp8lx3j2"; + sha256 = "1agjc14m1814x897wkx484qb8llr395xlzn428f86sxgshicwfy3"; }; patchPhase = '' diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 7e781223b572..23696651a634 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.6.2"; + version = "4.6.3"; name = "sleuthkit-${version}"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = name; - sha256 = "1ykl6ijf15mjfvmkk9b4gj18kspdairn7ms4wsi2v9kb25776skx"; + sha256 = "1qaggb8day6idbafncslyaz7a475sq6p0xnjwc4c99f0z7i9cahp"; }; postPatch = '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 5b8a9cd0aee5..1ce7e766a18e 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.17.2"; + version = "3.18.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k"; + sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 949a9c89e9af..aec238cb4ccc 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "icdiff-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; rev = "release-${version}"; - sha256 = "10hv09sg7m8gzjf1v785kvim9ps81akzyx7ws6ypylyxc0l2fdcl"; + sha256 = "1micpm7kq9swfscmp4mg37fnzgzpsg7704yi33c5sd6cmgbdabxm"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index a17c348c4cc1..3e0bee3b9b98 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "miller-${version}"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "${version}"; - sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v"; + sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 270fd7da1717..5789f51abd9c 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "0hcwpyy97afwq40qn8jq75f1b2p0172lil1v0hs9a0rislpqk5nm"; + sha256 = "0a9sxifzsbj24kjnpc0525i91ni2vkwizhgvwx1m9shvfkiisnc6"; }; postPatch = '' diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix new file mode 100644 index 000000000000..23d8093606be --- /dev/null +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, flex, bison }: + +stdenv.mkDerivation rec { + name = "tikzit-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "tikzit"; + repo = "tikzit"; + rev = "v${version}"; + sha256 = "0fwxr9rc9vmw2jzpj084rygzyhp4xm3vm737668az600ln2scyad"; + }; + + nativeBuildInputs = [ qmake qttools flex bison ]; + buildInputs = [ qtbase ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A graphical tool for rapidly creating graphs and diagrams using PGF/TikZ"; + longDescription = '' + TikZiT is a simple GUI editor for graphs and string diagrams. + Its native file format is a subset of PGF/TikZ, which means TikZiT files + can be included directly in papers typeset using LaTeX. + ''; + homepage = https://tikzit.github.io/; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.iblech maintainers.mgttlinger ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f243df540da..444028d2db0d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -205,6 +205,7 @@ mapAliases ({ opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 + openjpeg_2_1 = openjpeg_2; # added 2018-10-25 openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 @@ -234,6 +235,7 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -248,6 +250,7 @@ mapAliases ({ s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 s6PortableUtils = s6-portable-utils; # added 2018-07-23 + sagemath = sage; # added 2018-10-27 sam = deadpixi-sam; # added 2018-04-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 @@ -322,6 +325,9 @@ mapAliases ({ xpraGtk3 = xpra; # added 2018-09-13 youtubeDL = youtube-dl; # added 2014-10-26 + # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 + # branch-off + # added 2017-05-27 wineMinimal = winePackages.minimal; wineFull = winePackages.full; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ce94155af96..4b6822b9af69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -635,6 +635,8 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; + apt-dater = callPackage ../tools/package-management/apt-dater { }; + autorevision = callPackage ../tools/misc/autorevision { }; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; @@ -730,6 +732,8 @@ with pkgs; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + goku = callPackage ../os-specific/darwin/goku { }; + kwakd = callPackage ../servers/kwakd { }; kwm = callPackage ../os-specific/darwin/kwm { }; @@ -977,6 +981,9 @@ with pkgs; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; + breakpointHook = assert stdenv.isLinux; + makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; + bsod = callPackage ../misc/emulators/bsod { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -1111,6 +1118,8 @@ with pkgs; cloud-init = callPackage ../tools/virtualization/cloud-init { }; + cloudflared = callPackage ../applications/networking/cloudflared { }; + cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { }; clib = callPackage ../tools/package-management/clib { }; @@ -2368,6 +2377,8 @@ with pkgs; carp = callPackage ../development/compilers/carp { }; + cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; + emscriptenVersion = "1.37.36"; emscripten = callPackage ../development/compilers/emscripten { }; @@ -2542,6 +2553,8 @@ with pkgs; fdm = callPackage ../tools/networking/fdm {}; + featherpad = callPackage ../applications/editors/featherpad {}; + feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; ferm = callPackage ../tools/networking/ferm { }; @@ -3431,7 +3444,7 @@ with pkgs; jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { - mono = mono5; + mono = mono514; }; jade = callPackage ../tools/text/sgml/jade { }; @@ -3455,6 +3468,8 @@ with pkgs; jira-cli = callPackage ../development/tools/jira_cli { }; + jitterentropy = callPackage ../development/libraries/jitterentropy { }; + jl = haskellPackages.callPackage ../development/tools/jl { }; jmespath = callPackage ../development/tools/jmespath { }; @@ -4506,6 +4521,10 @@ with pkgs; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { + withGssapiPatches = true; + }); + opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; @@ -4524,6 +4543,8 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; + opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; + openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { @@ -5077,7 +5098,7 @@ with pkgs; inherit (pythonPackages) sphinx; }; - rng_tools = callPackage ../tools/security/rng-tools { }; + rng-tools = callPackage ../tools/security/rng-tools { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -5275,6 +5296,8 @@ with pkgs; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; + signify = callPackage ../tools/security/signify { }; + # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -5622,6 +5645,8 @@ with pkgs; tie = callPackage ../development/tools/misc/tie { }; + tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; + tilix = callPackage ../applications/misc/tilix { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; @@ -5739,6 +5764,8 @@ with pkgs; tty-clock = callPackage ../tools/misc/tty-clock { }; + ttyplot = callPackage ../tools/misc/ttyplot { }; + ttyrec = callPackage ../tools/misc/ttyrec { }; ttylog = callPackage ../tools/misc/ttylog { }; @@ -5860,6 +5887,9 @@ with pkgs; vimer = callPackage ../tools/misc/vimer { }; + visidata = (newScope python3Packages) ../applications/misc/visidata { + }; + vit = callPackage ../applications/misc/vit { }; vnc2flv = callPackage ../tools/video/vnc2flv {}; @@ -6401,6 +6431,23 @@ with pkgs; abcl = callPackage ../development/compilers/abcl {}; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; + adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + + adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; + + # no OpenJ9 for Darwin + adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; + + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; + adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; @@ -6443,6 +6490,8 @@ with pkgs; inherit (darwin) bootstrap_cmds; }; + cdb = callPackage ../development/tools/database/cdb { }; + chez = callPackage ../development/compilers/chez { inherit (darwin) cctools; }; @@ -6835,7 +6884,7 @@ with pkgs; cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install; - stack = haskell.lib.justStaticExecutables haskell.packages.ghc861.stack; + stack = haskell.lib.justStaticExecutables haskellPackages.stack; hlint = haskell.lib.justStaticExecutables haskellPackages.hlint; all-cabal-hashes = callPackage ../data/misc/hackage { }; @@ -6905,6 +6954,8 @@ with pkgs; go-repo-root = callPackage ../development/tools/go-repo-root { }; + go-junit-report = callPackage ../development/tools/go-junit-report { }; + gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -7259,6 +7310,8 @@ with pkgs; ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; + ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { }; + orc = callPackage ../development/compilers/orc { }; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; @@ -7299,15 +7352,17 @@ with pkgs; }; # For beta and nightly releases use the nixpkgs-mozilla overlay - rust = callPackage ../development/compilers/rust - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + rust = callPackage ../development/compilers/rust ({ + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); inherit (rust) cargo rustc; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; - + cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; cargo-web = callPackage ../development/tools/cargo-web { @@ -7349,7 +7404,9 @@ with pkgs; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; - rust-cbindgen = callPackage ../development/tools/rust/cbindgen { }; + rust-cbindgen = callPackage ../development/tools/rust/cbindgen { + inherit (darwin.apple_sdk.frameworks) Security; + }; rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7362,6 +7419,7 @@ with pkgs; scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; scala = scala_2_12; + scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { @@ -8565,10 +8623,14 @@ with pkgs; kcov = callPackage ../development/tools/analysis/kcov { }; + kind = callPackage ../development/tools/kind { }; + kube-aws = callPackage ../development/tools/kube-aws { }; kubectx = callPackage ../development/tools/kubectx { }; + kube-prompt = callPackage ../development/tools/kube-prompt { }; + kustomize = callPackage ../development/tools/kustomize { }; kythe = callPackage ../development/tools/kythe { }; @@ -9807,9 +9869,7 @@ with pkgs; gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; - gusb = callPackage ../development/libraries/gusb { - inherit (gnome2) gtkdoc; - }; + gusb = callPackage ../development/libraries/gusb { }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -10246,6 +10306,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; + libaosd = callPackage ../development/libraries/libaosd { }; + libabw = callPackage ../development/libraries/libabw { }; libamqpcpp = callPackage ../development/libraries/libamqpcpp { }; @@ -10553,6 +10615,8 @@ with pkgs; libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { }; + libsignon-glib = callPackage ../development/libraries/libsignon-glib { }; + libsoundio = callPackage ../development/libraries/libsoundio { inherit (darwin.apple_sdk.frameworks) AudioUnit; }; @@ -11456,7 +11520,9 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = nixUnstable; + }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -11566,8 +11632,8 @@ with pkgs; openh264 = callPackage ../development/libraries/openh264 { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; - openjpeg = openjpeg_2_1; + openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; + openjpeg = openjpeg_2; openpa = callPackage ../development/libraries/openpa { }; @@ -12170,6 +12236,8 @@ with pkgs; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; + skaffold = callPackage ../development/tools/skaffold { }; + skalibs = skawarePackages.skalibs; skawarePackages = recurseIntoAttrs { @@ -12304,6 +12372,29 @@ with pkgs; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; + sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec { + name = "sqlite-${version}"; + version = "3.24.0+replication3"; + src = pkgs.fetchFromGitHub { + owner = "CanonicalLtd"; + repo = "sqlite"; + rev = "version-${version}"; + sha256 = "19557b7aick1pxk0gw013cf5jy42i7539qn1ziza8dzy16a6zs8b"; + }; + nativeBuildInputs = [ pkgs.tcl ]; + configureFlags = oldAttrs.configureFlags ++ [ + "--enable-replication" + "--disable-amalgamation" + "--disable-tcl" + ]; + preConfigure = '' + echo "D 2018-08-01T13:22:18" > manifest + echo -n "c94dbda1a570c1ab180e7694afd3cc7116268c06" > manifest.uuid + ''; + }); + + dqlite = callPackage ../development/libraries/dqlite { }; + sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { readline = null; ncurses = null; @@ -12650,6 +12741,7 @@ with pkgs; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; + inherit (darwin) cf-private; }; wxSVG = callPackage ../development/libraries/wxSVG { @@ -12786,6 +12878,17 @@ with pkgs; zziplib = callPackage ../development/libraries/zziplib { }; + gsignond = callPackage ../development/libraries/gsignond { + plugins = []; + }; + + gsignondPlugins = { + sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; + oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; + lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; + mail = callPackages ../development/libraries/gsignond/plugins/mail.nix { }; + }; + ### DEVELOPMENT / LIBRARIES / AGDA agda = callPackage ../build-support/agda { @@ -12903,6 +13006,8 @@ with pkgs; leaps = callPackage ../development/tools/leaps { }; + vgo2nix = callPackage ../development/tools/vgo2nix { }; + ws = callPackage ../development/tools/ws { }; ### DEVELOPMENT / JAVA MODULES @@ -13646,7 +13751,6 @@ with pkgs; }); samba4Full = lowPrio (samba4.override { - enableInfiniband = true; enableLDAP = true; enablePrinting = true; enableMDNS = true; @@ -14212,6 +14316,16 @@ with pkgs; ]; }; + linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14323,6 +14437,8 @@ with pkgs; ply = callPackage ../os-specific/linux/ply { }; + r8168 = callPackage ../os-specific/linux/r8168 { }; + rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; @@ -14404,7 +14520,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_18; + linuxPackages_latest = linuxPackages_4_19; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14415,6 +14531,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); + linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -15816,6 +15933,8 @@ with pkgs; brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; + brave = callPackage ../applications/networking/browsers/brave { }; + notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; bristol = callPackage ../applications/audio/bristol { }; @@ -15897,13 +16016,18 @@ with pkgs; bookworm = callPackage ../applications/office/bookworm { }; - chromium = callPackage ../applications/networking/browsers/chromium { + chromium = callPackage ../applications/networking/browsers/chromium ({ channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - gnome = gnome2; - }; + } // (if stdenv.isAarch64 then { + stdenv = gcc8Stdenv; + } else { + llvmPackages = llvmPackages_7; + stdenv = llvmPackages_7.stdenv; + }) + ); chronos = callPackage ../applications/networking/cluster/chronos { }; @@ -15950,6 +16074,8 @@ with pkgs; cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + cntr = callPackage ../applications/virtualization/cntr { }; + communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; @@ -16035,6 +16161,7 @@ with pkgs; pythonPackages = datadog-integrations-core {}; }; datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; + datadog-trace-agent = callPackage ../tools/networking/dd-agent/datadog-trace-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { python = python27; extraIntegrations = extras; @@ -16090,6 +16217,8 @@ with pkgs; inherit (python3Packages) buildPythonApplication requests; }; + dmrconfig = callPackage ../applications/misc/dmrconfig { }; + dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; @@ -17144,9 +17273,11 @@ with pkgs; wlc = callPackage ../development/libraries/wlc { }; wlroots = callPackage ../development/libraries/wlroots { }; - rootston = wlroots.bin; + orbment = callPackage ../applications/window-managers/orbment { }; + sway = callPackage ../applications/window-managers/sway { }; + sway-beta = callPackage ../applications/window-managers/sway/beta.nix { }; velox = callPackage ../applications/window-managers/velox { stConf = config.st.conf or null; @@ -17653,6 +17784,8 @@ with pkgs; makeself = callPackage ../applications/misc/makeself { }; + mako = callPackage ../applications/misc/mako { }; + mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; marathon = callPackage ../applications/networking/cluster/marathon { }; @@ -18593,7 +18726,7 @@ with pkgs; rclone = callPackage ../applications/networking/sync/rclone { }; rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; - + rcs = callPackage ../applications/version-management/rcs { }; rdesktop = callPackage ../applications/networking/remote/rdesktop { }; @@ -19042,6 +19175,8 @@ with pkgs; taskjuggler = callPackage ../applications/misc/taskjuggler { }; + tabula = callPackage ../applications/misc/tabula { }; + tasknc = callPackage ../applications/misc/tasknc { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -20438,6 +20573,12 @@ with pkgs; scummvm = callPackage ../games/scummvm { }; + inherit (callPackage ../games/scummvm/games.nix { }) + beneath-a-steel-sky + drascula-the-vampire-strikes-back + flight-of-the-amazon-queen + lure-of-the-temptress; + scorched3d = callPackage ../games/scorched3d { }; scrolls = callPackage ../games/scrolls { }; @@ -21067,6 +21208,8 @@ with pkgs; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; + lrs = callPackage ../development/libraries/science/math/lrs { }; + m4ri = callPackage ../development/libraries/science/math/m4ri { }; m4rie = callPackage ../development/libraries/science/math/m4rie { }; @@ -21116,6 +21259,8 @@ with pkgs; nauty = callPackage ../applications/science/math/nauty {}; + or-tools = callPackage ../development/libraries/science/math/or-tools {}; + rubiks = callPackage ../development/libraries/science/math/rubiks { }; petsc = callPackage ../development/libraries/science/math/petsc { }; @@ -21124,6 +21269,8 @@ with pkgs; mpi = openmpi; }; + QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; + scs = callPackage ../development/libraries/science/math/scs { liblapack = liblapackWithoutAtlas; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index ca367aeb0d1a..75e9506ac049 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -40,6 +40,7 @@ let ssreflect = callPackage ../development/coq-modules/ssreflect { }; stdpp = callPackage ../development/coq-modules/stdpp { }; tlc = callPackage ../development/coq-modules/tlc {}; + Velisarios = callPackage ../development/coq-modules/Velisarios {}; }; filterCoqPackages = coq: diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 3bf7c31b7008..78ca0d20908d 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -31,7 +31,9 @@ in libcxxabi = pkgs.libcxxabi; }; - cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; }; + cf-private = callPackage ../os-specific/darwin/cf-private { + inherit (darwin) CF apple_sdk osx_private_sdk; + }; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; @@ -74,7 +76,7 @@ in CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; }; - + # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c9df0f908ee2..62b773c51bf6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -753,6 +753,10 @@ let zed = callPackage ../development/ocaml-modules/zed { }; + zmq = callPackage ../development/ocaml-modules/zmq { }; + + zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { }; + ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { oasis = ocaml_oasis; }; @@ -1020,11 +1024,15 @@ let omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - verasco = callPackage ../development/tools/analysis/verasco ( + verasco = callPackage ../development/tools/analysis/verasco (( if system == "x86_64-linux" then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} - ); + ) // { + menhir = callPackage ../development/ocaml-modules/menhir { + version = "20170712"; + }; + }); google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 023f4eaf3dcc..c68e15aeb961 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -555,8 +555,6 @@ let }; }; - ArchiveZip_1_53 = ArchiveZip; - AudioScan = buildPerlPackage rec { name = "Audio-Scan-1.01"; src = fetchurl { @@ -4473,7 +4471,6 @@ let }; }; - DigestHMAC_SHA1 = DigestHMAC; DigestJHash = buildPerlPackage rec { name = "Digest-JHash-0.10"; src = fetchurl { @@ -11356,7 +11353,7 @@ let url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz"; sha256 = "88a9b2df69e769e5855a408b19f61915b82e8fe070ab5cf4d525dd3b8bbe31c1"; }; - propagatedBuildInputs = [ pkgs.openssl Carp Exporter IO NetSSH StringShellQuote ]; + propagatedBuildInputs = [ pkgs.openssl Carp IO NetSSH StringShellQuote ]; patchPhase = '' sed -i 's|$scp = "scp";|$scp = "${pkgs.openssh}/bin/scp";|' SCP.pm ''; @@ -11449,7 +11446,7 @@ let url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz"; sha256 = "7c71c7c3cbe953234dfe25bcc1ad7edb0e1f5a0578601f5523bc6070262a3817"; }; - propagatedBuildInputs = [ pkgs.openssl Exporter IO ]; + propagatedBuildInputs = [ pkgs.openssl IO ]; patchPhase = '' sed -i 's|$ssh = "ssh";|$ssh = "${pkgs.openssh}/bin/ssh";|' SSH.pm ''; @@ -12114,7 +12111,7 @@ let sha256 = "18wxvp7psqrx0zdvg47azrals572hv9fx1s3p0q65s87lnk3q63l"; }; outputs = [ "out" ]; - buildInputs = [ DBDmysql DBI DigestMD5 IOSocketSSL TermReadKey TimeHiRes ]; + buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey TimeHiRes ]; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = http://www.percona.com/software/percona-toolkit; @@ -13431,7 +13428,6 @@ let sha256 = "17syqbq17qw6ajg3w88q9ljdm4c2b7zadq9pwshxxgyijg8dlfh4"; }; buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ]; - propagatedBuildInputs = [ XSLoader ]; preBuild = ''ls''; meta = { homepage = https://github.com/Sereal/Sereal; @@ -13448,7 +13444,7 @@ let sha256 = "02hbk5dwq7fpnyb3vp7xxhb41ra48xhghl13p9pjq9lzsqlb6l19"; }; buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ]; - propagatedBuildInputs = [ XSLoader SerealDecoder ]; + propagatedBuildInputs = [ SerealDecoder ]; meta = { homepage = https://github.com/Sereal/Sereal; description = "Fast, compact, powerful binary deserialization"; @@ -14141,7 +14137,7 @@ let sha256 = "1y9lfhxgwyysybing72n3hng2db5njpk2dbb80vskdz75r7ffqjp"; }; - buildInputs = [ ArchiveZip_1_53 pkgs.file ]; + buildInputs = [ ArchiveZip pkgs.file ]; meta.broken = true; }; @@ -14155,7 +14151,7 @@ let sha256 = "1y9lfhxgwyysybing72n3hng2db5njpk2dbb80vskdz75r7ffqjp"; }; - buildInputs = [ ArchiveZip_1_53 libfile-stripnondeterminism pkgs.file ]; + buildInputs = [ ArchiveZip libfile-stripnondeterminism pkgs.file ]; meta = with stdenv.lib; { description = "A Perl module for stripping bits of non-deterministic information"; @@ -14221,7 +14217,6 @@ let }; }; - SubExporterUtil = SubExporter; SubIdentify = buildPerlPackage rec { name = "Sub-Identify-0.14"; src = fetchurl { @@ -17591,6 +17586,19 @@ let propagatedBuildInputs = [ XMLRegExp libxml_perl ]; }; + XMLFeedPP = buildPerlPackage rec { + name = "XML-FeedPP-0.95"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; + sha256 = "1x5806xwmbqxr1dkdhalb6d7n31s3ya776klkai7c2x6y6drbhwh"; + }; + propagatedBuildInputs = [ XMLTreePP ]; + meta = { + description = "Parse/write/merge/edit RSS/RDF/Atom syndication feeds"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLFilterBufferText = buildPerlPackage { name = "XML-Filter-BufferText-1.01"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0f8f8b5dd30c..63c0e36eb370 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -390,11 +390,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.12.2"; + version = "2.13.1"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "19cq04x1wi489259vyad15zy6y0k3qd7dj77pcf74gxqw92hgg5c"; + sha256 = "0yy9q140jd63h9qz5jvplh7ls3j7y1hf25dkxk0h4mx9cbxdzkq4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c495cdabdee..93aee66a567e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -204,6 +204,8 @@ in { automat = callPackage ../development/python-modules/automat { }; + awkward = callPackage ../development/python-modules/awkward { }; + aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; @@ -250,6 +252,8 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; + bitarray = callPackage ../development/python-modules/bitarray { }; + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; @@ -258,6 +262,8 @@ in { breathe = callPackage ../development/python-modules/breathe { }; + brotli = callPackage ../development/python-modules/brotli { }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); @@ -592,6 +598,8 @@ in { python-prctl = callPackage ../development/python-modules/python-prctl { }; + python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -895,6 +903,8 @@ in { enablePython = true; }); + boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + bumps = callPackage ../development/python-modules/bumps {}; cached-property = callPackage ../development/python-modules/cached-property { }; @@ -2037,12 +2047,18 @@ in { django_colorful = callPackage ../development/python-modules/django_colorful { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; + + django-configurations = callPackage ../development/python-modules/django-configurations { }; + django_compressor = callPackage ../development/python-modules/django_compressor { }; django_compat = callPackage ../development/python-modules/django-compat { }; django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; + django_environ = callPackage ../development/python-modules/django_environ { }; django_evolution = callPackage ../development/python-modules/django_evolution { }; @@ -2116,6 +2132,10 @@ in { dj-database-url = callPackage ../development/python-modules/dj-database-url { }; + dj-email-url = callPackage ../development/python-modules/dj-email-url { }; + + dj-search-url = callPackage ../development/python-modules/dj-search-url { }; + djmail = callPackage ../development/python-modules/djmail { }; pillowfight = callPackage ../development/python-modules/pillowfight { }; @@ -2458,6 +2478,8 @@ in { icalendar = callPackage ../development/python-modules/icalendar { }; + ifaddr = callPackage ../development/python-modules/ifaddr { }; + imageio = callPackage ../development/python-modules/imageio { }; imgaug = callPackage ../development/python-modules/imgaug { }; @@ -6825,24 +6847,7 @@ in { subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - spark_parser = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "spark_parser"; - version = "1.4.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "1r7d07kw4asgajvhq1gzln4g1qi2r13jw0s8c7d5z3g4kp8y0br8"; - }; - buildInputs = with self; [nose]; - propagatedBuildInputs = []; - meta = { - description = ''An Early-Algorithm Context-free grammar Parser''; - homepage = "https://github.com/rocky/python-spark"; - license = licenses.mit; - maintainers = with maintainers; [raskin]; - platforms = platforms.all; - }; - }); + spark_parser = callPackage ../development/python-modules/spark_parser { }; sphinx = callPackage ../development/python-modules/sphinx { }; @@ -7944,6 +7949,8 @@ in { uproot = callPackage ../development/python-modules/uproot {}; + uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + uptime = buildPythonPackage rec { name = "uptime-${version}"; version = "3.0.1"; @@ -9315,28 +9322,7 @@ EOF }; }; - Logbook = buildPythonPackage rec { - name = "Logbook-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/L/Logbook/${name}.tar.gz"; - sha256 = "0whqbx5p0zkf7gmb5ssnsnhm4kn4drd4x7fbhdi8dnxklqajbnl7"; - }; - - buildInputs = [ self.pytest ] ++ optionals (!isPy3k) [ self.mock ]; - - checkPhase = '' - find tests -name \*.pyc -delete - py.test tests - ''; - - meta = { - homepage = https://pythonhosted.org/Logbook/; - description = "A logging replacement for Python"; - license = licenses.bsd3; - }; - }; + Logbook = callPackage ../development/python-modules/Logbook { }; libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 0d15d817a66c..89a8af6794f6 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -2,7 +2,7 @@ */ { # The platforms *from* which we cross compile. - supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] + supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true }: @@ -10,7 +10,7 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let - nativePlatforms = linux; + nativePlatforms = all; common = { buildPackages.binutils = nativePlatforms; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index d0fb885dc747..37724a870a30 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -56,7 +56,7 @@ , # A list of overlays (Additional `self: super: { .. }` customization # functions) to be fixed together in the produced package set overlays -}: +} @args: let stdenvAdapters = self: super: @@ -159,6 +159,19 @@ let }; }; }; + + # Extend the package set with zero or more overlays. This preserves + # preexisting overlays. Prefer to initialize with the right overlays + # in one go when calling Nixpkgs, for performance and simplicity. + appendOverlays = extraOverlays: + import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; }); + + # Extend the package set with a single overlay. This preserves + # preexisting overlays. Prefer to initialize with the right overlays + # in one go when calling Nixpkgs, for performance and simplicity. + # Prefer appendOverlays if used repeatedly. + extend = f: self.appendOverlays [f]; + }; # The complete chain of package set builders, applied from top to bottom. |